summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-02-26 23:23:29 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-02-26 23:23:29 +0000
commite9d90359d11267253a331510fe0113a1ace1462f (patch)
treec17b14d3180e8271d353a084ccd903cea7e02bda /gnome-base
parentx11-drivers/xf86-video-intel: bump to 2.6.2, under p.mask as the ChangeLog is... (diff)
downloadgentoo-2-e9d90359d11267253a331510fe0113a1ace1462f.tar.gz
gentoo-2-e9d90359d11267253a331510fe0113a1ace1462f.tar.bz2
gentoo-2-e9d90359d11267253a331510fe0113a1ace1462f.zip
Bump to 2.24.3-r1. Add patch to allow shutdown without gdm, #259138. Clean up old revisions.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-panel/ChangeLog11
-rw-r--r--gnome-base/gnome-panel/files/gnome-panel-2.24.1-logout.patch.gzbin7181 -> 0 bytes
-rw-r--r--gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch78
-rw-r--r--gnome-base/gnome-panel/gnome-panel-2.24.3-r1.ebuild (renamed from gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild)18
4 files changed, 101 insertions, 6 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index fb404b2e493a..b2341956b9b1 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for gnome-base/gnome-panel
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.268 2009/02/05 19:25:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.269 2009/02/26 23:23:28 eva Exp $
+
+*gnome-panel-2.24.3-r1 (26 Feb 2009)
+
+ 26 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+ -files/gnome-panel-2.24.1-logout.patch.gz,
+ +files/gnome-panel-2.24.3-shutdown.patch, -gnome-panel-2.24.2-r1.ebuild,
+ +gnome-panel-2.24.3-r1.ebuild:
+ Bump to 2.24.3-r1. Add patch to allow shutdown without gdm, #259138.
+ Clean up old revisions.
05 Feb 2009; Alexis Ballier <aballier@gentoo.org>
+files/gnome-panel-2.24.3-daylight.patch, gnome-panel-2.24.3.ebuild:
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.1-logout.patch.gz b/gnome-base/gnome-panel/files/gnome-panel-2.24.1-logout.patch.gz
deleted file mode 100644
index da56b16f9126..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.24.1-logout.patch.gz
+++ /dev/null
Binary files differ
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch
new file mode 100644
index 000000000000..aefb74cb0740
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.24.3-shutdown.patch
@@ -0,0 +1,78 @@
+# Fix shutdown without gdm
+# https://bugs.gentoo.org/show_bug.cgi?id=259138
+--- a/gnome-panel/panel-gdm.c 2009-02-15 20:33:57.000000000 +0000
++++ b/gnome-panel/panel-gdm.c 2009-02-15 20:38:47.000000000 +0000
+@@ -233,6 +233,15 @@
+ char *response;
+
+ g_assert (data->fd <= 0);
++
++ if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
++ strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
++ else if (g_file_test ("/tmp/.gdm_socket", G_FILE_TEST_EXISTS))
++ strcpy (addr.sun_path, "/tmp/.gdm_socket");
++ else {
++ gdm_shutdown_protocol_connection (data);
++ return FALSE;
++ }
+
+ data->fd = socket (AF_UNIX, SOCK_STREAM, 0);
+ if (data->fd < 0) {
+@@ -242,11 +251,6 @@
+ return FALSE;
+ }
+
+- if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
+- strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
+- else
+- strcpy (addr.sun_path, "/tmp/.gdm_socket");
+-
+ addr.sun_family = AF_UNIX;
+
+ if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
+@@ -398,6 +402,16 @@
+ gdm_shutdown_protocol_connection (&gdm_protocol_data);
+ }
+
++gboolean
++gdm_available (void)
++{
++ if (!gdm_init_protocol_connection (&gdm_protocol_data))
++ return FALSE;
++
++ gdm_shutdown_protocol_connection (&gdm_protocol_data);
++ return TRUE;
++}
++
+ void
+ gdm_new_login (void)
+ {
+--- a/gnome-panel/panel-gdm.h 2009-02-15 20:33:57.000000000 +0000
++++ b/gnome-panel/panel-gdm.h 2009-02-15 20:38:58.000000000 +0000
+@@ -46,6 +46,7 @@
+ void gdm_set_logout_action (GdmLogoutAction action);
+ GdmLogoutAction gdm_get_logout_action (void);
+ void gdm_new_login (void);
++gboolean gdm_available (void);
+
+ G_END_DECLS
+
+--- a/gnome-panel/panel-logout.c 2009-02-15 20:33:57.000000000 +0000
++++ b/gnome-panel/panel-logout.c 2009-02-15 20:40:48.000000000 +0000
+@@ -341,10 +341,12 @@
+ // FIXME need to verify that this response can be used
+ logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT;
+
+- //FIXME is gdm running?
+- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+- _("_Switch User"),
+- PANEL_LOGOUT_RESPONSE_SWITCH_USER);
++ //FIXME need to have a more flexible test for availability
++ if (gdm_available())
++ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
++ _("_Switch User"),
++ PANEL_LOGOUT_RESPONSE_SWITCH_USER);
++
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL);
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.3-r1.ebuild
index aa5a0667e1b2..697386a17ca4 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.24.3-r1.ebuild
@@ -1,19 +1,20 @@
# Copyright 1999-2009 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.24.2-r1.ebuild,v 1.3 2009/02/01 11:08:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.3-r1.ebuild,v 1.1 2009/02/26 23:23:29 eva Exp $
GCONF_DEBUG="no"
inherit autotools gnome2
+MY_P="${PN}-2.24.2"
DESCRIPTION="The GNOME panel"
HOMEPAGE="http://www.gnome.org/"
SRC_URI="${SRC_URI}
- mirror://gentoo/${P}-logout+po.tar.bz2"
+ mirror://gentoo/${MY_P}-logout+po.tar.bz2"
LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="doc eds networkmanager"
RDEPEND=">=gnome-base/gnome-desktop-2.12
@@ -63,9 +64,16 @@ src_unpack() {
gnome2_src_unpack
# Allow logout/shutdown without gnome-session 2.24, bug #246170
- epatch "${WORKDIR}/${P}-logout.patch"
- epatch "${WORKDIR}/${P}-po.patch"
+ epatch "${WORKDIR}/${MY_P}-logout.patch"
+ epatch "${WORKDIR}/${MY_P}-po.patch"
+ # Fixes build on BSD, bug #256859
+ epatch "${FILESDIR}/${P}-daylight.patch"
+
+ # Fixes shutdown without gdm, bug #259138
+ epatch "${FILESDIR}/${P}-shutdown.patch"
+
+ intltoolize --force --copy --automake || die "intltoolize failed"
eautomake
}