[arch-commits] Commit in gnome-session/trunk (3 files)

[Jan Steffens]

    Date: Wednesday, October 12, 2016 @ 14:23:12
  Author: heftig
Revision: 278494

3.22.1-1

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

---------------------+
 PKGBUILD            |   17 +++++------------
 platformtheme.patch |   34 ----------------------------------
 timeout.patch       |   24 ------------------------
 3 files changed, 5 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-12 13:38:08 UTC (rev 278493)
+++ PKGBUILD	2016-10-12 14:23:12 UTC (rev 278494)
@@ -2,22 +2,19 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=gnome-session
-pkgver=3.22.0+3+gab2f4c8
+pkgver=3.22.1
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
+url="https://git.gnome.org/browse/gnome-session"
 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 git gnome-common python)
-options=('!emptydirs')
-url="http://www.gnome.org"
 groups=(gnome)
-_commit=ab2f4c857763ca2cb610d381c327a1884d20b055
-source=("git://git.gnome.org/gnome-session#commit=$_commit"
-        timeout.patch)
-sha256sums=('SKIP'
-            '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
+_commit=09f44cc50eafa047856d483ee18ebae99f8b8352  # tags/3.22.1^0
+source=("git://git.gnome.org/gnome-session#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -26,10 +23,6 @@
 
 prepare() {
   cd $pkgname
-
-  # Increase timeout, for slow machines
-  patch -Np1 -i ../timeout.patch
-
   NOCONFIGURE=1 ./autogen.sh
 }
   

Deleted: platformtheme.patch
===================================================================
--- platformtheme.patch	2016-10-12 13:38:08 UTC (rev 278493)
+++ platformtheme.patch	2016-10-12 14:23:12 UTC (rev 278494)
@@ -1,34 +0,0 @@
-From ce4208add3b49d440e0c418229774dd802ee6b87 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Thu, 31 Mar 2016 21:55:55 -0400
-Subject: [PATCH] main: allow users to override QT_QPA_PLATFORMTHEME
-
-commit 971baf2e225abc5a67bd0c149f4cbfdb0ef8c549 added
-code to make Qt applications look like GNOME ones.
-
-That makes it impossible for users to use custom
-platform themes though.
-
-This commit addresses the problem by only setting
-QT_QPA_PLATFORMTHEME if it isn't already set.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=762681
----
- gnome-session/main.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gnome-session/main.c b/gnome-session/main.c
-index 9f3ca0f..615b4ce 100644
---- a/gnome-session/main.c
-+++ b/gnome-session/main.c
-@@ -415,7 +415,9 @@ main (int argc, char **argv)
- 
-         /* Tell Qt to try to make Qt applications look like gnome
-          */
--        gsm_util_setenv ("QT_QPA_PLATFORMTHEME", "qgnomeplatform");
-+        if (g_getenv ("QT_QPA_PLATFORMTHEME") == NULL) {
-+                gsm_util_setenv ("QT_QPA_PLATFORMTHEME", "qgnomeplatform");
-+        }
- 
-         /* hack to fix keyring until we can reorder things in 3.20
-          * https://bugzilla.gnome.org/show_bug.cgi?id=738205

Deleted: timeout.patch
===================================================================
--- timeout.patch	2016-10-12 13:38:08 UTC (rev 278493)
+++ timeout.patch	2016-10-12 14:23:12 UTC (rev 278494)
@@ -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