summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Noberasco <s4t4n@gentoo.org>2009-01-19 15:21:36 +0000
committerMichele Noberasco <s4t4n@gentoo.org>2009-01-19 15:21:36 +0000
commit9698688e63d100968d5a1d25337467b22c7dcb7d (patch)
tree9e983fc24f95e6b5ee226a25f7611bf6e752dba8 /x11-plugins
parentFix qt dependency (nothing should depend on the meta ebuild) (diff)
downloadhistorical-9698688e63d100968d5a1d25337467b22c7dcb7d.tar.gz
historical-9698688e63d100968d5a1d25337467b22c7dcb7d.tar.bz2
historical-9698688e63d100968d5a1d25337467b22c7dcb7d.zip
Fixed compilation with --as-needed. Closes bug #248650.
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.24-tuxonice-r9 i686
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/wmsound/ChangeLog5
-rw-r--r--x11-plugins/wmsound/Manifest14
-rw-r--r--x11-plugins/wmsound/wmsound-0.9.5.ebuild22
3 files changed, 19 insertions, 22 deletions
diff --git a/x11-plugins/wmsound/ChangeLog b/x11-plugins/wmsound/ChangeLog
index f61775b2150f..61c757df0f56 100644
--- a/x11-plugins/wmsound/ChangeLog
+++ b/x11-plugins/wmsound/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/wmsound
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.7 2008/11/17 23:13:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.8 2009/01/19 15:21:36 s4t4n Exp $
+
+ 19 Jan 2009; Michele Noberasco <s4t4n@gentoo.org> wmsound-0.9.5.ebuild:
+ Fixed compilation with --as-needed. Closes bug #248650.
17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
files/wmsound-esd.patch:
diff --git a/x11-plugins/wmsound/Manifest b/x11-plugins/wmsound/Manifest
index 27c4cb2e7bc0..ffc72e93b772 100644
--- a/x11-plugins/wmsound/Manifest
+++ b/x11-plugins/wmsound/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX wmsound-ComplexProgramTargetNoMan.patch 304 RMD160 896ad6e7f9b664aed2bfaad0cbf8b8365f285668 SHA1 9a5cc41c4ca29e1bd8ebb9b78fca4aad6c0fed8c SHA256 c55a5b1c413140bb9e5660dcfcc3277dae2b6a3be6bdd1671bacd297ffb12a82
AUX wmsound-config.patch 2466 RMD160 7cae6793b7f01426d326ce4510aacf0e661dff64 SHA1 90e41547114ca630a0c9ffcf85298090510f5912 SHA256 778cd878ea6146480737bea355d0f47463a1875c172c09b8bb0232645d32e02e
AUX wmsound-esd.patch 2302 RMD160 069495ff8b44793a999225a1a29697139599f6fb SHA1 86bace6388d06d322f3ee5a76162bf1c4271741b SHA256 57928d34c75f4cfa2242ceaadd20414d1ad60c3e92f04ccd43f28d445efd173a
DIST wmsound-0.9.5.tar.gz 23098 RMD160 70be0e11d17c8ca989c73073cf8bb2f8ff2a38f7 SHA1 435d60c99ade4539a94a15f58a6e5f122d746720 SHA256 9f479d7a00030e410f21ce9b489de5c7bf4daac64ff710924440ac1d112da1c2
-EBUILD wmsound-0.9.5.ebuild 1160 RMD160 6eee8ca2107c32b0a2f708f0ecbb512e8a77336a SHA1 039770e3c39eb4ef27772e92619cd3e37e78c7b4 SHA256 47ddb24f6d9b2ec559fb19e709c544514ed924cd0717cf1c98ff476dea939196
-MISC ChangeLog 1045 RMD160 bc9b402d8bd654e35e0ed1532ceb919fe716e560 SHA1 f9af0a54719eef42e977695dfa2d0551a70bd91a SHA256 44b9dab398e79dba023a4c6f7a7efc243c7572cd74ca74fa380eb907fce18d52
+EBUILD wmsound-0.9.5.ebuild 1385 RMD160 767711c12afe4acb9a7ac43206e310d37445c15a SHA1 3cfa386971318d0c9e63b00b51b00f4f4433fc64 SHA256 906c67a52834ef254e66032b882d93450d6c0bc023aecf9d52a01d8f873e3ca0
+MISC ChangeLog 1174 RMD160 31924e7fd7b38e30d5b89aa2d31f5e878897dc2a SHA1 cb194d684cd9d1896aecc982736ad960ab44a3a0 SHA256 06ff5e2d066c9262f02650a3fc4211d0e149514479f96210ce38146301e5547a
MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkh+pUACgkQAiZjviIA2XiEIwCfdJjYZWAFDWFOXkM/lXwMfqZo
-gncAnjwRi8vdBaOt8QSEc0fzw9D2UdLQ
-=ehWd
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmsound/wmsound-0.9.5.ebuild b/x11-plugins/wmsound/wmsound-0.9.5.ebuild
index f9efd7c38b56..0ddbf987aa92 100644
--- a/x11-plugins/wmsound/wmsound-0.9.5.ebuild
+++ b/x11-plugins/wmsound/wmsound-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/wmsound-0.9.5.ebuild,v 1.6 2006/10/27 08:49:38 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/wmsound-0.9.5.ebuild,v 1.7 2009/01/19 15:21:36 s4t4n Exp $
inherit eutils
@@ -26,25 +26,29 @@ src_unpack()
{
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/wmsound-config.patch
- epatch ${FILESDIR}/wmsound-ComplexProgramTargetNoMan.patch
- use esd && epatch ${FILESDIR}/wmsound-esd.patch
+ cd "${S}"
+ epatch "${FILESDIR}/wmsound-config.patch"
+ epatch "${FILESDIR}/wmsound-ComplexProgramTargetNoMan.patch"
+ use esd && epatch "${FILESDIR}/wmsound-esd.patch"
+
+ #Fix compilation with --as-needed.
+ sed -i 's:-lPropList $(WMSOUNDLIB):$(WMSOUNDLIB) -lPropList:' src/Imakefile
+ sed -i 's:-lPropList $(XLIB) $(WMSOUNDLIB):$(WMSOUNDLIB) -lPropList $(XLIB):' utils/Imakefile
}
src_compile()
{
export PATH="${PATH}:/usr/X11R6/bin"
- cd ${S}
+ cd "${S}"
xmkmf -a
emake CDEBUGFLAGS="${CFLAGS}" || die "make failed"
}
src_install()
{
- cd ${S}
- einstall PREFIX=${D}/usr USRLIBDIR=${D}/usr/X11R6/lib || die "make install failed"
+ cd "${S}"
+ einstall PREFIX="${D}/usr" USRLIBDIR="${D}/usr/X11R6/lib" || die "make install failed"
dodoc AUTHORS BUGS ChangeLog
}