summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/cinnamon-session/APKBUILD14
-rw-r--r--testing/cinnamon-session/timeout.patch24
2 files changed, 33 insertions, 5 deletions
diff --git a/testing/cinnamon-session/APKBUILD b/testing/cinnamon-session/APKBUILD
index 791fc1236..b7ff3c569 100644
--- a/testing/cinnamon-session/APKBUILD
+++ b/testing/cinnamon-session/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=cinnamon-session
pkgver=2.0.6
-pkgrel=1
+pkgrel=2
pkgdesc="The Cinnamon Session Handler"
url="https://github.com/linuxmint/cinnamon-session"
arch="all"
@@ -14,7 +14,8 @@ makedepends="$depends_dev automake autoconf libtool xtrans gnome-common intltool
install=""
subpackages="$pkgname-doc $pkgname-lang"
source="${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
- remove_sessionmigration.patch"
+ remove_sessionmigration.patch
+ timeout.patch"
_builddir="$srcdir/$pkgname-$pkgver"
@@ -49,8 +50,11 @@ package() {
}
md5sums="caa16ec2cd89cc5466e4131ab096a3bd cinnamon-session-2.0.6.tar.gz
-e93d23d7a474dd741f3bb3035104d0a3 remove_sessionmigration.patch"
+e93d23d7a474dd741f3bb3035104d0a3 remove_sessionmigration.patch
+920db4d6afa20761339cd617cd6592f3 timeout.patch"
sha256sums="831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567 cinnamon-session-2.0.6.tar.gz
-f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736 remove_sessionmigration.patch"
+f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736 remove_sessionmigration.patch
+ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a timeout.patch"
sha512sums="2a17dc620d05b51bc2701f90dc95fb7413f4822e4641ede6eaefbc1397a9454bcbf0bdfc44866f4a629ff0a3ecb7452515488113ef4a2fe362ab29021212aa27 cinnamon-session-2.0.6.tar.gz
-a51ded6f09ac9efac2b201289635c63ae7ea0d1435ba50c60a33b9518752bb8e09ee76bf9c65a8b631cabd285e68cb8a5c7a8c56b5d98970611c0a6110872423 remove_sessionmigration.patch"
+a51ded6f09ac9efac2b201289635c63ae7ea0d1435ba50c60a33b9518752bb8e09ee76bf9c65a8b631cabd285e68cb8a5c7a8c56b5d98970611c0a6110872423 remove_sessionmigration.patch
+dc74cb6e98755e7ddad5e53a4be291ecd034d0537347ca1b436c6027beeefa711951a759057dc97200459a34cb0951340c7d7023e61422ea7cc7c42c33455ea7 timeout.patch"
diff --git a/testing/cinnamon-session/timeout.patch b/testing/cinnamon-session/timeout.patch
new file mode 100644
index 000000000..f4f5b64ca
--- /dev/null
+++ b/testing/cinnamon-session/timeout.patch
@@ -0,0 +1,24 @@
+diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
+--- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c 2012-02-02 15:33:01.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c 2012-06-10 02:39:46.184348462 +0200
+@@ -36,7 +36,7 @@
+ #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
+
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
+-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
++#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
+
+ typedef void (*GsmFillHandleProvider) (const char *provides,
+ const char *default_provider,
+diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
+--- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100
++++ cinnamon-session-3.4.2-timeout/tools/cinnamon-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 12000
+
+ /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
+ #define NO_ACCEL 0