Add fix for underlinking, detected by gold

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

3 files changed, 66 insertions, 2 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index ac58c1c00af0..8441c14d4245 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.353 2012/05/14 06:06:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.354 2012/06/07 10:49:51 jlec Exp $
+
+  07 Jun 2012; Justin Lecher <jlec@gentoo.org> gnome-panel-3.2.1.ebuild,
+  +files/gnome-panel-3.2.1-gold.patch:
+  Add fix for underlinking, detected by gold
 
 *gnome-panel-3.4.1 (14 May 2012)
 
diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch b/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch
new file mode 100644
index 000000000000..d6b39fa841a7
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch
@@ -0,0 +1,55 @@
+ configure    |   12 ++++++------
+ configure.ac |    2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index e4c9423..21bfa66 100755
+--- a/configure
++++ b/configure
+@@ -13057,12 +13057,12 @@ if test -n "$PANEL_LIBS"; then
+     pkg_cv_PANEL_LIBS="$PANEL_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED cairo-xlib glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu-3.0 >= \$LIBGNOME_MENU_REQUIRED dconf\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED cairo-xlib glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu-3.0 >= \$LIBGNOME_MENU_REQUIRED dconf\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>/dev/null`
++  pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13082,14 +13082,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
++	        PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
+         else
+-	        PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
++	        PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PANEL_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf) were not met:
++	as_fn_error $? "Package requirements (gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf) were not met:
+ 
+ $PANEL_PKG_ERRORS
+ 
+diff --git a/configure.ac b/configure.ac
+index 73d198e..93c9f80 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,7 +77,7 @@ dnl pkg-config dependency checks
+ 
+ PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-3.0)
+ 
+-PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf)
++PKG_CHECK_MODULES(PANEL, gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf)
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
+ 
diff --git a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
index 5ab372c99784..2ce2c3523563 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild,v 1.2 2012/05/05 05:38:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild,v 1.3 2012/06/07 10:49:51 jlec Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -68,6 +68,11 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gold.patch
+	gnome2_src_prepare
+}
+
 pkg_postinst() {
 	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
 	local gconftool="${EROOT}usr/bin/gconftool-2"