Version bump. Reduce GConf roundtrips, include fbsd fixes, translation updates. Remove ssh-agent support from the session since it should be handled by xinitrc scripts. Handle prefixed application menu, bug #256614.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 153 insertions, 18 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 037c47879151..9031cf83aa31 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.237 2009/06/26 20:49:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.238 2009/07/27 10:29:07 eva Exp $
+
+*gnome-session-2.26.2 (26 Jul 2009)
+
+  26 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-session-2.26.1.ebuild, +gnome-session-2.26.2.ebuild,
+  +files/gnome-session-2.26.2-shutdown.patch, files/Gnome:
+  Version bump. Reduce GConf roundtrips, include fbsd fixes, translation
+  updates. Remove ssh-agent support from the session since it should be
+  handled by xinitrc scripts. Handle prefixed application menu, bug #256614.
 
 *gnome-session-2.26.1-r1 (26 Jun 2009)
 
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 85b5897fa924..e3ed48c0a851 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX Gnome 2457 RMD160 71b084bf46db8f1551b21b843e5ee12015bc836e SHA1 7b6f633d6000554977f69869aae2b817166f59a2 SHA256 347b9e364607b25637205c3984a3662518395ca2e200578e6b976a6c73ad63a7
+AUX Gnome 2404 RMD160 48ab5c98ac1cda3593c99f6996f72a61b63b87c7 SHA1 eb7422e38600214911075bffae52fbb348a1ba44 SHA256 259c067c3293fccb587daba38fae888119250330a624687674e140e31c75d297
 AUX gnome-session-2.17.90.1-gentoo-branding.patch 705 RMD160 162b7da162bc94534491f6c0a0c772265268386c SHA1 c17b429a1d0b1d7f043ae1d6c88ab4f7894c983d SHA256 cbbd369938ac60baa255ef58d642014d1318169631bfbd3cb042efcd560187f5
 AUX gnome-session-2.19.2-no-asserts.patch 865 RMD160 c69115c8a6e0821d361c6354c6c05e9cbcdbcbdb SHA1 b3aa320808ac63eef91e5dcac17c3ebe94a0f684 SHA256 84dfd878da8933aed9b9a2d1feed47a7fdf254db542b29b5c6dcc81e8d42f122
 AUX gnome-session-2.22.3-gsd-spawn.patch 9005 RMD160 a5ef84a8701f43d91e61edf6c46264de3057f581 SHA1 3f923280228aafc242d49a6ff45f6ca9e42b9e90 SHA256 27f5a81eb52fcbb57189d4385d1e154af9dc6d1401445247cdcca18dc986dbeb
 AUX gnome-session-2.23.5-polkit-automagic.patch 1235 RMD160 2b5fee32765d8745fea0d27b1e834592cdc0b316 SHA1 942a4a41abc28596f8baac7ff41c03a677ac64db SHA256 cb2daab00d2ae8c143cc7577e512092dada71a97a05ff7ea085dfa53bcf9b61a
 AUX gnome-session-2.24.2-shutdown.patch 2809 RMD160 a26a418511dc5ff7a56252ea005a8f24190e0743 SHA1 4162514ba914bb7753dbceadfd654201c940c2a8 SHA256 50e71a8dd347d43b19cae80a50169365ac923a62d30c8e4c52f1223c2f008ed5
 AUX gnome-session-2.26.1-execinfo.patch 2622 RMD160 551043a2e2b0cf8b8e82901b50af446ddff4efe1 SHA1 8cb42b57f70c0fbbe76eb022ee162dec6d9b5e9a SHA256 957ba19acd36e07dd96e19d07936d902b5259383cb3cd5222f6aff58b3fc6843
