[arch-commits] Commit in gnome-panel/trunk (PKGBUILD logout-hang-workaround.patch)

[Balló György]

    Date: Tuesday, April 23, 2013 @ 04:12:42
  Author: bgyorgy
Revision: 88821

upgpkg: gnome-panel 3.6.2-4

Remove logout workaround (no longer needed)

Modified:
  gnome-panel/trunk/PKGBUILD
Deleted:
  gnome-panel/trunk/logout-hang-workaround.patch

------------------------------+
 PKGBUILD                     |    7 +------
 logout-hang-workaround.patch |   15 ---------------
 2 files changed, 1 insertion(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-23 01:21:30 UTC (rev 88820)
+++ PKGBUILD	2013-04-23 02:12:42 UTC (rev 88821)
@@ -5,7 +5,7 @@
 pkgbase=gnome-panel
 pkgname=('gnome-panel' 'gnome-flashback-session')
 pkgver=3.6.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="Legacy GNOME panel"
@@ -19,14 +19,12 @@
         gnome-desktop-3.8.patch
         drop-gweather-xml-include.patch
         18_fix_force_quit_applet.patch
-        logout-hang-workaround.patch
         0001-Add-the-GNOME-Flashback-session.patch
         fix-autoconf.patch)
 sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079'
             '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c'
             'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305'
             '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775'
-            'e98391114fe618d3c9530cd5ad88e5d0d0e3b62890e4494f7db6a76ec3613a47'
             'f313791d246749f18764ad4af13c4efe54483bc327fab371c47f9fbfc25b20a9'
             '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71')
 
@@ -42,9 +40,6 @@
   # Fix force quit applet to avoid freeze
   patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch"
 
-  # Apply a workaround to avoid hang on logout for 15-20 sec
-  patch -Np1 -i "$srcdir/logout-hang-workaround.patch"
-
   # Add GNOME Flashback session
   # https://bugzilla.gnome.org/show_bug.cgi?id=694625
   patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch"

Deleted: logout-hang-workaround.patch
===================================================================
--- logout-hang-workaround.patch	2013-04-23 01:21:30 UTC (rev 88820)
+++ logout-hang-workaround.patch	2013-04-23 02:12:42 UTC (rev 88821)
@@ -1,15 +0,0 @@
-diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-session.c gnome-panel-3.6.2/gnome-panel/panel-session.c
---- gnome-panel-3.6.2.orig/gnome-panel/panel-session.c	2012-09-03 17:41:42.000000000 +0200
-+++ gnome-panel-3.6.2/gnome-panel/panel-session.c	2013-04-11 00:59:42.125864185 +0200
-@@ -69,11 +69,6 @@
- 
- 	egg_sm_client_set_mode (mode);
- 
--	client = egg_sm_client_get ();
--
--	g_signal_connect (client, "quit",
--			  G_CALLBACK (panel_session_handle_quit), NULL);
--
- 	/* We don't want the WM to try and save/restore our
- 	 * window position */
- 	gdk_x11_set_sm_client_id (NULL);