summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-06-13 17:59:45 +0000
committerPacho Ramos <pacho@gentoo.org>2010-06-13 17:59:45 +0000
commit7d863cb5c2e618c2213482bd7af392ff3ab3ef21 (patch)
treed647f830ebacb84e30d97e5970d6dd0190bafc49 /gnome-base/gnome-panel
parentAdd new version for Gnome 2.30 (diff)
downloadgentoo-2-7d863cb5c2e618c2213482bd7af392ff3ab3ef21.tar.gz
gentoo-2-7d863cb5c2e618c2213482bd7af392ff3ab3ef21.tar.bz2
gentoo-2-7d863cb5c2e618c2213482bd7af392ff3ab3ef21.zip
Add new version for Gnome 2.30
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-panel')
-rw-r--r--gnome-base/gnome-panel/ChangeLog8
-rw-r--r--gnome-base/gnome-panel/files/gnome-panel-2.30.0-panels-unhidden.patch46
-rw-r--r--gnome-base/gnome-panel/gnome-panel-2.30.0-r1.ebuild104
3 files changed, 157 insertions, 1 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 3b22d4e8db2c..0bd29c571321 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-base/gnome-panel
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.302 2010/06/04 20:50:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.303 2010/06/13 17:59:45 pacho Exp $
+
+*gnome-panel-2.30.0-r1 (13 Jun 2010)
+
+ 13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +gnome-panel-2.30.0-r1.ebuild,
+ +files/gnome-panel-2.30.0-panels-unhidden.patch:
+ Add new version for Gnome 2.30.
04 Jun 2010; Markus Meier <maekke@gentoo.org> gnome-panel-2.28.0.ebuild:
x86 stable, bug #314899
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.30.0-panels-unhidden.patch b/gnome-base/gnome-panel/files/gnome-panel-2.30.0-panels-unhidden.patch
new file mode 100644
index 000000000000..cf5cad0ec3ac
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.30.0-panels-unhidden.patch
@@ -0,0 +1,46 @@
+From 3cb6a14614a85c1fa6f68e3cde1d19e84325e132 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Wed, 26 May 2010 15:00:24 +0000
+Subject: [panel] Make sure that newly-created panels become unhidden
+
+The patch from a7412dfa introduces a bug where new panels will never get
+notified that they should start doing their initial animation; they'll
+always stay hidden.
+---
+diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
+index 7c36e87..ee16df5 100644
+--- a/gnome-panel/applet.c
++++ b/gnome-panel/applet.c
+@@ -1033,18 +1033,18 @@ panel_applet_compare (const PanelAppletToLoad *a,
+ void
+ panel_applet_load_queued_applets (gboolean initial_load)
+ {
+- if (initial_load) {
+- if (!panel_applets_to_load) {
+- panel_applet_queue_initial_unhide_toplevels (NULL);
+- return;
+- } else {
+- /* Install a timeout to make sure we don't block the
+- * unhiding because of an applet that doesn't load */
+- panel_applet_unhide_toplevels_timeout =
+- g_timeout_add_seconds (UNHIDE_TOPLEVELS_TIMEOUT_SECONDS,
+- panel_applet_queue_initial_unhide_toplevels,
+- NULL);
+- }
++ if (!panel_applets_to_load) {
++ panel_applet_queue_initial_unhide_toplevels (NULL);
++ return;
++ }
++
++ if (initial_load && panel_applets_to_load) {
++ /* Install a timeout to make sure we don't block the
++ * unhiding because of an applet that doesn't load */
++ panel_applet_unhide_toplevels_timeout =
++ g_timeout_add_seconds (UNHIDE_TOPLEVELS_TIMEOUT_SECONDS,
++ panel_applet_queue_initial_unhide_toplevels,
++ NULL);
+ }
+
+ panel_applets_to_load = g_slist_sort (panel_applets_to_load,
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gnome-panel/gnome-panel-2.30.0-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.30.0-r1.ebuild
new file mode 100644
index 000000000000..4ecad9d3b3af
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.30.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2010 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.30.0-r1.ebuild,v 1.1 2010/06/13 17:59:45 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The GNOME panel"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc eds networkmanager policykit"
+
+RDEPEND="dev-lang/python
+ >=gnome-base/gnome-desktop-2.26.0
+ >=x11-libs/pango-1.15.4
+ >=dev-libs/glib-2.18.0
+ >=x11-libs/gtk+-2.19.7
+ >=dev-libs/libgweather-2.27.90
+ dev-libs/libxml2
+ >=gnome-base/libgnome-2.13
+ >=gnome-base/libgnomeui-2.5.4
+ >=gnome-base/libbonoboui-2.1.1
+ >=gnome-base/orbit-2.4
+ >=x11-libs/libwnck-2.19.5
+ >=gnome-base/gconf-2.6.1
+ >=media-libs/libcanberra-0.23[gtk]
+ >=gnome-base/gnome-menus-2.27.92
+ >=gnome-base/libbonobo-2.20.4
+ gnome-base/librsvg
+ >=dev-libs/dbus-glib-0.71
+ >=sys-apps/dbus-1.1.2
+ >=x11-libs/cairo-1
+ x11-libs/libXau
+ >=x11-libs/libXrandr-1.2
+ eds? ( >=gnome-extra/evolution-data-server-1.6 )
+ networkmanager? ( >=net-misc/networkmanager-0.6 )
+ policykit? ( >=sys-auth/polkit-0.91 )"
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5
+ gnome-base/gnome-common
+ >=app-text/gnome-doc-utils-0.3.2
+ >=dev-util/pkgconfig-0.9
+ >=dev-util/intltool-0.40
+ ~app-text/docbook-xml-dtd-4.1.2
+ dev-util/gtk-doc-am
+ doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+ G2CONF="${G2CONF}
+ --disable-static
+ --disable-scrollkeeper
+ --disable-schemas-install
+ --with-in-process-applets=clock,notification-area,wncklet
+ $(use_enable policykit polkit)
+ $(use_enable networkmanager network-manager)
+ $(use_enable eds)"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # FIXME: tarball generated with broken gtk-doc, revisit me.
+ if use doc; then
+ sed "/^TARGET_DIR/i \GTKDOC_REBASE=${EPREFIX}/usr/bin/gtkdoc-rebase" \
+ -i gtk-doc.make || die "sed 1 failed"
+ else
+ sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
+ -i gtk-doc.make || die "sed 2 failed"
+ fi
+
+ # Make sure that newly-created panels become unhidden
+ epatch "${FILESDIR}/${P}-panels-unhidden.patch"
+
+ # Make it libtool-1 compatible, bug #271652
+ rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
+ intltoolize --force --copy --automake || die "intltoolize failed"
+ eautoreconf
+}
+
+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
+}