+AUX gnome-session-2.26.2-shutdown.patch 4512 RMD160 aa6a5fc66959e099ea7734e1f13af39890a37a9b SHA1 07461b0ed9587e0911cf57d2a8c2eaa74fde2f17 SHA256 2539c04941ac75e5003bddf4e4398ba19cbcbaae7f62277974b061737e4d8859
 DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
 DIST gnome-session-2.22.3.tar.bz2 773853 RMD160 a35065aa665ada5081f3fe19abc70950f8588e34 SHA1 817e007009e6e43cd2f1980e6d90546e7117cc9d SHA256 07ec872ae8213c4e92072ff74451caa2b6afb747fd0b07d2cea40cfcd32b7176
 DIST gnome-session-2.24.3.tar.bz2 792300 RMD160 2cd9fb8435f452873ca8bd34fd51276d24282a48 SHA1 a48bcf47b879db439cec193e4191909409e7efcb SHA256 2d59d979467459261cc741c64ce2ba6aaccd7a31cccb5b13b2ea46858e1bc636
 DIST gnome-session-2.26.1-gentoo-patches.tar.bz2 6060 RMD160 acbb15102d5e2c6a17e9cd69450085bf233caf69 SHA1 aceab28c15bfe9cb18c93cc2d4fd0a7213374f1a SHA256 9189f35565a6e0b2b6a218e3eee47db0c40cff091172ab25220df9a9ee5020a8
 DIST gnome-session-2.26.1.tar.bz2 835266 RMD160 d4eb6a0fc639a257645b2e4138055d9e1bd9f9a6 SHA1 3c8dc68f197c6b5a7d30e3ce04e65954bfe12070 SHA256 35e304ec42ed69a2b98377fd7cfac19fa00ca53bb5d6307094ebf077c00dbc32
+DIST gnome-session-2.26.2-session-saving-button.patch.bz2 4915 RMD160 dc694071d9ef5e4c494cb8ec949fe5e546e49d4d SHA1 54d4f9e64a2017486f69b3700f47461bed2ab4a5 SHA256 f0f1f6de3173f53bb565852a3bebd67d251cdfa16d9e3ef812bbeb89abc602ed
+DIST gnome-session-2.26.2.tar.bz2 804340 RMD160 ff2c75cf5b8c3405ec5d2044510cf07eedede1d1 SHA1 ba43d9c623e6e79635a09cfbd6ecfce40ccbab05 SHA256 e089c7349bb6bc73d19f65c0a4536757968b929825ec38c616c8049bfd2d6905
 EBUILD gnome-session-2.22.3-r1.ebuild 2115 RMD160 6c9fbb9072b38fb9e162048f6c30706d03fe5f27 SHA1 a21447d9e69e27761089f98f272910e7ce16a2ed SHA256 da10117a817ea92d8be4371fb263d7ed2839c794f5274a6f03d2d45f353e0abe
 EBUILD gnome-session-2.24.3.ebuild 1948 RMD160 5897beb4dae8fc6f363fdf1c87c0b12b75b6634e SHA1 63c1d8ab8e21d94b465ada3c5db54225aac66f31 SHA256 51bb5a07493cff28b99a0affd796d53ea3561ea697b456b213ca935e9eea7c41
 EBUILD gnome-session-2.26.1-r1.ebuild 2319 RMD160 c250c4825b53e4e810b84cf6cf355d3ef2b47294 SHA1 079792acc46df81ac855e3e6379c2e2b72feca40 SHA256 58f3b3edd1ce574e9e4f4722eb66be5284f3d20c0b7d879e267695d30fd9cd03
-EBUILD gnome-session-2.26.1.ebuild 2090 RMD160 8144f7128c3344f91128e6c555670bd130b10ee3 SHA1 72e0cb1fa784fc6e38600c34c8c1d0e050356a6d SHA256 b01208a63898c9810c92381dc79b693b026e822399ef4033c456c0fc5b19e554
-MISC ChangeLog 32861 RMD160 fb0047802aaa4e8d4be3d125c86f5d3ab6ea249c SHA1 0a401be0a8f7d9611251f5c06251e5ab73a29f49 SHA256 21bbdf0b1be90708837c8f49c1bc319fac925ef87d0b8647fbe48c23d8970072
+EBUILD gnome-session-2.26.2.ebuild 2163 RMD160 b5ff0cd83481c6f314b37a58bc1f73370f4644b1 SHA1 2251d4e8055711436cf0ce1fcd3d0751928947cf SHA256 d0e3837c46040dadfa7dbdf8a407c3ccd8601bfc2ba74046a5f82e5fc5bd5c68
+MISC ChangeLog 33291 RMD160 b0eed7d1dd128473d9db915fb32f8e78b6c7bd27 SHA1 845774a89f7bf63b5bb89dfb7c09eec61020f402 SHA256 8d126ee087a05a3c5e3bb5b2b14a10097bc66df254de47b5e385a728cb61bdb6
 MISC metadata.xml 269 RMD160 6bbdafdb02cf28eb4f772d7e330519eb07ab4dcb SHA1 18a2628db0509bf3ccd54f626f3bdd4b7c3a7a43 SHA256 a735ba6a51fe0c18552eda7327e431b231fd7b590a82ba9f1cc32b0c1a38e50e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpHUpgACgkQvFcC4BYPU0pIhwCgovjA5oUj8uf9Gqwug5iCu9vZ
