diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-01-04 02:44:19 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-01-04 02:44:19 +0000 |
| commit | 9980d18008dbe750776837832e5ba700d92d6aeb (patch) | |
| tree | ddf32cab9c7fa435e5fd91368d309ce029b8ff05 | |
| parent | Do not enable USE=gnome for lablgtk by default; it blocks the gnome-3 update ... (diff) | |
| download | gentoo-2-9980d18008dbe750776837832e5ba700d92d6aeb.tar.gz gentoo-2-9980d18008dbe750776837832e5ba700d92d6aeb.tar.bz2 gentoo-2-9980d18008dbe750776837832e5ba700d92d6aeb.zip | |
Fix underlinking failure (bug #496722, thanks to David Davidson).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
| -rw-r--r-- | gnome-base/gnome-panel/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-base/gnome-panel/files/gnome-panel-2.32.1-gmodule.patch | 13 | ||||
| -rw-r--r-- | gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild | 7 |
3 files changed, 24 insertions, 4 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog index 4dddcabb4a3a..64096c4dd5e9 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.365 2013/12/08 18:33:21 pacho Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.366 2014/01/04 02:44:19 tetromino Exp $ + + 04 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org> + gnome-panel-2.32.1-r3.ebuild, +files/gnome-panel-2.32.1-gmodule.patch: + Fix underlinking failure (bug #496722, thanks to David Davidson). 08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-panel-3.8.0-r1.ebuild: x86 stable, bug #478252 diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-gmodule.patch b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-gmodule.patch new file mode 100644 index 000000000000..e61df090e7b5 --- /dev/null +++ b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-gmodule.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index da37bd9..0b15b7e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -79,7 +79,7 @@ dnl pkg-config dependency checks + + PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0) + +-PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED) ++PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED) + AC_SUBST(PANEL_CFLAGS) + AC_SUBST(PANEL_LIBS) + diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild index 6ef0151a480d..a312a3b360e3 100644 --- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.13 2013/09/08 17:53:29 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.14 2014/01/04 02:44:19 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -95,6 +95,9 @@ src_prepare() { # Fix underlinking, bug #384533 epatch "${FILESDIR}/${P}-underlinking.patch" + # More underlinking, bug #496722 + epatch "${FILESDIR}/${P}-gmodule.patch" + # automake-1.13 fix, bug #479890 sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die |