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

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

4 files changed, 33 insertions, 6 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/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>