diff options
| -rw-r--r-- | xfce-base/thunar/Manifest | 2 | ||||
| -rw-r--r-- | xfce-base/thunar/thunar-1.1.2.ebuild | 76 | ||||
| -rw-r--r-- | xfce-base/xfce4-panel/Manifest | 2 | ||||
| -rw-r--r-- | xfce-base/xfce4-panel/xfce4-panel-4.7.3.ebuild | 41 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/Manifest | 4 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/files/xfce4-session-4.7.0-ck-launch-session.patch | 209 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/files/xfce4-session-4.7.0-gnome-keyring.patch | 94 | ||||
| -rw-r--r-- | xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild | 47 |
8 files changed, 0 insertions, 475 deletions
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest index f87aa4fd639e..513ffdb8e14e 100644 --- a/xfce-base/thunar/Manifest +++ b/xfce-base/thunar/Manifest @@ -1,8 +1,6 @@ DIST Thunar-1.0.2.tar.bz2 9320379 RMD160 c5b98203353cef7312b736053e5a7678d0644272 SHA1 f7ae00c32402e4bc502aba15477b78e2c558c7c3 SHA256 75829b34a68346b33f66882bedc9794d580c200d11af22541885750459b55c03 -DIST Thunar-1.1.2.tar.bz2 4041594 RMD160 5d96147bffcf7217ab00d8a4836b93438fc1bb31 SHA1 134ecef7efc8c2ccd85baa94fbcae80781aecd3d SHA256 d9c85807a995b9fe8dd556782e779791ae335da324b667689cae1d7b6f8eca20 DIST Thunar-1.1.3.tar.bz2 4179054 RMD160 b33d220be2228029c8b25a994600f9b928bd0137 SHA1 6c063df1988f37e381664f97c3c1c8b80a326750 SHA256 84080e11c893d1479ac3b91106aabf1c6cd81bce83e40286e60daca928f586b4 EBUILD thunar-1.0.2.ebuild 2178 RMD160 7bc77198e5ce3737fbfbf69de1846654c4b3fd39 SHA1 9242021d0a58ffc2e193dadb77880e0eff56dee8 SHA256 567888a33ae7a222f84e7d3efcf13d90bc08999a426e29e05c85f65906313707 -EBUILD thunar-1.1.2.ebuild 2137 RMD160 9a1f4ceda0f9e8ff931f96a12752a1a655195030 SHA1 b5f331448b9c59777572afae768b36f5ea5edc13 SHA256 c60a0d10766baf2fbcb137bcdb59204f9f2b6b21d6758f4c2b474acba4a63d4b EBUILD thunar-1.1.3.ebuild 1943 RMD160 8e50be315055acd8ddad375afaacc35c89ea96b8 SHA1 fc13d022cb60b95d68fdc46257432f81eed23356 SHA256 edfd1ba088708efbe3fa9e619afd5e1d5eb96a3b5bf9cd67dc270f9024ce6eb1 MISC ChangeLog 13589 RMD160 1ce1204ab30c170a7ec4b5496cf1ec8ccdd320b7 SHA1 e94c50cb94dea631a7593baf88f07906a72a845b SHA256 c914d2e3421cd20dd9f1c4bb2d05e98e082a250697d5a2747b6fd17b61623742 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/xfce-base/thunar/thunar-1.1.2.ebuild b/xfce-base/thunar/thunar-1.1.2.ebuild deleted file mode 100644 index 5b549bc9b784..000000000000 --- a/xfce-base/thunar/thunar-1.1.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.1.2.ebuild,v 1.1 2010/09/05 20:26:24 ssuominen Exp $ - -EAPI=3 -inherit virtualx xfconf - -MY_P=${P/t/T} - -DESCRIPTION="File manager for Xfce4" -HOMEPAGE="http://thunar.xfce.org/" -SRC_URI="mirror://xfce/src/xfce/${PN}/1.1/${MY_P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="dbus debug exif libnotify pcre startup-notification test xfce_plugins_trash udev" - -COMMON_DEPEND=">=xfce-base/exo-0.5.3 - >=dev-libs/glib-2.18:2 - >=x11-libs/gtk+-2.14:2 - >=xfce-base/libxfce4util-4.6 - >=xfce-base/libxfce4ui-4.7.1 - >=dev-lang/perl-5.6 - dbus? ( dev-libs/dbus-glib ) - exif? ( >=media-libs/libexif-0.6.19 ) - libnotify? ( x11-libs/libnotify ) - pcre? ( >=dev-libs/libpcre-6 ) - startup-notification? ( x11-libs/startup-notification ) - xfce_plugins_trash? ( dev-libs/dbus-glib - >=xfce-base/xfce4-panel-4.3.90 ) - udev? ( >=sys-fs/udev-145[extras] )" -RDEPEND="${COMMON_DEPEND} - >=x11-misc/shared-mime-info-0.71 - >=dev-util/desktop-file-utils-0.16 - udev? ( >=gnome-base/gvfs-1.6.3[gdu,udev] )" -DEPEND="${COMMON_DEPEND} - dev-util/intltool - dev-util/pkgconfig - sys-devel/gettext" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - XFCONF="--docdir=${EPREFIX}/usr/share/doc/${PF} - --disable-dependency-tracking - $(use_enable dbus) - $(use_enable startup-notification) - $(use_enable udev gudev) - $(use_enable libnotify notifications) - $(use_enable debug) - $(use_enable exif) - $(use_enable pcre) - --with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html" - - if use xfce_plugins_trash; then - XFCONF="${XFCONF} --enable-dbus" - else - XFCONF="${XFCONF} --disable-tpa-plugin" - fi - - DOCS="AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO" -} - -src_test() { - Xemake check || die -} - -pkg_postinst() { - xfconf_pkg_postinst - - echo - elog "If you are seeing some odd dbus error, make sure your user is in the" - elog "plugdev group. See Gentoo bug #279077 for more info" - echo -} diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest index f76ce12f7f16..43b5c586e21e 100644 --- a/xfce-base/xfce4-panel/Manifest +++ b/xfce-base/xfce4-panel/Manifest @@ -1,8 +1,6 @@ DIST xfce4-panel-4.6.4.tar.bz2 902913 RMD160 35eaab8726a447b961024d433845f30804da4751 SHA1 d2b310c036be84ed9886c06ae35b7a1a8eabfcb8 SHA256 cc9b70bdc73ab80f46655a34cdbaf876a67cd90b50230cbf4d77a3106a5c54e7 -DIST xfce4-panel-4.7.3.tar.bz2 1131034 RMD160 f8db00df9a26a1c3f70560b8fb6fbb6fda6037b3 SHA1 3e95838819e5aba91825d11822192b0249586c1e SHA256 5f6daf102337651cf6832ed3b1425d31e3842fafe76682049b2752c703f623e1 DIST xfce4-panel-4.7.4.tar.bz2 1171070 RMD160 422b65c3269c3aa629a12b4c9177fe428e7ab18a SHA1 e66820ac9254a513820bd89e2dd76ee0b787b7a0 SHA256 db7b7549077110f430f33960120abca4316f4729ad81208c002dbdf8cc6f71bb EBUILD xfce4-panel-4.6.4.ebuild 1141 RMD160 b661779f87fd92e9a154299ce1f2d5ecb8c23bdf SHA1 c4355f3afae67c7aa414487524f1a99dbcc4d845 SHA256 553383f8f205139a220ee286503b45e898f77ffa7c943f7b0c7c2b13ab642bde -EBUILD xfce4-panel-4.7.3.ebuild 1188 RMD160 884ca49cd5e096e161a2edf216ffaa2504aabe19 SHA1 0af6f8ce4b8f2c6355f09d670f397e63fafa4cc5 SHA256 e15d7f667c611f574c62c331133f23350c02b7b69f30b9049c0589bed6c584cb EBUILD xfce4-panel-4.7.4.ebuild 1195 RMD160 bdf98671c88f63c5efcaa5ef19b2fce457ed180a SHA1 74545417508a6a2bbe7c3881709e60d285103159 SHA256 b8c8a4ab531e606f9842cce156c0ced3031151c56fc1caf86f1d364eaa2cd7e1 MISC ChangeLog 21421 RMD160 67d949f03a81a6755bac24bcdbd3124446321733 SHA1 c059c7375755e9058cf2c8c89e1edcf2e5a197ef SHA256 1f84b6b7ed82a402875301a2f4b4bd305d68514c8696581ace2f6eb91a0ac669 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.7.3.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.7.3.ebuild deleted file mode 100644 index 25afb1b58c57..000000000000 --- a/xfce-base/xfce4-panel/xfce4-panel-4.7.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.7.3.ebuild,v 1.1 2010/09/05 20:32:46 ssuominen Exp $ - -EAPI=3 -inherit xfconf - -DESCRIPTION="Panel for Xfce4" -HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/" -SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug" - -RDEPEND="x11-libs/libX11 - >=xfce-base/libxfce4util-4.6 - >=xfce-base/garcon-0.1.1 - >=xfce-base/libxfce4ui-4.7.1 - >=xfce-base/xfconf-4.7.2 - >=xfce-base/exo-0.5.1 - >=x11-libs/gtk+-2.14:2 - >=dev-libs/glib-2.18:2 - >=dev-libs/dbus-glib-0.73 - >=x11-libs/cairo-1 - >=x11-libs/libwnck-2.22" -DEPEND="${RDEPEND} - dev-lang/perl - dev-util/intltool - sys-devel/gettext - dev-util/pkgconfig" - -pkg_setup() { - XFCONF="--docdir=${EPREFIX}/usr/share/doc/${PF} - --disable-dependency-tracking - --disable-static - $(xfconf_use_debug) - --with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html" - DOCS="AUTHORS ChangeLog NEWS THANKS" -} diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest index bc0788b095f1..90fd9ceb822b 100644 --- a/xfce-base/xfce4-session/Manifest +++ b/xfce-base/xfce4-session/Manifest @@ -1,10 +1,6 @@ -AUX xfce4-session-4.7.0-ck-launch-session.patch 7659 RMD160 baf60ff92590636b2bdaf329490d123ed587cbbb SHA1 05de9d398df53ee580413ea2efb5c6fb2abae59f SHA256 6c5895d4b1323c3c06da553936dc7dc894f2da96bf4a0142bb17b2e3ee701bc6 -AUX xfce4-session-4.7.0-gnome-keyring.patch 2915 RMD160 4a106f95f195c4da7f0e695d1fd82a9a2764187e SHA1 03a5b72a5d786ef5f1a6916c25f1ae5b5c89523d SHA256 56454bb320d2ff2871597bbd97457c39292e84c48c78af7483716c8a5e25f5eb DIST xfce4-session-4.6.2.tar.bz2 1385541 RMD160 3c45028d57aee5950a485d760799d0c74ada735e SHA1 2a5778a1543f97845f118a186e2dbb8a8ea3ff4b SHA256 725e269254c34c530acb670f5ccd0fd69b57cbe9f2176abd8499fc5d6dcd30a8 -DIST xfce4-session-4.7.0.tar.bz2 1430243 RMD160 e8dc56980a40ef71ec02681f15a178db140ad9fd SHA1 500d1ec578f39ece6b34a6525a8ce0f6e78dc86d SHA256 20e5979306566e5b8f6a556fcdbd2624809051250c33e3f2d0eb67b3911ec218 DIST xfce4-session-4.7.1.tar.bz2 1460911 RMD160 99958f36f88b44e98bc3f9b4f34c2507fa539035 SHA1 d65c79e0bf7337705af1cf14964dd53b3422e2ce SHA256 5ee970da59a1433efd4c321794134e4af202ba7b6375ebaf63c84fc246877ee0 EBUILD xfce4-session-4.6.2.ebuild 1651 RMD160 63827c6581d8720ba7205fd1fbf9f816d4caabbc SHA1 dae3fc51c7119453f757b1effaebee17b8fbcaa8 SHA256 3a95405ac286b4195e1072414d966eba3b1a3fb4e825f5b9f3a28e6bc9f1a98c -EBUILD xfce4-session-4.7.0.ebuild 1469 RMD160 249c0f056ef610ccc68a87caa619769041bdfd5d SHA1 bc220c945178b5606988d598a325f27e98af4b57 SHA256 7997d5d6ee0c71738c0659dfc00c8d9e978bc6ea5e996adf83d49bbc0c51b1b2 EBUILD xfce4-session-4.7.1.ebuild 1378 RMD160 08d0f3fd91acaed4edc04ce94f32f7325ac8f0cd SHA1 62ab3519e2ecfa7279c60eeb432def3a71e7c500 SHA256 8e9fb5b5e3fd3e9fae4c16437f4c9c977a6f1059ca5d3fbd8ddedb80c0367db9 MISC ChangeLog 15604 RMD160 2c6bd28809f44c6bfe2dc559e0b8bea37a55593e SHA1 fef88b037e9a5c3b6583ca31224b4de5a3a808f9 SHA256 5c4b73e0374cd32d21d20fcd341ee8eb1465c2367da6f17f827ee51b83b6845c MISC metadata.xml 365 RMD160 f5394f10309125c57f366f5bc00d72b7ed2c187f SHA1 71fa94d2aa83cffa134f23be4ec0736e78bc8a19 SHA256 3dd7350379719051299f2cd5f5501c0b3c5cf699b1bd0b89e0c9e6517a4c1b4d diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.7.0-ck-launch-session.patch b/xfce-base/xfce4-session/files/xfce4-session-4.7.0-ck-launch-session.patch deleted file mode 100644 index 4f65e410793a..000000000000 --- a/xfce-base/xfce4-session/files/xfce4-session-4.7.0-ck-launch-session.patch +++ /dev/null @@ -1,209 +0,0 @@ -From 35c620aa3749581580e0917ff7c2db1c223564a8 Mon Sep 17 00:00:00 2001 -From: Jannis Pohlmann <jannis@xfce.org> -Date: Wed, 08 Sep 2010 10:02:46 +0000 -Subject: Reuse existing ConsoleKit sessions (bug #6685). - -According to the ConsoleKit documentation, only one session leader may -exist for a session. An application becomes the leader of a session by -calling org.freedesktop.ConsoleKit.Manager.OpenSession() which returns a -session identifier. This identifier is then made available to other -session clients by setting the XDG_SESSION_COOKIE environment variable. - -GDM and upstart open ConsoleKit sessions on their own and desktop -environments are supposed to reuse these sessions instead of opening new -ones. So with this commit, xfce4-session checks for XDG_SESSION_COOKIE -and, if it exists, does not try to call OpenSession in order to -overwrite this environment variable. - -I tested this with xfce4-session-logout which finally allows me to -reboot and shutdown again. - -Also fix the indentation, use spaces instead of tabs etc. ---- -diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c -index 3eb7696..892b6c6 100644 ---- a/xfce4-session/xfsm-manager.c -+++ b/xfce4-session/xfsm-manager.c -@@ -257,11 +255,11 @@ xfsm_manager_init (XfsmManager *manager) - #ifdef ENABLE_CONSOLE_KIT - manager->system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - -- if ( G_LIKELY (manager->system_bus != NULL) ) -+ if (G_LIKELY (manager->system_bus != NULL)) - { - xfsm_manager_consolekit_init (manager); - } -- else if ( error ) -+ else if (error) - { - g_warning ("Failed to connect to the system bus : %s", error->message); - g_error_free (error); -@@ -279,7 +277,7 @@ xfsm_manager_finalize (GObject *obj) - #ifdef ENABLE_CONSOLE_KIT - xfsm_manager_consolekit_cleanup (manager); - -- if ( manager->system_bus ) -+ if (manager->system_bus) - dbus_g_connection_unref (manager->system_bus); - #endif /*ENABLE_CONSOLE_KIT*/ - -@@ -342,6 +340,7 @@ xfsm_manager_new (void) - return manager; - } - -+ - #ifdef ENABLE_CONSOLE_KIT - static void xfsm_manager_consolekit_init (XfsmManager *manager) - { -@@ -349,61 +348,83 @@ static void xfsm_manager_consolekit_init (XfsmManager *manager) - gboolean ret; - - manager->consolekit_proxy = dbus_g_proxy_new_for_name_owner (manager->system_bus, -- "org.freedesktop.ConsoleKit", -- "/org/freedesktop/ConsoleKit/Manager", -- "org.freedesktop.ConsoleKit.Manager", -- NULL); -+ "org.freedesktop.ConsoleKit", -+ "/org/freedesktop/ConsoleKit/Manager", -+ "org.freedesktop.ConsoleKit.Manager", -+ NULL); - - -- if ( G_UNLIKELY (!manager->consolekit_proxy) ) -+ if (G_UNLIKELY (!manager->consolekit_proxy)) - { - g_warning ("Failed to create proxy for 'org.freedesktop.ConsoleKit'"); - return; - } - -- ret = dbus_g_proxy_call (manager->consolekit_proxy, "OpenSession", &error, -- G_TYPE_INVALID, -- G_TYPE_STRING, &manager->consolekit_cookie, -- G_TYPE_INVALID); -- -- if ( G_LIKELY (ret) ) -+ /* check if there is a session to reuse */ -+ if (g_getenv ("XDG_SESSION_COOKIE") != NULL) - { -- /* -- * ConsoleKit doc says that the leader session should set the cookie -- * on XDG_SESSION_COOKIE env variable. -- */ -- g_warn_if_fail (g_setenv ("XDG_SESSION_COOKIE", -- manager->consolekit_cookie, -- TRUE)); -+#ifdef DEBUG -+ g_debug ("Reusing existing ConsoleKit session: XDG_SESSION_ID=%s", -+ g_getenv ("XDG_SESSION_COOKIE")); -+#endif - } -- else if ( error ) -+ else - { -- g_warning ("OpenSession on 'org.freedesktop.ConsoleKit' failed with %s", error->message); -- g_error_free (error); -+ /* try to open a new session. as its leader we are then responsible for -+ * setting XDG_SESSION_COOKIE as well as closing the session before we exit */ -+ ret = dbus_g_proxy_call (manager->consolekit_proxy, "OpenSession", &error, -+ G_TYPE_INVALID, -+ G_TYPE_STRING, &manager->consolekit_cookie, -+ G_TYPE_INVALID); -+ -+ if (G_LIKELY (ret)) -+ { -+ /* -+ * ConsoleKit doc says that the leader session should set the cookie -+ * on XDG_SESSION_COOKIE env variable. -+ */ -+ if (g_setenv ("XDG_SESSION_COOKIE", manager->consolekit_cookie, TRUE)) -+ { -+#ifdef DEBUG -+ g_debug ("Opening a new ConsoleKit session: XDG_SESSION_COOKIE=%s", -+ manager->consolekit_cookie); -+#endif -+ } -+ else -+ { -+ g_warning ("Failed to set XDG_SESSION_COOKIE"); -+ } -+ } -+ else if (error) -+ { -+ g_warning ("OpenSession on 'org.freedesktop.ConsoleKit' failed with %s", error->message); -+ g_error_free (error); -+ } - } - } - -+ - static void xfsm_manager_consolekit_cleanup (XfsmManager *manager) - { -- if ( manager->consolekit_proxy ) -+ GError *error = NULL; -+ gboolean ret, result; -+ -+ if (manager->consolekit_proxy) - { - if (manager->consolekit_cookie) -- { -- GError *error = NULL; -- gboolean ret, result; -- -- ret = dbus_g_proxy_call (manager->consolekit_proxy, "CloseSession", &error, -- G_TYPE_STRING, manager->consolekit_cookie, -- G_TYPE_INVALID, -- G_TYPE_BOOLEAN, &result, -- G_TYPE_INVALID); -- if ( !ret ) -- { -- g_warning ("CloseSession on 'org.freedesktop.ConsoleKit' failed with %s", error->message); -- g_error_free (error); -- } -- g_free (manager->consolekit_cookie); -- } -+ { -+ ret = dbus_g_proxy_call (manager->consolekit_proxy, "CloseSession", &error, -+ G_TYPE_STRING, manager->consolekit_cookie, -+ G_TYPE_INVALID, -+ G_TYPE_BOOLEAN, &result, -+ G_TYPE_INVALID); -+ if (!ret) -+ { -+ g_warning ("CloseSession on 'org.freedesktop.ConsoleKit' failed with %s", error->message); -+ g_error_free (error); -+ } -+ g_free (manager->consolekit_cookie); -+ } - g_object_unref (manager->consolekit_proxy); - } - } -@@ -1181,6 +1202,7 @@ xfsm_manager_interact_done (XfsmManager *manager, - xfsm_manager_start_client_save_timeout (manager, client); - } - -+ - static void - xfsm_manager_save_yourself_global (XfsmManager *manager, - gint save_type, -@@ -1222,8 +1244,8 @@ xfsm_manager_save_yourself_global (XfsmManager *manager, - shutdown_helper = xfsm_shutdown_helper_new (); - - if (!xfsm_shutdown_helper_send_command (shutdown_helper, -- manager->shutdown_type, -- &error)) -+ manager->shutdown_type, -+ &error)) - { - xfce_message_dialog (NULL, _("Shutdown Failed"), - GTK_STOCK_DIALOG_ERROR, -@@ -1237,7 +1259,7 @@ xfsm_manager_save_yourself_global (XfsmManager *manager, - } - - /* clean up and return */ -- g_object_unref (shutdown_helper); -+ g_object_unref (shutdown_helper); - - - /* at this point, either we failed to suspend/hibernate, or we --- -cgit v0.8.2.1 diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.7.0-gnome-keyring.patch b/xfce-base/xfce4-session/files/xfce4-session-4.7.0-gnome-keyring.patch deleted file mode 100644 index 72bd990d162e..000000000000 --- a/xfce-base/xfce4-session/files/xfce4-session-4.7.0-gnome-keyring.patch +++ /dev/null @@ -1,94 +0,0 @@ -From f32cd3e21c9d557cc8fab23b7c59baff36b16a9a Mon Sep 17 00:00:00 2001 -From: Jérôme Guelfucci <jeromeg@xfce.org> -Date: Sun, 24 Oct 2010 20:01:47 +0000 -Subject: Add support for new gnome-keyring (Luca Niccoli). - -This fixes bugs #5912, #5137 and #6073. Support for old gnome-keyring -versions is dropped with this commit. ---- -diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c -index 62f1452..3ed79b3 100644 ---- a/xfce4-session/xfsm-compat-gnome.c -+++ b/xfce4-session/xfsm-compat-gnome.c -@@ -104,27 +104,15 @@ child_setup (gpointer user_data) - static void - gnome_keyring_daemon_startup (void) - { -- const char *old_keyring; -- - GError *error = NULL; - gchar *sout; - gchar **lines; -+ gsize lineno; - gint status; - long pid; - gchar *pid_str; - gchar *end; -- char *argv[2]; -- -- /* If there is already a working keyring, don't start a new daemon */ -- old_keyring = g_getenv ("GNOME_KEYRING_SOCKET"); -- if (old_keyring != NULL && access (old_keyring, R_OK | W_OK) == 0) -- { --#ifdef HAVE_GNOME_KEYRING -- gnome_keyring_daemon_prepare_environment_sync (); --#endif -- return; -- } -- -+ char *argv[3]; - - /* Pipe to slave keyring lifetime to */ - if (pipe (keyring_lifetime_pipe)) -@@ -135,8 +123,10 @@ gnome_keyring_daemon_startup (void) - - error = NULL; - argv[0] = GNOME_KEYRING_DAEMON; -- argv[1] = NULL; -- g_spawn_sync (NULL, argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN, -+ argv[1] = "--start"; -+ argv[2] = NULL; -+ g_spawn_sync (NULL, argv, NULL, -+ G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN, - child_setup, NULL, - &sout, NULL, &status, &error); - -@@ -154,20 +144,22 @@ gnome_keyring_daemon_startup (void) - { - if (WIFEXITED (status) && WEXITSTATUS (status) == 0 && sout != NULL) - { -- lines = g_strsplit (sout, "\n", 3); -- -- if (lines[0] != NULL && lines[1] != NULL -- && g_str_has_prefix (lines[1], "GNOME_KEYRING_PID=")) -- { -- pid_str = lines[1] + strlen ("GNOME_KEYRING_PID="); -- pid = strtol (pid_str, &end, 10); -- -- if (end != pid_str) -- { -- gnome_keyring_daemon_pid = pid; -- xfce_putenv (lines[0]); -- } -- } -+ lines = g_strsplit (sout, "\n", 0); -+ -+ for (lineno = 0; lines[lineno] != NULL; lineno++) -+ { -+ xfce_putenv (lines[lineno]); -+ -+ if (g_str_has_prefix (lines[lineno], "GNOME_KEYRING_PID=")) -+ { -+ pid_str = lines[lineno] + strlen ("GNOME_KEYRING_PID="); -+ pid = strtol (pid_str, &end, 10); -+ if (end != pid_str) -+ { -+ gnome_keyring_daemon_pid = pid; -+ } -+ } -+ } - - g_strfreev (lines); - --- -cgit v0.8.3.4 diff --git a/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild deleted file mode 100644 index f27a0947df77..000000000000 --- a/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.7.0.ebuild,v 1.4 2010/10/24 20:18:29 ssuominen Exp $ - -EAPI=3 -inherit xfconf - -DESCRIPTION="Session manager for Xfce4" -HOMEPAGE="http://www.xfce.org/projects/xfce4-session/" -SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug gnome gnome-keyring xfce_plugins_logout" - -RDEPEND=">=dev-libs/dbus-glib-0.73 - x11-apps/iceauth - x11-libs/libSM - >=x11-libs/libwnck-2.22 - x11-libs/libX11 - >=xfce-base/libxfce4util-4.7 - >=xfce-base/libxfce4ui-4.7 - >=xfce-base/xfconf-4.7 - >=xfce-base/xfce-utils-4.7 - gnome? ( gnome-base/gconf ) - gnome-keyring? ( gnome-base/libgnome-keyring ) - xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.7.2 )" -DEPEND="${RDEPEND} - dev-util/intltool - dev-util/pkgconfig - sys-devel/gettext" - -pkg_setup() { - PATCHES=( - "${FILESDIR}"/${P}-ck-launch-session.patch - "${FILESDIR}"/${P}-gnome-keyring.patch - ) - XFCONF="--docdir=${EPREFIX}/usr/share/doc/${PF} - --disable-dependency-tracking - --disable-static - $(use_enable xfce_plugins_logout panel-plugin) - $(use_enable gnome) - $(use_enable gnome-keyring libgnome-keyring) - $(xfconf_use_debug)" - DOCS="AUTHORS BUGS ChangeLog NEWS README TODO" -} |