From 65e06a64b2f4dadb9c6858b368a0aef925d526b3 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 2 Sep 2013 20:45:58 +0000 Subject: fix build with newer glibc, fix typo (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) --- media-libs/sdl2-ttf/ChangeLog | 6 +++++- media-libs/sdl2-ttf/files/sdl2-ttf-2.0.12-linking.patch | 16 ++++++++++++++++ media-libs/sdl2-ttf/sdl2-ttf-2.0.12.ebuild | 10 ++++++---- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 media-libs/sdl2-ttf/files/sdl2-ttf-2.0.12-linking.patch (limited to 'media-libs/sdl2-ttf') diff --git a/media-libs/sdl2-ttf/ChangeLog b/media-libs/sdl2-ttf/ChangeLog index c926c5ea09ef..5a4e82cae0be 100644 --- a/media-libs/sdl2-ttf/ChangeLog +++ b/media-libs/sdl2-ttf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/sdl2-ttf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-ttf/ChangeLog,v 1.2 2013/09/02 20:32:59 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-ttf/ChangeLog,v 1.3 2013/09/02 20:45:58 hasufell Exp $ + + 02 Sep 2013; Julian Ospald + +files/sdl2-ttf-2.0.12-linking.patch, sdl2-ttf-2.0.12.ebuild: + fix build with newer glibc, fix typo 02 Sep 2013; Julian Ospald sdl2-ttf-2.0.12.ebuild: fix dependencies diff --git a/media-libs/sdl2-ttf/files/sdl2-ttf-2.0.12-linking.patch b/media-libs/sdl2-ttf/files/sdl2-ttf-2.0.12-linking.patch new file mode 100644 index 000000000000..88a7e7fdabfd --- /dev/null +++ b/media-libs/sdl2-ttf/files/sdl2-ttf-2.0.12-linking.patch @@ -0,0 +1,16 @@ +From: Julian Ospald +Date: Mon Sep 2 20:29:16 UTC 2013 +Subject: fix linking with newer glibc + +https://bugzilla.libsdl.org/show_bug.cgi?id=1401 + +--- SDL2_ttf-2.0.12/Makefile.am ++++ SDL2_ttf-2.0.12/Makefile.am +@@ -35,6 +35,7 @@ + -release $(LT_RELEASE) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + endif ++libSDL2_ttf_la_LIBADD = @MATHLIB@ + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = SDL2_ttf.pc diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.12.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.12.ebuild index c1fc393c0660..ef8e1906eb3e 100644 --- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.12.ebuild +++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.12.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-ttf/sdl2-ttf-2.0.12.ebuild,v 1.2 2013/09/02 20:32:59 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-ttf/sdl2-ttf-2.0.12.ebuild,v 1.3 2013/09/02 20:45:58 hasufell Exp $ EAPI=5 -inherit eutils +inherit autotools eutils MY_P=SDL2_ttf-${PV} DESCRIPTION="library that allows you to use TrueType fonts in SDL applications" @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="static-libs X" -REPEND="X? ( x11-libs/libXt ) +RDEPEND="X? ( x11-libs/libXt ) media-libs/libsdl2 >=media-libs/freetype-2.3" DEPEND="${RDEPEND}" @@ -23,6 +23,8 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} src_prepare() { + epatch "${FILESDIR}"/${P}-linking.patch + eautoreconf rm -r external || die } @@ -33,7 +35,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc {CHANGES,README}.txt use static-libs || prune_libtool_files } -- cgit v1.2.3-65-gdbad