summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-22 22:00:40 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-22 22:00:40 +0000
commit71c43aacf4bc934321a41c2e51ea1caf4aa14258 (patch)
tree99f265cfd75aaf14835d8582e81187bf138957b4 /gnome-base/gnome-session
parentold (diff)
downloadgentoo-2-71c43aacf4bc934321a41c2e51ea1caf4aa14258.tar.gz
gentoo-2-71c43aacf4bc934321a41c2e51ea1caf4aa14258.tar.bz2
gentoo-2-71c43aacf4bc934321a41c2e51ea1caf4aa14258.zip
old
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-session')
-rw-r--r--gnome-base/gnome-session/Manifest6
-rw-r--r--gnome-base/gnome-session/files/gnome-session-2.26.2-shutdown.patch123
-rw-r--r--gnome-base/gnome-session/files/gnome-session-2.27.91-gentoo-branding.patch14
-rw-r--r--gnome-base/gnome-session/gnome-session-2.30.2.ebuild93
4 files changed, 0 insertions, 236 deletions
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 51312c0dc3d3..db0df3c4f849 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,12 +1,6 @@
AUX Gnome 2404 RMD160 48ab5c98ac1cda3593c99f6996f72a61b63b87c7 SHA1 eb7422e38600214911075bffae52fbb348a1ba44 SHA256 259c067c3293fccb587daba38fae888119250330a624687674e140e31c75d297
-AUX gnome-session-2.26.2-shutdown.patch 4512 RMD160 aa6a5fc66959e099ea7734e1f13af39890a37a9b SHA1 07461b0ed9587e0911cf57d2a8c2eaa74fde2f17 SHA256 2539c04941ac75e5003bddf4e4398ba19cbcbaae7f62277974b061737e4d8859
-AUX gnome-session-2.27.91-gentoo-branding.patch 702 RMD160 6727c2e3dbd8fd29461e1224a160b88e027e1cfc SHA1 3223e8cdda47d006b4b7a8e8428509d7d9e417f1 SHA256 c72c26b77dbe89ca4ec6c36eece99dbf3c5cdc099d563fd8a78d68c7d2a197b4
AUX gnome-session-2.32.0-session-saving-button.patch 21424 RMD160 11c4db9951859c2749473a7969693469c9d9e277 SHA1 f7c2f8d98c6deac63ca9448977bdcfa29ae80d52 SHA256 7a2dd8771180bc460fdc034ad95d61ed83b14952b16b17c3cb9a10aade8a1a97
-DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
-DIST gnome-session-2.30.0-session-saving-button.patch 21746 RMD160 f32556cd91edd3904135e4819bfa00621a552f31 SHA1 01a9be032f5d81e7f42d399b5031e1a8b61b41e8 SHA256 e6e283721b556535eef485352c67c68962cd6464b900d601306ed3d5bc0a59ab
-DIST gnome-session-2.30.2.tar.bz2 817580 RMD160 6a269f4625af76bf6a74ad445aec9134827a726c SHA1 1333d2c1ebc4b80a00ee6a2f2d34309cfd73c5ea SHA256 ea7b5d8b254eba0f4ee5f737ed3686fca4fa734ad54a20f206534241f6aef4ec
DIST gnome-session-2.32.1.tar.bz2 774842 RMD160 c579bf197b38c8df7df14c751c056be86695a287 SHA1 7d4c7652247606a972a2f1e50a6a6339809a5b9e SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
-EBUILD gnome-session-2.30.2.ebuild 2614 RMD160 ac81b0e193003b86a5f83567cca4aecb5ec3b987 SHA1 d653095edacfa0aa0a6576113a21a65dd8fc39a7 SHA256 7bdfedddc0637c92ef67107739785aa28db30a159908a6358125ae6aa6436a79
EBUILD gnome-session-2.32.1.ebuild 1818 RMD160 801e7c83e5964ca0fd1f377a2df4f65964c726e4 SHA1 dc5dfce1084b891237b290608d5f81551b139cbf SHA256 65381314484779e4b4391a72f896ab49a35396048f641bab49ea8b99f5aef459
MISC ChangeLog 40732 RMD160 84e365581412890af0febfda09abb91b8d60a5b0 SHA1 7a621b4ee882a329dc5b1bd5cf6899864a841bbf SHA256 4838ab953860b4c3871bbd8841f46bdca64d0d7744557f4bf4b0c5189abd7b50
MISC metadata.xml 230 RMD160 f59c7a574b6658d2a891b25ecb5bc17aa917c5c9 SHA1 8d70ca1f831ffc64e6b913604ecfa86da557ae0a SHA256 9fc76e3356afbd57f947e512782ea5daddcf1938a20a8693e6fb6e99c4f13a5b
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
deleted file mode 100644
index 29cc56955250..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.26.2-shutdown.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-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/files/gnome-session-2.27.91-gentoo-branding.patch b/gnome-base/gnome-session/files/gnome-session-2.27.91-gentoo-branding.patch
deleted file mode 100644
index 60e7dbb238c2..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.27.91-gentoo-branding.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Our own splash for world domination (updated for 2.27.91)
-
----
---- data/gnome-session.schemas.in.in
-+++ data/gnome-session.schemas.in.in
-@@ -40,7 +40,7 @@
- <applyto>/apps/gnome-session/options/splash_image</applyto>
- <owner>gnome</owner>
- <type>string</type>
-- <default>splash/gnome-splash.png</default>
-+ <default>splash/gentoo-splash.png</default>
- <locale name="C">
- <short>Preferred Image to use for login splash screen</short>
- <long>This is a relative path value based off the $datadir/pixmaps/ directory. Sub-directories and image names are valid values. Changing this value will effect the next session login.</long>
diff --git a/gnome-base/gnome-session/gnome-session-2.30.2.ebuild b/gnome-base/gnome-session/gnome-session-2.30.2.ebuild
deleted file mode 100644
index 97fbb8d803bd..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.30.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 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.30.2.ebuild,v 1.14 2011/03/16 10:45:49 nirbheek Exp $
-
-EAPI="3"
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
- mirror://gentoo/${PN}-2.30.0-session-saving-button.patch
- branding? ( mirror://gentoo/gentoo-splash.png )"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="branding doc ipv6 +splash elibc_FreeBSD"
-
-RDEPEND=">=dev-libs/glib-2.16:2
- >=x11-libs/gtk+-2.14.0:2
- >=dev-libs/dbus-glib-0.76
- >=gnome-base/gconf-2:2
- >=x11-libs/startup-notification-0.10
- <sys-power/upower-0.9.6
- elibc_FreeBSD? ( dev-libs/libexecinfo )
-
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXtst
- x11-apps/xdpyinfo"
-DEPEND="${RDEPEND}
- >=dev-lang/perl-5
- >=sys-devel/gettext-0.10.40
- >=dev-util/pkgconfig-0.17
- >=dev-util/intltool-0.40
- !<gnome-base/gdm-2.20.4
- doc? (
- app-text/xmlto
- dev-libs/libxslt )"
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
- # TODO: convert libnotify to a configure option
- G2CONF="${G2CONF}
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --with-default-wm=gnome-wm
- $(use_enable splash)
- $(use_enable doc docbook-docs)
- $(use_enable ipv6)"
-
- if use branding && ! use splash; then
- ewarn "You have disabled splash but enabled branding support"
- ewarn "splash support has been auto-enabled for branding"
- G2CONF="${G2CONF} --enable-splash"
- fi
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Patch for Gentoo Branding (bug #42687)
- use branding && epatch "${FILESDIR}/${PN}-2.27.91-gentoo-branding.patch"
-
- # Fix shutdown/restart capability, upstream bug #549150
- # FIXME: Needs updating for 2.27.91 (package is currently masked)
- #epatch "${FILESDIR}/${PN}-2.26.2-shutdown.patch"
-
- # Add "session saving" button back, upstream bug #575544
- epatch "${DISTDIR}/${PN}-2.30.0-session-saving-button.patch"
-
- # Fix intltoolize broken file, see upstream #577133
- sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-src_install() {
- gnome2_src_install
-
- dodir /etc/X11/Sessions
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome" || die "doexe failed"
-
- # Our own splash for world domination
- if use branding; then
- insinto /usr/share/pixmaps/splash/
- doins "${DISTDIR}/gentoo-splash.png" || die "doins failed"
- fi
-}