[arch-commits] Commit in gnome-session/repos (12 files)
Jan de Groot
jgc at archlinux.org
Thu Jul 14 08:50:25 UTC 2016
Date: Thursday, July 14, 2016 @ 08:50:24
Author: jgc
Revision: 271847
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnome-session/repos/extra-i686/PKGBUILD
(from rev 271846, gnome-session/trunk/PKGBUILD)
gnome-session/repos/extra-i686/platformtheme.patch
(from rev 271846, gnome-session/trunk/platformtheme.patch)
gnome-session/repos/extra-i686/timeout.patch
(from rev 271846, gnome-session/trunk/timeout.patch)
gnome-session/repos/extra-x86_64/PKGBUILD
(from rev 271846, gnome-session/trunk/PKGBUILD)
gnome-session/repos/extra-x86_64/platformtheme.patch
(from rev 271846, gnome-session/trunk/platformtheme.patch)
gnome-session/repos/extra-x86_64/timeout.patch
(from rev 271846, 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 | 88 +++++++++++++++++++++++++++++++++++
/timeout.patch | 48 +++++++++++++++++++
extra-i686/PKGBUILD | 39 ---------------
extra-i686/gnome-session.install | 12 ----
extra-i686/platformtheme.patch | 34 +++++++++++++
extra-i686/timeout.patch | 24 ---------
extra-x86_64/PKGBUILD | 39 ---------------
extra-x86_64/gnome-session.install | 12 ----
extra-x86_64/platformtheme.patch | 34 +++++++++++++
extra-x86_64/timeout.patch | 24 ---------
10 files changed, 204 insertions(+), 150 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-07-14 08:50:18 UTC (rev 271846)
+++ extra-i686/PKGBUILD 2016-07-14 08:50:24 UTC (rev 271847)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-session
-pkgver=3.20.1
-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=('2ae9f53dc74f851222fbefbe0dc08db0a78cc76ceeb156f92ebd4d40fd038913'
- '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 271846, gnome-session/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-07-14 08:50:24 UTC (rev 271847)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-session
+pkgver=3.20.2
+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')
+url="http://www.gnome.org"
+groups=(gnome)
+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
+
+ # 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 \
+ --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-07-14 08:50:18 UTC (rev 271846)
+++ extra-i686/gnome-session.install 2016-07-14 08:50:24 UTC (rev 271847)
@@ -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/platformtheme.patch (from rev 271846, gnome-session/trunk/platformtheme.patch)
===================================================================
--- extra-i686/platformtheme.patch (rev 0)
+++ extra-i686/platformtheme.patch 2016-07-14 08:50:24 UTC (rev 271847)
@@ -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
Deleted: extra-i686/timeout.patch
===================================================================
--- extra-i686/timeout.patch 2016-07-14 08:50:18 UTC (rev 271846)
+++ extra-i686/timeout.patch 2016-07-14 08:50:24 UTC (rev 271847)
@@ -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 271846, gnome-session/trunk/timeout.patch)
===================================================================
--- extra-i686/timeout.patch (rev 0)
+++ extra-i686/timeout.patch 2016-07-14 08:50:24 UTC (rev 271847)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-07-14 08:50:18 UTC (rev 271846)
+++ extra-x86_64/PKGBUILD 2016-07-14 08:50:24 UTC (rev 271847)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-session
-pkgver=3.20.1
-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=('2ae9f53dc74f851222fbefbe0dc08db0a78cc76ceeb156f92ebd4d40fd038913'
- '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 271846, gnome-session/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-07-14 08:50:24 UTC (rev 271847)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-session
+pkgver=3.20.2
+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')
+url="http://www.gnome.org"
+groups=(gnome)
+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
+
+ # 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 \
+ --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-07-14 08:50:18 UTC (rev 271846)
+++ extra-x86_64/gnome-session.install 2016-07-14 08:50:24 UTC (rev 271847)
@@ -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/platformtheme.patch (from rev 271846, gnome-session/trunk/platformtheme.patch)
===================================================================
--- extra-x86_64/platformtheme.patch (rev 0)
+++ extra-x86_64/platformtheme.patch 2016-07-14 08:50:24 UTC (rev 271847)
@@ -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
Deleted: extra-x86_64/timeout.patch
===================================================================
--- extra-x86_64/timeout.patch 2016-07-14 08:50:18 UTC (rev 271846)
+++ extra-x86_64/timeout.patch 2016-07-14 08:50:24 UTC (rev 271847)
@@ -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 271846, gnome-session/trunk/timeout.patch)
===================================================================
--- extra-x86_64/timeout.patch (rev 0)
+++ extra-x86_64/timeout.patch 2016-07-14 08:50:24 UTC (rev 271847)
@@ -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