Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=d0471bc11610c6b4c851e05d5aaab111448050b7
commit d0471bc11610c6b4c851e05d5aaab111448050b7 Author: Priyank <priy...@frugalware.org> Date: Fri Jan 16 01:53:27 2009 +0530 xfce4-session-4.5.93-1-i686 * Version bump * Removed xfce4-session_hibernate_fix.diff (now in upstream) diff --git a/source/xfce4/xfce4-session/FrugalBuild b/source/xfce4/xfce4-session/FrugalBuild index deab258..0c08083 100644 --- a/source/xfce4/xfce4-session/FrugalBuild +++ b/source/xfce4/xfce4-session/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=xfce4-session -pkgver=4.5.92 -pkgrel=2 +pkgver=4.5.93 +pkgrel=1 pkgdesc="A session manager for Xfce4." url="http://www.xfce.org/"; -depends=('libsm' 'libxfcegui4>=4.5.92' 'libxfce4util>=4.5.92' \ +depends=('libsm' 'libxfcegui4>=4.5.93' 'libxfce4util>=4.5.93' \ 'libwnck' 'xorg-server' 'libwnck' 'dbus' 'dbus-glib>=0.76' - 'xfconf>=4.5.92') + 'xfconf>=4.5.93') rodepends=('xsm' 'sessreg' 'xmessage' 'fortune-mod') makedepends=('perl-xml-parser' 'intltool') conflicts=('xfce4-toys') @@ -18,10 +18,9 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet Finclude xfce4 -source=(${sour...@]} $pkgname-hibernate_fix.diff xfce4-session xfce4.desktop) +source=(${sour...@]} xfce4-session xfce4.desktop) Fconfopts="$Fconfopts --with-shutdown-style=hal --with-x" -sha1sums=('e86b2affe1b2b88bb18c6dfeb0d410e85420789d' \ - '33d732f1ea075a067c168ad7b2718407f598eaa9' \ +sha1sums=('922ac2b38b593b20a6b4315e05aae92fc5f4c790' \ 'd99d32e3dfb82ace51fd0ca6699b57078ad350fd' \ 'b0ed29953027f8b61e63da0104099d0f1a81b04e') diff --git a/source/xfce4/xfce4-session/xfce4-session-hibernate_fix.diff b/source/xfce4/xfce4-session/xfce4-session-hibernate_fix.diff deleted file mode 100644 index a6d6269..0000000 --- a/source/xfce4/xfce4-session/xfce4-session-hibernate_fix.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- xfce4-session-4.5.92/xfce4-session/xfsm-manager.c 2008-11-14 15:11:08.000000000 +0530 -+++ xfce4-session.new/xfce4-session/xfsm-manager.c 2008-11-30 23:53:37.000000000 +0530 -@@ -1,4 +1,4 @@ --/* $Id: xfsm-manager.c 28625 2008-11-06 09:40:43Z kelnos $ */ -+/* $Id: xfsm-manager.c 28938 2008-11-28 06:14:37Z kelnos $ */ - /*- - * Copyright (c) 2003-2006 Benedikt Meurer <be...@xfce.org> - * Copyright (c) 2008 Brian Tarricone <bj...@cornell.edu> -@@ -910,14 +910,13 @@ - xfsm_manager_start_client_save_timeout (manager, client); - } - -- if ((manager->failsafe_mode || previous_id != NULL) -- && manager->state == XFSM_MANAGER_STARTUP) -+ if (previous_id != NULL && manager->state == XFSM_MANAGER_STARTUP) - { -- /* Only continue the startup if we are either in Failsafe mode (which -- * means that we don't have any previous_id at all) or the previous_id -- * matched one of the starting_properties. If there was no match -- * above, previous_id will be NULL here. -- * See http://bugs.xfce.org/view_bug_page.php?f_id=212 for details. -+ /* Only continue the startup if the previous_id matched one of -+ * the starting_properties. If there was no match above, -+ * previous_id will be NULL here. We don't need to continue when -+ * in failsafe mode because in that case the failsafe session is -+ * started all at once. - */ - if (g_queue_peek_head (manager->starting_properties) == NULL) - xfsm_startup_session_continue (manager); -@@ -1105,7 +1104,7 @@ - manager->shutdown_type, - &error) - && (error->domain != DBUS_GERROR -- || error->code != DBUS_GERROR_TIMED_OUT))) -+ || error->code != DBUS_GERROR_NO_REPLY))) - { - xfce_message_dialog (NULL, _("Shutdown Failed"), - GTK_STOCK_DIALOG_ERROR, _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
