gnome-base/libglade: Add fix for problems with glib-2.32 and gold linker, #414111

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

5 files changed, 42 insertions, 14 deletions

diff --git a/gnome-base/libglade/ChangeLog b/gnome-base/libglade/ChangeLog
index c4aa021cbb10..2e54e6960f2f 100644
--- a/gnome-base/libglade/ChangeLog
+++ b/gnome-base/libglade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libglade
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.135 2011/09/29 16:50:18 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.136 2012/04/30 14:18:01 jlec Exp $
+
+  30 Apr 2012; Justin Lecher <jlec@gentoo.org> libglade-2.6.4.ebuild,
+  +files/libglade-2.6.4-gold-glib-2.32.patch, metadata.xml:
+  Add fix for problems with glib-2.32 and gold linker, #414111
 
   29 Sep 2011; Pacho Ramos <pacho@gentoo.org> libglade-2.6.4.ebuild:
   Drop DEPRECATED flags, bug #384775 by Ian Abbott.
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 80d22b790ea6..b2063bd9dcc0 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX Makefile.in.am-2.4.2-xmlcatalog.patch 1121 RMD160 335fdf3b35fd95e1a9b2b683d14a9f95b24af32c SHA1 33eda915f031f6797f393447d76b1d44da6886ae SHA256 a2132d94f5b5e234b905f4a629c1a3c54cf93fbd4a6dc791f5699a731c41a0fb
 AUX libglade-2.6.3-fix_tests-page_size.patch 369 RMD160 5aea3a51f6619fddf324e27370643d413be9eab0 SHA1 aea59f9885b7dda8b636a87fc00ea92ed1880d27 SHA256 97342a2d5bdf561d145950f5609d96a097ed2903e6c229f671b15d7d704248f2
+AUX libglade-2.6.4-gold-glib-2.32.patch 544 RMD160 82991a1a08e971f6d7927288ee8020ef34df63ec SHA1 c604bcd54500c2cb7307b849a50d6e25576abfd2 SHA256 daa5e196cf17b4f046dffdc7e04e108b155f78b3788763ef619d121eada6a819
 DIST libglade-2.6.4.tar.bz2 356119 RMD160 516a43543e518a319ca9b35556ca1ac88e2ce8fb SHA1 8465851733b8a0efbe57c43efc0f140d8e2d2edb SHA256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
-EBUILD libglade-2.6.4.ebuild 1998 RMD160 4b62180ff19aa6e47263f01f083f6bc4693fbe50 SHA1 1d6f1fcb2b7af08a4f94c4b6886f4ca46123fc75 SHA256 c4a02aee6f196a708978b6763720211d9df20758f8f7de2620828b23fbb66d69
-MISC ChangeLog 16381 RMD160 4a122eaf256c4f8861b8e8f23daf8cdd82fde489 SHA1 89d74820255a52d9de35ea27f01ec77d91db19a9 SHA256 8194fd9b34792bbec8c36405a05b4610f7bd1d53a04ac8bb08f716854b5fd294
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+EBUILD libglade-2.6.4.ebuild 2184 RMD160 29dd776db4efc7e597c4e0bbd7f1594a90eefff7 SHA1 523d4120ddfc517245bdf730894298b2e5d270a9 SHA256 89d1463ae9c0371028ca21713dcf6a49c3507c72b31ae3433d0becac0ff49009
+MISC ChangeLog 16574 RMD160 7e20c360cadcc811e48aeebfb0600c9471205afd SHA1 0974b1f8726bec0dea695a53fe8337b51373b7ad SHA256 ab7f3679b6adcb81a7de762b1e9b61bec0f8ff5fbba1ea5a4f6a60dbef685cd6
+MISC metadata.xml 159 RMD160 488f58f504e5c2e7b10e253fd9db5f1e6f9d3a21 SHA1 16c86b590ee3d78c8ccd5b5044835ed4a4038d93 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk6EodAACgkQCaWpQKGI+9SzvgCaAyL7REE0nQ+4Jkk7GSQof+oh
-XAAAn01PsJGXOlH7pe41YOYE17GLp+9F
-=qztp
+iEYEAREKAAYFAk+enx4ACgkQgAnW8HDreRYBLQCgo7c8faDNuMrAl16A2n/mYJpj
+XpoAoJiNcirT/1fjF2xyR/7o/dMANmUx
+=9+nd
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch b/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch
new file mode 100644
index 000000000000..0696dce58760
--- /dev/null
+++ b/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch
@@ -0,0 +1,17 @@
+ configure.in |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e0c52a8..b2a4a4a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -46,7 +46,8 @@ PKG_CHECK_MODULES(LIBGLADE, [dnl
+   libxml-2.0 >= required_libxml_version dnl
+   atk >= required_atk_version dnl
+   gtk+-2.0 >= required_gtk_version dnl
+-  glib-2.0 >= required_glib_version])
++  glib-2.0 >= required_glib_version dnl
++  gmodule-no-export-2.0 >= required_glib_version])
+ 
+ AC_MSG_CHECKING([for native Win32])
+ case "$host" in
diff --git a/gnome-base/libglade/libglade-2.6.4.ebuild b/gnome-base/libglade/libglade-2.6.4.ebuild
index 5260a22c26f3..c5f227cd27b7 100644
--- a/gnome-base/libglade/libglade-2.6.4.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.12 2011/09/29 16:50:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.13 2012/04/30 14:18:01 jlec Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
 
-inherit eutils gnome2 python virtualx
+inherit autotools eutils gnome2 python virtualx
 
 DESCRIPTION="Library to construct graphical interfaces at runtime"
 HOMEPAGE="http://library.gnome.org/devel/libglade/stable/"
@@ -39,12 +39,18 @@ src_prepare() {
 	# patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort
 	epatch "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch"
 
+	# Fails with gold due to recent changes in glib-2.32's pkg-config files
+	epatch "${FILESDIR}/${P}-gold-glib-2.32.patch"
+
 	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
 		glade/Makefile.am glade/Makefile.in || die
 
 	if ! use test; then
 		sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed"
 	fi
+
+	gnome2_src_prepare
+	AT_NOELIBTOOLIZE=yes eautoreconf
 }
 
 src_test() {
diff --git a/gnome-base/libglade/metadata.xml b/gnome-base/libglade/metadata.xml
index da6fd63d0085..dad9001338dc 100644
--- a/gnome-base/libglade/metadata.xml
+++ b/gnome-base/libglade/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
 </pkgmetadata>