Avoid underlinking the modules, fixes bug #367355.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 61 insertions, 10 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 8c2d50f74daa..1d4b924738bd 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.68 2011/05/08 13:52:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.69 2011/06/01 01:31:21 flameeyes Exp $
+
+  01 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  libcanberra-0.28-r2.ebuild, +files/libcanberra-0.28-underlinking.patch:
+  Avoid underlinking the modules, fixes bug #367355.
 
 *libcanberra-0.28-r2 (08 May 2011)
 
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 19ef68a6e960..d55800b5d54f 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libcanberra-0.28-underlinking.patch 1485 RMD160 e0d7899a300ad7e97db39634a21f860f1c615e65 SHA1 d5e8b47d785732f964c9d56bd52def4ad13e1d50 SHA256 3798873e8895602159b0df11f45e806c28056a7f3c3820a0664ed1e6cf25a8a4
 DIST libcanberra-0.26.tar.gz 463209 RMD160 f58fc2cfa4b35f6a6b2577057b969977f7de3b5d SHA1 31a1cb8757e5da39b4cdc06e523d011578d7a3e3 SHA256 4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982
 DIST libcanberra-0.28.tar.gz 487276 RMD160 a351f048376d4c66bc0c1612188e8ffbfcec136b SHA1 2a41dae039df1fea98cfb71bd7ca34e57b6e8091 SHA256 eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c
 EBUILD libcanberra-0.26.ebuild 1883 RMD160 3efd491b964ae9348c2f0ecd551a14530f50469a SHA1 c1992cf8b87dd10135fff8e66d5c70cb2d71fe2f SHA256 4098ab29cdbfeb3255df7316110416f58a0cf2ebaca8a88fa4ff5f5160ab8ad6
 EBUILD libcanberra-0.28-r1.ebuild 2005 RMD160 720703ca3ebcaae9df8b194fc4a6b3fb4e3de7ae SHA1 2292d006e46cf8fbc6205693f584640db4c953c1 SHA256 5971454096df56e4a38f511d245ff12309ca071c76eb6264e639c54ba180d2a4
-EBUILD libcanberra-0.28-r2.ebuild 2037 RMD160 a86d0ad5afdf94296af06a9b3e5cc94886570991 SHA1 abf7213159b222641f155c587ec9dd60e6d6d129 SHA256 97978b7a13d802aa53f5f110f62b94212ddb2c61388f8bb7749a08d5ae3d3551
-MISC ChangeLog 10798 RMD160 42b5ea316ce0643c1ba18a141b92643f3c2659a1 SHA1 198d6faaa8c139464648a209a6a382fb4da2a985 SHA256 d8e0ac75fac5cd60cca8f4597f3bdf092673539d1a947544b3eb3118df011b3e
+EBUILD libcanberra-0.28-r2.ebuild 2070 RMD160 fdbfd92003f43b9d73a564a9421e26850ae9cd30 SHA1 93d7a8db19bb70de5c3823a02775bc35d3843e32 SHA256 a9b5ea802bb66a898140897e05a0dd577c86a9de23a62dda96c091d3e9c391ac
+MISC ChangeLog 10988 RMD160 5f9e78a63ac9d6ea247b331f466eb1744fdf02d9 SHA1 be2750411ce9923092d3ef91502c9122fde636bf SHA256 00e6ef2d8a94ab64f96b0e05a2312e63cad571f7c09e02ef864c4b1c8b660474
 MISC metadata.xml 1542 RMD160 9870e70050f5f19e19be5c965b03d65b71faae4e SHA1 1d401136554c5142a95eaef76ca236ef828d7550 SHA256 937a49bfb06b48512919df4237fabf66d40794144843790337f884961bdcf1c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3GoDMACgkQ1fmVwcYIWAbbWACgm9X9u+045bedKeg28G8t/hb+
-q6AAoIZgX5Q0/i59Y66fJ4fBDJfUfIBq
-=KHoK
+iEYEARECAAYFAk3llkwACgkQAiZjviIA2XjCuwCfcuPZlZRjHmeWGfa5bW8L4+0+
+ggIAmQFI4e9a6rCtkTr57IgqjLOfbuC3
+=vLLk
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch b/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch
new file mode 100644
index 000000000000..aa4843933932
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch
@@ -0,0 +1,44 @@
+From 14504663805b9cdc5e514cacdadb7c137a06d6e1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Sun, 15 May 2011 15:02:34 +0200
+Subject: [PATCH] build-sys: link gtk and gtk3 modules to libX11 as well as
+ Gtk itself.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both of the modules use the XFree/XGetWindowProperty functions which are
+exposed by libX11; without this change, the modules would be
+underlinked, which causes some link editors to refuse the link (including
+GNU gold).
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
+---
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 98102cc..2aaa51f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -383,7 +383,7 @@ AC_ARG_ENABLE([gtk],
+ 
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+ if test "x${gtk}" != xno ; then
+-    PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 ],
++    PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 x11 ],
+         [
+             HAVE_GTK=1
+             AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
+@@ -422,7 +422,7 @@ AC_ARG_ENABLE([gtk3],
+         [gtk3=auto])
+ 
+ if test "x${gtk3}" != xno ; then
+-    PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 ],
++    PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 x11 ],
+         [
+             HAVE_GTK3=1
+             AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])
+-- 
+1.7.5.rc3
+
diff --git a/media-libs/libcanberra/libcanberra-0.28-r2.ebuild b/media-libs/libcanberra/libcanberra-0.28-r2.ebuild
index e80a3173a436..d769c4fbb9c8 100644
--- a/media-libs/libcanberra/libcanberra-0.28-r2.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.28-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.28-r2.ebuild,v 1.1 2011/05/08 13:52:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.28-r2.ebuild,v 1.2 2011/06/01 01:31:21 flameeyes Exp $
 
 EAPI="4"
 
-inherit gnome2-utils libtool systemd
+inherit gnome2-utils libtool systemd autotools eutils
 
 DESCRIPTION="Portable Sound Event Library"
 HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
@@ -36,8 +36,10 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="udev? ( alsa )"
 
 src_prepare() {
-	# Run elibtoolize for ~x86-fbsd.
-	use x86-fbsd && elibtoolize
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+
+	eautoreconf
+	elibtoolize
 }
 
 src_configure() {