[arch-commits] Commit in gnome-session/trunk (PKGBUILD timeout.patch)

[Jan Steffens]

    Date: Saturday, June 9, 2012 @ 21:41:31
  Author: heftig
Revision: 161340

fix timeout patch so it actually does something

Modified:
  gnome-session/trunk/PKGBUILD
  gnome-session/trunk/timeout.patch

---------------+
 PKGBUILD      |    4 ++--
 timeout.patch |   16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-10 01:25:30 UTC (rev 161339)
+++ PKGBUILD	2012-06-10 01:41:31 UTC (rev 161340)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-session
 pkgver=3.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -19,7 +19,7 @@
         gnome-session-3.3.1-llvmpipe.patch timeout.patch)
 sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356'
             '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
-            '1942c8144711cf4bc0e776edd366579849e266a446b48cca0205d7ab82241782')
+            '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
 
 build() {
   cd $pkgname-$pkgver

Modified: timeout.patch
===================================================================
--- timeout.patch	2012-06-10 01:25:30 UTC (rev 161339)
+++ timeout.patch	2012-06-10 01:41:31 UTC (rev 161340)
@@ -1,12 +1,24 @@
+diff -u -r gnome-session-3.4.2/gnome-session/gsm-session-fill.c gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c
+--- gnome-session-3.4.2/gnome-session/gsm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
++++ gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
+@@ -36,7 +36,7 @@
+ #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
+ 
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+-#define GSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
++#define GSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
+ 
+ typedef void (*GsmFillHandleProvider) (const char *provides,
+                                        const char *default_provider,
 diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c
 --- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c	2012-06-04 11:06:35.911690067 +0200
++++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
 @@ -30,7 +30,7 @@
  #include <X11/Xatom.h>
  
  /* Wait up to this long for a running check to finish */
 -#define PROPERTY_CHANGE_TIMEOUT 5000
-+#define PROPERTY_CHANGE_TIMEOUT 10000
++#define PROPERTY_CHANGE_TIMEOUT 12000
  
  /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
  #define NO_ACCEL            0