-Xx8An09pCf7TAxLL9jkOF1mTytyJG/Pw
-=kJcf
+iEYEARECAAYFAkptgXkACgkQ1fmVwcYIWAanbQCfbFGN0IoM/Ew0zfSFkhaRcy4T
++W0AoIo18WZsMBVYoF3TVHX75lT7ROce
+=dPUW
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome
index 98fe26d86de9..d068daea6bd1 100644
--- a/gnome-base/gnome-session/files/Gnome
+++ b/gnome-base/gnome-session/files/Gnome
@@ -5,6 +5,10 @@
 
 export GDK_USE_XFT=1
 
+if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then
+	export XDG_MENU_PREFIX=gnome-
+fi
+
 for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER"
 do
 	if ( cp /dev/null "$errfile" 2> /dev/null )
@@ -41,11 +45,6 @@ else
 	command=`which gnome-session`
 fi
 
-sshagent=`which ssh-agent`
-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-    command="$sshagent -- $command"
-fi
-
 # merge in defaults
 if [ -f "$rh6sysresources" ]; then
     xrdb -merge "$rh6sysresources"
diff --git a/gnome-base/gnome-session/files/gnome-session-2.26.2-shutdown.patch b/gnome-base/gnome-session/files/gnome-session-2.26.2-shutdown.patch
new file mode 100644
index 000000000000..29cc56955250
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.26.2-shutdown.patch
@@ -0,0 +1,123 @@
+From 281e67308b9828a35ad863c39bd09e595c5e8771 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Apr 2009 16:45:29 +0200
+Subject: [PATCH 1/2] Allow shutdown without PolicyKit.
+
+ Straight forward fix to allow shutdown on systems not using policykit.
+
+ If the system really doesn't have policykit, it will make things work
+ as in 2.22.
+
+ If pk is in gsm but not in ck, it'll still work as in 2.22.
+
+ If pk is present in both, you just have to fix the logic to make
+ gsm ask pk if the user has the permission to shutdown _before_ showing
+ buttons and in case this is not possible, just damn fix pk.
+
+ reported as http://bugzilla.gnome.org/show_bug.cgi?id=549150
+---
+ gnome-session/gsm-consolekit.c |   38 ++++++++++++++++++++++----------------
+ 1 files changed, 22 insertions(+), 16 deletions(-)
+
+diff --git a/gnome-session/gsm-consolekit.c b/gnome-session/gsm-consolekit.c
+index 5541006..28f4cb7 100644
+--- a/gnome-session/gsm-consolekit.c
++++ b/gnome-session/gsm-consolekit.c
+@@ -541,7 +541,7 @@ request_restart_priv (GsmConsolekit *manager,
+                 g_free (error_message);
+         }
+ #else
+-        g_assert_not_reached ();
++        g_warning ("Failed to restart and Policykit support not enabled");
+ #endif /* HAVE POLKIT */
+ }
+ 
+@@ -581,7 +581,7 @@ request_stop_priv (GsmConsolekit *manager,
+                 }
+         }
+ #else
+-        g_assert_not_reached ();
++        g_warning ("Failed to shutdown and Policykit support not enabled");
+ #endif /* HAVE POLKIT */
+ }
+ 
+@@ -979,6 +979,15 @@ gsm_consolekit_can_do_action (GsmConsolekit *manager,
+ 
+         return result != POLKIT_RESULT_NO && result != POLKIT_RESULT_UNKNOWN;
+ }
++#else
++static gboolean
++gsm_consolekit_can_do_action (GsmConsolekit *manager,
++                              const char    *action_id)
++{
++        /* if we got here, res was true */
++        return TRUE;
++}
++#endif
+ 
+ static gboolean
+ gsm_consolekit_is_session_for_other_user (GsmConsolekit *manager,
+@@ -1096,6 +1105,7 @@ gsm_consolekit_is_single_user (GsmConsolekit *manager)
+         return single;
+ }
+ 
++#ifdef HAVE_POLKIT_GNOME
+ static void
+ obtain_privileges_cb (PolKitAction  *action,
+                       gboolean       gained_privilege,
+@@ -1207,8 +1217,11 @@ gsm_consolekit_get_restart_privileges (GsmConsolekit *manager)
+                                                           "org.freedesktop.consolekit.system.restart",
+                                                           "org.freedesktop.consolekit.system.restart-multiple-users");
+ #else
+-        g_debug ("GsmConsolekit: built without PolicyKit-gnome support");
+-        return FALSE;
++        g_signal_emit (G_OBJECT (manager),
++                       signals [PRIVILEGES_COMPLETED],
++                       0, TRUE, FALSE, FALSE);
++        g_debug ("GsmConsolekit: built without PolicyKit-gnome support, granting anyway");
++        return TRUE;
+ #endif
+ }
+ 
+@@ -1220,33 +1233,26 @@ gsm_consolekit_get_stop_privileges (GsmConsolekit *manager)
+                                                           "org.freedesktop.consolekit.system.stop",
+                                                           "org.freedesktop.consolekit.system.stop-multiple-users");
+ #else
+-        g_debug ("GsmConsolekit: built without PolicyKit-gnome support");
+-        return FALSE;
++        g_signal_emit (G_OBJECT (manager),
++                       signals [PRIVILEGES_COMPLETED],
++                       0, TRUE, FALSE, FALSE);
++        g_debug ("GsmConsolekit: built without PolicyKit-gnome support, granting anyway");
++        return TRUE;
+ #endif
+ }
+ 
+ gboolean
+ gsm_consolekit_can_restart (GsmConsolekit *manager)
+ {
+-#ifdef HAVE_POLKIT_GNOME
+         return gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.restart") ||
+                gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.restart-multiple-users");
+-#else
+-        g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot restart system");
+-        return FALSE;
+-#endif
+ }
+ 
+ gboolean
+ gsm_consolekit_can_stop (GsmConsolekit *manager)
+ {
+-#ifdef HAVE_POLKIT_GNOME
+         return gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.stop") ||
+                gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.stop-multiple-users");
+-#else
+-        g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot stop system");
+-        return FALSE;
+-#endif
+ }
+ 
+ gchar *
+-- 
+1.6.3.3
+
diff --git a/gnome-base/gnome-session/gnome-session-2.26.1.ebuild b/gnome-base/gnome-session/gnome-session-2.26.2.ebuild
index 1ede7bc3cf7f..95c650fd532d 100644
--- a/gnome-base/gnome-session/gnome-session-2.26.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.26.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.26.1.ebuild,v 1.3 2009/05/23 14:54:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.26.2.ebuild,v 1.1 2009/07/27 10:29:07 eva Exp $
 
 EAPI="2"
 
