Fix building with -Wl,--as-needed.
authorSamuli Suominen <ssuominen@gentoo.org>
Fri, 26 Feb 2010 12:36:39 +0000 (12:36 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Fri, 26 Feb 2010 12:36:39 +0000 (12:36 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

x11-misc/electricsheep/ChangeLog
x11-misc/electricsheep/Manifest
x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild
x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch [new file with mode: 0644]

index afab343e3b0ee441d18764ec8f6f5fe6b0916959..1f85921eea5807291265559a4f55c8d9520b5bd9 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/electricsheep
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.47 2010/02/02 13:00:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.48 2010/02/26 12:36:38 ssuominen Exp $
+
+  26 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  electricsheep-2.7_beta11.ebuild,
+  +files/electricsheep-2.7_beta11-asneeded.patch:
+  Fix building with -Wl,--as-needed.
 
   02 Feb 2010; Tobias Klausmann <klausman@gentoo.org>
   electricsheep-2.7_beta11.ebuild:
index c77f0c65521e66689cf48b0bc5e04f597281d87a..54766d3eb78463b59a7326cc6bcd5ca44b4f91da 100644 (file)
@@ -1,6 +1,7 @@
+AUX electricsheep-2.7_beta11-asneeded.patch 683 RMD160 42c744b8615182c0eba4cc75863a7b0737ece11f SHA1 2bccf1d1ff83527505bd5d6d2cac9c3eab2ec4ef SHA256 0583db7984c3a80200eeee4fcb14bb68909ffcaae4a19424878470d9f582303c
 AUX electricsheep-gnome.patch 970 RMD160 ab0203cea690f90e342ce24055d5f55a73cd2b71 SHA1 9854b43ba17a53e3fbfc369747401215ad9c596e SHA256 259a82dee3437ae24489811a1ddd430c573e82c859a89f4c4808e9e9aadb79a4
 AUX electricsheep-xdg-utils.patch 556 RMD160 e2903425d868861f1e015373b975b15225e06140 SHA1 bae398d8b1082699db066de851d2b688cd3c58f8 SHA256 bc44dc82dcbe9f444a034bace50952940fa98091dbf0baa9457644db3a9228f9
 DIST electricsheep-2.7_beta11.tar.bz2 224892 RMD160 dce0cec9cbc1fb25d00461855bacdd6079967bdd SHA1 c9ba55b62dfc7ddad679758a1cd3464b0de749ea SHA256 093ffdf65d24d0eb6c66e398c092bcf48d72e23151c0d572b2c327344f1261a1
-EBUILD electricsheep-2.7_beta11.ebuild 1748 RMD160 6767e199d996009590b11cb65269bf7b6a290792 SHA1 88cbcb736f5e3f2b6d4cf16e0d22770b274a8d14 SHA256 52d2a7b44e59864dd47d726b0ee9176869663470dc07f66492d2ffd17141602b
-MISC ChangeLog 8268 RMD160 452543ee7610c20624aa4130c6eabf977e0de1fd SHA1 6784b1bd14cacd846038e53ea2aa56a3c84bfffc SHA256 d33fd84b97ecc1fa8f9d4e49452a34105ac863bfeca817f514cfa994498e474b
+EBUILD electricsheep-2.7_beta11.ebuild 1783 RMD160 327ac94836ca4b90b5ea5faff10de6d8abe5e6f8 SHA1 1f5a5c36d7a12d45a4f7df58147575dbf77cd37f SHA256 9a65e6ca2fb35daa97faaed65834967f1f48677baaa4c7a59db9fb7fa0e93f48
+MISC ChangeLog 8446 RMD160 8215f2dee2eb37a0af73d68f1c9a2b7c3f74a519 SHA1 fe182e3d6f31326e3f18e8d9f9653312d2d99c98 SHA256 9d256a683a9827dc6ff12cb7f25471821f750bb778196abe8a2f8639cb9e5ef8
 MISC metadata.xml 319 RMD160 8d2b4fb22841a8e8465a2cd5b6ebe73524b34a7a SHA1 eef4c6d4f7d83fecca5844d10e6efd0b9566a5e3 SHA256 ff313e851d928bdcbd4d7a4ee641ac93aef523b1524ff5bd72acb60ddfc2d2ed
index 16fd3f9468f83c721b9f55aa31d3e337141f8522..68280c6d23ef5e706e5c60e93fa9035cad950153 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild,v 1.4 2010/02/02 13:00:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild,v 1.5 2010/02/26 12:36:38 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic autotools
@@ -33,8 +33,9 @@ DEPEND="${DEPEND}
        x11-proto/xproto"
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-xdg-utils.patch
-       epatch "${FILESDIR}"/${PN}-gnome.patch
+       epatch "${FILESDIR}"/${PN}-xdg-utils.patch \
+               "${FILESDIR}"/${PN}-gnome.patch \
+               "${FILESDIR}"/${P}-asneeded.patch
        eautoreconf
 }
 
diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch
new file mode 100644 (file)
index 0000000..70f746d
--- /dev/null
@@ -0,0 +1,13 @@
+diff -ur electricsheep-2.7_beta11.orig/Makefile.am electricsheep-2.7_beta11/Makefile.am
+--- electricsheep-2.7_beta11.orig/Makefile.am  2009-09-18 00:42:49.000000000 +0300
++++ electricsheep-2.7_beta11/Makefile.am       2010-02-26 14:35:07.000000000 +0200
+@@ -9,7 +9,8 @@
+ pkgdata_DATA = electricsheep-wait.avi electricsheep-preferences.glade
+ 
+ electricsheep_preferences_CFLAGS = @libglade_CFLAGS@ -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"
+-electricsheep_preferences_LDFLAGS = @libglade_LIBS@ -export-dynamic
++electricsheep_preferences_LDADD = @libglade_LIBS@
++electricsheep_preferences_LDFLAGS = -export-dynamic
+ electricsheep_preferences_SOURCES = electricsheep-preferences.c utils.c md5.c
+ 
+