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

[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
===================================================================
--- PKGBUILD	2016-07-14 06:45:52 UTC (rev 271845)
+++ PKGBUILD	2016-07-14 08:50:18 UTC (rev 271846)
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 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 <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