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

2016-10-12 Thread 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
===
--- PKGBUILD2016-10-12 13:38:08 UTC (rev 278493)
+++ PKGBUILD2016-10-12 14:23:12 UTC (rev 278494)
@@ -2,22 +2,19 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 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 
-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.0 +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 1 /* 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.0 +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 
- 
- /* 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_ACCEL0

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

2016-07-14 Thread Jan de Groot 
Date: Thursday, July 14, 2016 @ 08:50:18
  Author: jgc
Revision: 271846

upgpkg: gnome-session 3.20.2-1

Remove install (hooks), Fix FS#49977

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

---+
 PKGBUILD  |   17 +++--
 gnome-session.install |   12 
 platformtheme.patch   |   34 ++
 3 files changed, 45 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-14 06:45:52 UTC (rev 271845)
+++ PKGBUILD2016-07-14 08:50:18 UTC (rev 271846)
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=gnome-session
-pkgver=3.20.1
+pkgver=3.20.2
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
@@ -11,13 +11,14 @@
  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=('2ae9f53dc74f851222fbefbe0dc08db0a78cc76ceeb156f92ebd4d40fd038913'
-'9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+timeout.patch
+platformtheme.patch)
+sha256sums=('025f97e0b9f5431890598d6130040e1e7071771cc29e1d29d8e2e7c84d95f6da'
+'9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc'
+'912cab8e94a5d8d97753746899830f61508eec4233480794c7e7f6b0dcd924ee')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -24,7 +25,11 @@
 
   # Increase timeout, for slow machines
   patch -Np1 -i ../timeout.patch
+
+  # FS#49977
+  patch -Np1 -i ../platformtheme.patch
 }
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \

Deleted: gnome-session.install
===
--- gnome-session.install   2016-07-14 06:45:52 UTC (rev 271845)
+++ gnome-session.install   2016-07-14 08:50:18 UTC (rev 271846)
@@ -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
-}

Added: platformtheme.patch
===
--- platformtheme.patch (rev 0)
+++ platformtheme.patch 2016-07-14 08:50:18 UTC (rev 271846)
@@ -0,0 +1,34 @@
+From ce4208add3b49d440e0c418229774dd802ee6b87 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+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