diff options
| -rw-r--r-- | gnome-base/gnome-panel/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch | 55 | ||||
| -rw-r--r-- | gnome-base/gnome-panel/files/gnome-panel-3.4.2.1-gold.patch | 30 | ||||
| -rw-r--r-- | gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild | 97 |
4 files changed, 7 insertions, 184 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog index 988b3061596b..0ee1cd6101e5 100644 --- a/gnome-base/gnome-panel/ChangeLog +++ b/gnome-base/gnome-panel/ChangeLog @@ -1,6 +1,11 @@ # 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.357 2012/12/24 14:47:19 eva Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.358 2013/03/07 08:37:54 eva Exp $ + + 07 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> + -files/gnome-panel-3.2.1-gold.patch, -gnome-panel-3.4.2.1.ebuild, + -files/gnome-panel-3.4.2.1-gold.patch: + Clean up old revision. *gnome-panel-3.6.2 (24 Dec 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 deleted file mode 100644 index d6b39fa841a7..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch +++ /dev/null @@ -1,55 +0,0 @@ - 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/files/gnome-panel-3.4.2.1-gold.patch b/gnome-base/gnome-panel/files/gnome-panel-3.4.2.1-gold.patch deleted file mode 100644 index 6b061f5acafc..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-3.4.2.1-gold.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d20653305b63fcf959bd9d0b61e6ac3bec53478e Mon Sep 17 00:00:00 2001 -From: Justin Lecher <jlec@gentoo.org> -Date: Thu, 7 Jun 2012 13:13:47 +0200 -Subject: [PATCH] build: Explicitly link to gmodule-2.0 - -Recent changes in glib-2.32 deps in pkg-config files require addition of -gmodule-2.0 to PKG_CHECK_MODULES. This underlinking will be visible when -using gold linker. - -https://bugzilla.gnome.org/show_bug.cgi?id=677616 ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2d32951..b101019 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -82,7 +82,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 gmodule-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 gmodule-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) - --- -1.7.8.6 - diff --git a/gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild deleted file mode 100644 index 90d3de1b6846..000000000000 --- a/gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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.4.2.1.ebuild,v 1.2 2012/10/16 03:47:52 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 - -DESCRIPTION="The GNOME panel" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="0" -IUSE="eds +introspection networkmanager" -# Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" - -RDEPEND=">=dev-libs/glib-2.31.14:2 - >=dev-libs/libgweather-2.91:2 - dev-libs/libxml2:2 - gnome-base/dconf - >=gnome-base/gconf-2.6.1:2[introspection?] - >=gnome-base/gnome-desktop-2.91:3 - >=gnome-base/gnome-menus-3.1.4:3 - gnome-base/gsettings-desktop-schemas - gnome-base/librsvg:2 - >=net-libs/telepathy-glib-0.14.0 - sys-auth/polkit - >=x11-libs/cairo-1[X] - >=x11-libs/gdk-pixbuf-2.25.2:2 - >=x11-libs/gtk+-3.3.8:3[introspection?] - x11-libs/libXau - x11-libs/libICE - x11-libs/libSM - >=x11-libs/libXrandr-1.2 - >=x11-libs/libwnck-2.91:3 - >=x11-libs/pango-1.15.4[introspection?] - - eds? ( >=gnome-extra/evolution-data-server-2.91.2 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - networkmanager? ( >=net-misc/networkmanager-0.6.7 )" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=app-text/gnome-doc-utils-0.3.2 - >=dev-lang/perl-5 - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - virtual/pkgconfig - - dev-libs/gobject-introspection-common - gnome-base/gnome-common" -# eautoreconf needs -# dev-libs/gobject-introspection-common -# gnome-base/gnome-common - -pkg_setup() { - # XXX: Make presence/telepathy-glib support optional? - # We can do that if we intend to support fallback-only as a setup - G2CONF="${G2CONF} - --disable-deprecation-flags - --disable-static - --disable-scrollkeeper - --disable-schemas-install - --disable-schemas-compile - --with-in-process-applets=clock,notification-area,wncklet - --enable-telepathy-glib - $(use_enable networkmanager network-manager) - $(use_enable introspection) - $(use_enable eds)" - DOCS="AUTHORS ChangeLog HACKING NEWS README" -} - -src_prepare() { - epatch "${FILESDIR}/${P}-gold.patch" - eautoreconf - gnome2_src_prepare -} - -pkg_postinst() { - local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries" - local gconftool="${EROOT}usr/bin/gconftool-2" - - if [ -e "$entries" ]; then - einfo "Setting panel gconf defaults..." - - GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")" - - "${gconftool}" --direct --config-source \ - "${GCONF_CONFIG_SOURCE}" --load="${entries}" - fi - - # Calling this late so it doesn't process the GConf schemas file we already - # took care of. - gnome2_pkg_postinst -} |