[arch-commits] Commit in gnome-session/repos (8 files)
Jan de Groot
jgc at archlinux.org
Thu Sep 22 21:40:48 UTC 2016
Date: Thursday, September 22, 2016 @ 21:40:47
Author: jgc
Revision: 276854
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
gnome-session/repos/gnome-unstable-i686/
gnome-session/repos/gnome-unstable-i686/PKGBUILD
(from rev 276853, gnome-session/trunk/PKGBUILD)
gnome-session/repos/gnome-unstable-i686/platformtheme.patch
(from rev 276853, gnome-session/trunk/platformtheme.patch)
gnome-session/repos/gnome-unstable-i686/timeout.patch
(from rev 276853, gnome-session/trunk/timeout.patch)
gnome-session/repos/gnome-unstable-x86_64/
gnome-session/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 276853, gnome-session/trunk/PKGBUILD)
gnome-session/repos/gnome-unstable-x86_64/platformtheme.patch
(from rev 276853, gnome-session/trunk/platformtheme.patch)
gnome-session/repos/gnome-unstable-x86_64/timeout.patch
(from rev 276853, gnome-session/trunk/timeout.patch)
-------------------------------------------+
gnome-unstable-i686/PKGBUILD | 47 ++++++++++++++++++++++++++++
gnome-unstable-i686/platformtheme.patch | 34 ++++++++++++++++++++
gnome-unstable-i686/timeout.patch | 24 ++++++++++++++
gnome-unstable-x86_64/PKGBUILD | 47 ++++++++++++++++++++++++++++
gnome-unstable-x86_64/platformtheme.patch | 34 ++++++++++++++++++++
gnome-unstable-x86_64/timeout.patch | 24 ++++++++++++++
6 files changed, 210 insertions(+)
Copied: gnome-session/repos/gnome-unstable-i686/PKGBUILD (from rev 276853, gnome-session/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2016-09-22 21:40:47 UTC (rev 276854)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-session
+pkgver=3.22.0+3+gab2f4c8
+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 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')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # Increase timeout, for slow machines
+ patch -Np1 -i ../timeout.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
+ --disable-schemas-compile --enable-systemd --disable-gconf
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Copied: gnome-session/repos/gnome-unstable-i686/platformtheme.patch (from rev 276853, gnome-session/trunk/platformtheme.patch)
===================================================================
--- gnome-unstable-i686/platformtheme.patch (rev 0)
+++ gnome-unstable-i686/platformtheme.patch 2016-09-22 21:40:47 UTC (rev 276854)
@@ -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
Copied: gnome-session/repos/gnome-unstable-i686/timeout.patch (from rev 276853, gnome-session/trunk/timeout.patch)
===================================================================
--- gnome-unstable-i686/timeout.patch (rev 0)
+++ gnome-unstable-i686/timeout.patch 2016-09-22 21:40:47 UTC (rev 276854)
@@ -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/gnome-unstable-x86_64/PKGBUILD (from rev 276853, gnome-session/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2016-09-22 21:40:47 UTC (rev 276854)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-session
+pkgver=3.22.0+3+gab2f4c8
+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 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')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # Increase timeout, for slow machines
+ patch -Np1 -i ../timeout.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
+ --disable-schemas-compile --enable-systemd --disable-gconf
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Copied: gnome-session/repos/gnome-unstable-x86_64/platformtheme.patch (from rev 276853, gnome-session/trunk/platformtheme.patch)
===================================================================
--- gnome-unstable-x86_64/platformtheme.patch (rev 0)
+++ gnome-unstable-x86_64/platformtheme.patch 2016-09-22 21:40:47 UTC (rev 276854)
@@ -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
Copied: gnome-session/repos/gnome-unstable-x86_64/timeout.patch (from rev 276853, gnome-session/trunk/timeout.patch)
===================================================================
--- gnome-unstable-x86_64/timeout.patch (rev 0)
+++ gnome-unstable-x86_64/timeout.patch 2016-09-22 21:40:47 UTC (rev 276854)
@@ -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