@@ -9,14 +9,14 @@ inherit eutils gnome2
 DESCRIPTION="Gnome session manager"
 HOMEPAGE="http://www.gnome.org/"
 SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-gentoo-patches.tar.bz2
+	mirror://gentoo/${PN}-2.26.2-session-saving-button.patch.bz2
 	branding? ( mirror://gentoo/gentoo-splash.png )"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="branding doc ipv6 policykit"
+IUSE="branding doc ipv6 policykit elibc_FreeBSD"
 
 RDEPEND=">=dev-libs/glib-2.16
 	>=x11-libs/gtk+-2.11.1
@@ -25,6 +25,7 @@ RDEPEND=">=dev-libs/glib-2.16
 	>=gnome-base/gconf-2
 	>=x11-libs/startup-notification-0.9
 	policykit? ( >=gnome-extra/policykit-gnome-0.7 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
 
 	x11-libs/libSM
 	x11-libs/libICE
@@ -60,10 +61,10 @@ src_prepare() {
 	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
 
 	# Fix shutdown/restart capability, upstream bug #549150
-	epatch "${WORKDIR}/${PN}-2.26.1-shutdown.patch"
+	epatch "${FILESDIR}/${PN}-2.26.2-shutdown.patch"
 
 	# Add "session saving" button back, upstream bug #575544
-	epatch "${WORKDIR}/${PN}-2.26.1-session-saving-button.patch"
+	epatch "${WORKDIR}/${PN}-2.26.2-session-saving-button.patch"
 }
 
 src_install() {