[arch-commits] Commit in gnome-session/repos (14 files)
Jan Steffens
heftig at archlinux.org
Sat Apr 9 22:16:51 UTC 2016
Date: Sunday, April 10, 2016 @ 00:16:51
Author: heftig
Revision: 264456
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnome-session/repos/extra-i686/0001-main-fix-starting-gnome-session-via-startx.patch
(from rev 264455, gnome-session/trunk/0001-main-fix-starting-gnome-session-via-startx.patch)
gnome-session/repos/extra-i686/PKGBUILD
(from rev 264455, gnome-session/trunk/PKGBUILD)
gnome-session/repos/extra-i686/gnome-session.install
(from rev 264455, gnome-session/trunk/gnome-session.install)
gnome-session/repos/extra-i686/timeout.patch
(from rev 264455, gnome-session/trunk/timeout.patch)
gnome-session/repos/extra-x86_64/0001-main-fix-starting-gnome-session-via-startx.patch
(from rev 264455, gnome-session/trunk/0001-main-fix-starting-gnome-session-via-startx.patch)
gnome-session/repos/extra-x86_64/PKGBUILD
(from rev 264455, gnome-session/trunk/PKGBUILD)
gnome-session/repos/extra-x86_64/gnome-session.install
(from rev 264455, gnome-session/trunk/gnome-session.install)
gnome-session/repos/extra-x86_64/timeout.patch
(from rev 264455, gnome-session/trunk/timeout.patch)
Deleted:
gnome-session/repos/extra-i686/PKGBUILD
gnome-session/repos/extra-i686/gnome-session.install
gnome-session/repos/extra-i686/timeout.patch
gnome-session/repos/extra-x86_64/PKGBUILD
gnome-session/repos/extra-x86_64/gnome-session.install
gnome-session/repos/extra-x86_64/timeout.patch
--------------------------------------------------------------------+
/PKGBUILD | 86 ++++++++++
/gnome-session.install | 24 ++
/timeout.patch | 48 +++++
extra-i686/0001-main-fix-starting-gnome-session-via-startx.patch | 66 +++++++
extra-i686/PKGBUILD | 39 ----
extra-i686/gnome-session.install | 12 -
extra-i686/timeout.patch | 24 --
extra-x86_64/0001-main-fix-starting-gnome-session-via-startx.patch | 66 +++++++
extra-x86_64/PKGBUILD | 39 ----
extra-x86_64/gnome-session.install | 12 -
extra-x86_64/timeout.patch | 24 --
11 files changed, 290 insertions(+), 150 deletions(-)
Copied: gnome-session/repos/extra-i686/0001-main-fix-starting-gnome-session-via-startx.patch (from rev 264455, gnome-session/trunk/0001-main-fix-starting-gnome-session-via-startx.patch)
===================================================================
--- extra-i686/0001-main-fix-starting-gnome-session-via-startx.patch (rev 0)
+++ extra-i686/0001-main-fix-starting-gnome-session-via-startx.patch 2016-04-09 22:16:51 UTC (rev 264456)
@@ -0,0 +1,66 @@
+From 2d2dcf3354701aa663d08e8337c608e245a9f2c1 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Wed, 30 Mar 2016 18:49:15 +0200
+Subject: [PATCH] main: fix starting gnome session via startx
+
+The changes related to gsm_util_setenv during 3.19.x seems to have
+broken starting a gnome desktop the old fashioned way, eg. via startx.
+
+The gnome.session required components has OnlyShowIn=GNOME; which
+disqualifies them from being started unless XDG_CURRENT_DESKTOP is also
+set to GNOME (by the gio utility function used to look up info).
+
+Currently gnome-session already carries code to catch the case of
+XDG_CURRENT_DESKTOP being unset and set it to GNOME as a fallback.
+Unfortunately the changes to gsm_util_setenv seems to have made it only
+set the values in the (dbus activated) child environment, rather than
+the current environment which g_desktop_app_info_get_show_in is looking
+at.
+
+Make the fallback code set XDG_CURRENT_DESKTOP in both current
+and child environment fixes it.
+Also move the entire hunk of code before initializing gio to
+prevent potential thread issues, now that is uses g_setenv.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764379
+---
+ gnome-session/main.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/gnome-session/main.c b/gnome-session/main.c
+index 14b201b..9f3ca0f 100644
+--- a/gnome-session/main.c
++++ b/gnome-session/main.c
+@@ -292,6 +292,15 @@ main (int argc, char **argv)
+ gsm_util_init_error (TRUE, "%s", error->message);
+ }
+
++ /* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
++ * older versions of GDM, other display managers, and startx,
++ * set a fallback value if we don't find it set.
++ */
++ if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL) {
++ g_setenv("XDG_CURRENT_DESKTOP", "GNOME", TRUE);
++ gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
++ }
++
+ /* Make sure we initialize gio in a way that does not autostart any daemon */
+ initialize_gio ();
+
+@@ -375,13 +384,6 @@ main (int argc, char **argv)
+ exit (1);
+ }
+
+- /* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
+- * older versions of GDM, other display managers, and startx,
+- * set a fallback value if we don't find it set.
+- */
+- if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL)
+- gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
+-
+ /* Push locale variables to dbus-daemon */
+ maybe_push_env_var ("LC_TIME");
+ maybe_push_env_var ("LC_NUMERIC");
+--
+2.8.0
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-04-09 21:51:15 UTC (rev 264455)
+++ extra-i686/PKGBUILD 2016-04-09 22:16:51 UTC (rev 264456)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-session
-pkgver=3.20.0
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
- json-glib libgl libsm libxtst systemd)
-makedepends=(intltool mesa gtk-doc xtrans)
-options=('!emptydirs')
-install=gnome-session.install
-url="http://www.gnome.org"
-groups=(gnome)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- timeout.patch)
-sha256sums=('66ff72379a2e7ee11ab7fcec37ad911d36f12471845dc7755e1ce55d29301b34'
- '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Increase timeout, for slow machines
- patch -Np1 -i ../timeout.patch
-}
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
- --disable-schemas-compile --enable-systemd --disable-gconf
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-session/repos/extra-i686/PKGBUILD (from rev 264455, gnome-session/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-04-09 22:16:51 UTC (rev 264456)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-session
+pkgver=3.20.0
+pkgrel=2
+pkgdesc="The GNOME Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
+ json-glib libgl libsm libxtst systemd)
+makedepends=(intltool mesa gtk-doc xtrans)
+options=('!emptydirs')
+install=gnome-session.install
+url="http://www.gnome.org"
+groups=(gnome)
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ 0001-main-fix-starting-gnome-session-via-startx.patch
+ timeout.patch)
+sha256sums=('66ff72379a2e7ee11ab7fcec37ad911d36f12471845dc7755e1ce55d29301b34'
+ '5b23b7718531d610bb94611599bd9771e1cd7ca1353dcb9868ddead76aa37c96'
+ '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../0001-main-fix-starting-gnome-session-via-startx.patch
+
+ # Increase timeout, for slow machines
+ patch -Np1 -i ../timeout.patch
+}
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
+ --disable-schemas-compile --enable-systemd --disable-gconf
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/gnome-session.install
===================================================================
--- extra-i686/gnome-session.install 2016-04-09 21:51:15 UTC (rev 264455)
+++ extra-i686/gnome-session.install 2016-04-09 22:16:51 UTC (rev 264456)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: gnome-session/repos/extra-i686/gnome-session.install (from rev 264455, gnome-session/trunk/gnome-session.install)
===================================================================
--- extra-i686/gnome-session.install (rev 0)
+++ extra-i686/gnome-session.install 2016-04-09 22:16:51 UTC (rev 264456)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/timeout.patch
===================================================================
--- extra-i686/timeout.patch 2016-04-09 21:51:15 UTC (rev 264455)
+++ extra-i686/timeout.patch 2016-04-09 22:16:51 UTC (rev 264456)
@@ -1,24 +0,0 @@
-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-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
Copied: gnome-session/repos/extra-i686/timeout.patch (from rev 264455, gnome-session/trunk/timeout.patch)
===================================================================
--- extra-i686/timeout.patch (rev 0)
+++ extra-i686/timeout.patch 2016-04-09 22:16:51 UTC (rev 264456)
@@ -0,0 +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-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
Copied: gnome-session/repos/extra-x86_64/0001-main-fix-starting-gnome-session-via-startx.patch (from rev 264455, gnome-session/trunk/0001-main-fix-starting-gnome-session-via-startx.patch)
===================================================================
--- extra-x86_64/0001-main-fix-starting-gnome-session-via-startx.patch (rev 0)
+++ extra-x86_64/0001-main-fix-starting-gnome-session-via-startx.patch 2016-04-09 22:16:51 UTC (rev 264456)
@@ -0,0 +1,66 @@
+From 2d2dcf3354701aa663d08e8337c608e245a9f2c1 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Wed, 30 Mar 2016 18:49:15 +0200
+Subject: [PATCH] main: fix starting gnome session via startx
+
+The changes related to gsm_util_setenv during 3.19.x seems to have
+broken starting a gnome desktop the old fashioned way, eg. via startx.
+
+The gnome.session required components has OnlyShowIn=GNOME; which
+disqualifies them from being started unless XDG_CURRENT_DESKTOP is also
+set to GNOME (by the gio utility function used to look up info).
+
+Currently gnome-session already carries code to catch the case of
+XDG_CURRENT_DESKTOP being unset and set it to GNOME as a fallback.
+Unfortunately the changes to gsm_util_setenv seems to have made it only
+set the values in the (dbus activated) child environment, rather than
+the current environment which g_desktop_app_info_get_show_in is looking
+at.
+
+Make the fallback code set XDG_CURRENT_DESKTOP in both current
+and child environment fixes it.
+Also move the entire hunk of code before initializing gio to
+prevent potential thread issues, now that is uses g_setenv.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764379
+---
+ gnome-session/main.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/gnome-session/main.c b/gnome-session/main.c
+index 14b201b..9f3ca0f 100644
+--- a/gnome-session/main.c
++++ b/gnome-session/main.c
+@@ -292,6 +292,15 @@ main (int argc, char **argv)
+ gsm_util_init_error (TRUE, "%s", error->message);
+ }
+
++ /* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
++ * older versions of GDM, other display managers, and startx,
++ * set a fallback value if we don't find it set.
++ */
++ if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL) {
++ g_setenv("XDG_CURRENT_DESKTOP", "GNOME", TRUE);
++ gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
++ }
++
+ /* Make sure we initialize gio in a way that does not autostart any daemon */
+ initialize_gio ();
+
+@@ -375,13 +384,6 @@ main (int argc, char **argv)
+ exit (1);
+ }
+
+- /* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
+- * older versions of GDM, other display managers, and startx,
+- * set a fallback value if we don't find it set.
+- */
+- if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL)
+- gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
+-
+ /* Push locale variables to dbus-daemon */
+ maybe_push_env_var ("LC_TIME");
+ maybe_push_env_var ("LC_NUMERIC");
+--
+2.8.0
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-04-09 21:51:15 UTC (rev 264455)
+++ extra-x86_64/PKGBUILD 2016-04-09 22:16:51 UTC (rev 264456)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-session
-pkgver=3.20.0
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
- json-glib libgl libsm libxtst systemd)
-makedepends=(intltool mesa gtk-doc xtrans)
-options=('!emptydirs')
-install=gnome-session.install
-url="http://www.gnome.org"
-groups=(gnome)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- timeout.patch)
-sha256sums=('66ff72379a2e7ee11ab7fcec37ad911d36f12471845dc7755e1ce55d29301b34'
- '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Increase timeout, for slow machines
- patch -Np1 -i ../timeout.patch
-}
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
- --disable-schemas-compile --enable-systemd --disable-gconf
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-session/repos/extra-x86_64/PKGBUILD (from rev 264455, gnome-session/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-04-09 22:16:51 UTC (rev 264456)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-session
+pkgver=3.20.0
+pkgrel=2
+pkgdesc="The GNOME Session Handler"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
+ json-glib libgl libsm libxtst systemd)
+makedepends=(intltool mesa gtk-doc xtrans)
+options=('!emptydirs')
+install=gnome-session.install
+url="http://www.gnome.org"
+groups=(gnome)
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ 0001-main-fix-starting-gnome-session-via-startx.patch
+ timeout.patch)
+sha256sums=('66ff72379a2e7ee11ab7fcec37ad911d36f12471845dc7755e1ce55d29301b34'
+ '5b23b7718531d610bb94611599bd9771e1cd7ca1353dcb9868ddead76aa37c96'
+ '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../0001-main-fix-starting-gnome-session-via-startx.patch
+
+ # Increase timeout, for slow machines
+ patch -Np1 -i ../timeout.patch
+}
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
+ --disable-schemas-compile --enable-systemd --disable-gconf
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/gnome-session.install
===================================================================
--- extra-x86_64/gnome-session.install 2016-04-09 21:51:15 UTC (rev 264455)
+++ extra-x86_64/gnome-session.install 2016-04-09 22:16:51 UTC (rev 264456)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: gnome-session/repos/extra-x86_64/gnome-session.install (from rev 264455, gnome-session/trunk/gnome-session.install)
===================================================================
--- extra-x86_64/gnome-session.install (rev 0)
+++ extra-x86_64/gnome-session.install 2016-04-09 22:16:51 UTC (rev 264456)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/timeout.patch
===================================================================
--- extra-x86_64/timeout.patch 2016-04-09 21:51:15 UTC (rev 264455)
+++ extra-x86_64/timeout.patch 2016-04-09 22:16:51 UTC (rev 264456)
@@ -1,24 +0,0 @@
-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-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
Copied: gnome-session/repos/extra-x86_64/timeout.patch (from rev 264455, gnome-session/trunk/timeout.patch)
===================================================================
--- extra-x86_64/timeout.patch (rev 0)
+++ extra-x86_64/timeout.patch 2016-04-09 22:16:51 UTC (rev 264456)
@@ -0,0 +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-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
More information about the arch-commits
mailing list