diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-07-01 12:57:22 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-07-01 12:57:22 +0000 |
| commit | 3d2c4e5005217d84517a92bfafe7a540997b2ffd (patch) | |
| tree | 2ea0b2e317e452f517cca3e49fe49e44271811a8 /x11-misc | |
| parent | Linux patch 3.14.10 (diff) | |
| download | gentoo-2-3d2c4e5005217d84517a92bfafe7a540997b2ffd.tar.gz gentoo-2-3d2c4e5005217d84517a92bfafe7a540997b2ffd.tar.bz2 gentoo-2-3d2c4e5005217d84517a92bfafe7a540997b2ffd.zip | |
Link against libXext (bug #515910).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xteddy/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/xteddy/files/xteddy-2.2-linking.patch | 22 | ||||
| -rw-r--r-- | x11-misc/xteddy/xteddy-2.2.ebuild | 13 |
3 files changed, 34 insertions, 9 deletions
diff --git a/x11-misc/xteddy/ChangeLog b/x11-misc/xteddy/ChangeLog index 28437eb349ef..d279eca4e3e1 100644 --- a/x11-misc/xteddy/ChangeLog +++ b/x11-misc/xteddy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xteddy -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xteddy/ChangeLog,v 1.14 2012/10/13 08:05:54 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xteddy/ChangeLog,v 1.15 2014/07/01 12:57:22 jer Exp $ + + 01 Jul 2014; Jeroen Roovers <jer@gentoo.org> xteddy-2.2.ebuild, + +files/xteddy-2.2-linking.patch: + Link against libXext (bug #515910). 13 Oct 2012; Agostino Sarubbo <ago@gentoo.org> xteddy-2.2.ebuild: Stable for amd64, wrt bug #404899 diff --git a/x11-misc/xteddy/files/xteddy-2.2-linking.patch b/x11-misc/xteddy/files/xteddy-2.2-linking.patch new file mode 100644 index 000000000000..6dd01e48f5e9 --- /dev/null +++ b/x11-misc/xteddy/files/xteddy-2.2-linking.patch @@ -0,0 +1,22 @@ +--- a/configure.in ++++ b/configure.in +@@ -5,6 +5,8 @@ + + AC_PATH_XTRA + PKG_CHECK_MODULES(IMLIB2, imlib2) ++PKG_CHECK_MODULES(X11, x11) ++PKG_CHECK_MODULES(XEXT, xext) + + PIXMAP_PATH="/usr/share/xteddy" + AC_SUBST(PIXMAP_PATH) +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,7 @@ + bin_SCRIPTS = xtoys xteddy_test + + AM_CFLAGS = @IMLIB2_CFLAGS@ +-AM_LDFLAGS = @IMLIB2_LIBS@ -lX11 ++xteddy_LDADD = @IMLIB2_LIBS@ @X11_LIBS@ @XEXT_LIBS@ + + DEFS = -DPIXMAP_PATH=\"@PIXMAP_PATH@\" -Wall + diff --git a/x11-misc/xteddy/xteddy-2.2.ebuild b/x11-misc/xteddy/xteddy-2.2.ebuild index 5f1997f71a94..62f9c0fb5254 100644 --- a/x11-misc/xteddy/xteddy-2.2.ebuild +++ b/x11-misc/xteddy/xteddy-2.2.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xteddy/xteddy-2.2.ebuild,v 1.7 2012/10/13 08:05:54 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xteddy/xteddy-2.2.ebuild,v 1.8 2014/07/01 12:57:22 jer Exp $ -EAPI="4" - -inherit autotools +EAPI=5 +inherit autotools eutils DESCRIPTION="A cuddly teddy bear (or other image) for your X desktop" HOMEPAGE="http://webstaff.itn.liu.se/~stegu/xteddy/" @@ -24,8 +23,8 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS README ChangeLog NEWS xteddy.README ) src_prepare() { - # Fix linking order for --as-needed - sed -i -e "s/AM_LDFLAGS/xteddy_LDADD/" Makefile.am || die + epatch "${FILESDIR}"/${P}-linking.patch + # Fix paths in xtoys script wrt bug #404899 sed -i -e "s:/usr/games:/usr/bin:" xtoys || die eautoreconf |