From 4714cec7e8367a7618b168d0db4bc085dbfaac8a Mon Sep 17 00:00:00 2001 From: root Date: Mon, 11 Jun 2012 00:02:18 +0000 Subject: Mon Jun 11 00:02:18 UTC 2012 --- extra/gnome-session/PKGBUILD | 6 +++--- extra/gnome-session/timeout.patch | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) (limited to 'extra/gnome-session') diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 071a2bf69..da5e34292 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160794 2012-06-05 23:43:39Z heftig $ +# $Id: PKGBUILD 161341 2012-06-10 01:43:11Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) 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 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p gnome-session-3.3.1-llvmpipe.patch timeout.patch) sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356' '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e' - '1942c8144711cf4bc0e776edd366579849e266a446b48cca0205d7ab82241782') + '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-session/timeout.patch b/extra/gnome-session/timeout.patch index 20500206b..a26b0dcf5 100644 --- a/extra/gnome-session/timeout.patch +++ b/extra/gnome-session/timeout.patch @@ -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 /* 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 -- cgit v1.2.3-54-g00ecf