[arch-commits] Commit in gnome-session/trunk (2 files)
Date: Tuesday, April 12, 2016 @ 23:42:03
Author: heftig
Revision: 264763
3.20.1-1
Modified:
gnome-session/trunk/PKGBUILD
Deleted:
gnome-session/trunk/0001-main-fix-starting-gnome-session-via-startx.patch
---+
0001-main-fix-starting-gnome-session-via-startx.patch | 66
PKGBUILD | 10 --
2 files changed, 3 insertions(+), 73 deletions(-)
Deleted: 0001-main-fix-starting-gnome-session-via-startx.patch
===
--- 0001-main-fix-starting-gnome-session-via-startx.patch 2016-04-12
21:41:57 UTC (rev 264762)
+++ 0001-main-fix-starting-gnome-session-via-startx.patch 2016-04-12
21:42:03 UTC (rev 264763)
@@ -1,66 +0,0 @@
-From 2d2dcf3354701aa663d08e8337c608e245a9f2c1 Mon Sep 17 00:00:00 2001
-From: Andreas Henriksson
-Date: Wed, 30 Mar 2016 18:49:15 +0200
-Subject: [PATCH] main: fix starting gnome session via startx
-
-The changes related to gsm_util_setenv during 3.19.x seems to have
-broken starting a gnome desktop the old fashioned way, eg. via startx.
-
-The gnome.session required components has OnlyShowIn=GNOME; which
-disqualifies them from being started unless XDG_CURRENT_DESKTOP is also
-set to GNOME (by the gio utility function used to look up info).
-
-Currently gnome-session already carries code to catch the case of
-XDG_CURRENT_DESKTOP being unset and set it to GNOME as a fallback.
-Unfortunately the changes to gsm_util_setenv seems to have made it only
-set the values in the (dbus activated) child environment, rather than
-the current environment which g_desktop_app_info_get_show_in is looking
-at.
-
-Make the fallback code set XDG_CURRENT_DESKTOP in both current
-and child environment fixes it.
-Also move the entire hunk of code before initializing gio to
-prevent potential thread issues, now that is uses g_setenv.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764379
- gnome-session/main.c | 16 +---
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/gnome-session/main.c b/gnome-session/main.c
-index 14b201b..9f3ca0f 100644
a/gnome-session/main.c
-+++ b/gnome-session/main.c
-@@ -292,6 +292,15 @@ main (int argc, char **argv)
- gsm_util_init_error (TRUE, "%s", error->message);
- }
-
-+/* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
-+ * older versions of GDM, other display managers, and startx,
-+ * set a fallback value if we don't find it set.
-+ */
-+if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL) {
-+g_setenv("XDG_CURRENT_DESKTOP", "GNOME", TRUE);
-+gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
-+}
-+
- /* Make sure we initialize gio in a way that does not autostart any
daemon */
- initialize_gio ();
-
-@@ -375,13 +384,6 @@ main (int argc, char **argv)
- exit (1);
- }
-
--/* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
-- * older versions of GDM, other display managers, and startx,
-- * set a fallback value if we don't find it set.
-- */
--if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL)
--gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
--
- /* Push locale variables to dbus-daemon */
- maybe_push_env_var ("LC_TIME");
- maybe_push_env_var ("LC_NUMERIC");
---
-2.8.0
-
Modified: PKGBUILD
===
--- PKGBUILD2016-04-12 21:41:57 UTC (rev 264762)
+++ PKGBUILD2016-04-12 21:42:03 UTC (rev 264763)
@@ -2,8 +2,8 @@
# Maintainer: Jan Alexander Steffens (heftig)
pkgname=gnome-session
-pkgver=3.20.0
-pkgrel=2
+pkgver=3.20.1
+pkgrel=1
pkgdesc="The GNOME Session Handler"
arch=(i686 x86_64)
license=(GPL LGPL)
@@ -15,17 +15,13 @@
url="http://www.gnome.org";
groups=(gnome)
source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-0001-main-fix-starting-gnome-session-via-startx.patch
timeout.patch)
-sha256sums=('66ff72379a2e7ee11ab7fcec37ad911d36f12471845dc7755e1ce55d29301b34'
-'5b23b7718531d610bb94611599bd9771e1cd7ca1353dcb9868ddead76aa37c96'
+sha256sums=('2ae9f53dc74f851222fbefbe0dc08db0a78cc76ceeb156f92ebd4d40fd038913'
'9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
prepare() {
cd $pkgname-$pkgver
- patch -Np1 -i ../0001-main-fix-starting-gnome-session-via-startx.patch
-
# Increase timeout, for slow machines
patch -Np1 -i ../timeout.patch
}
[arch-commits] Commit in gnome-session/trunk (2 files)
Date: Saturday, April 9, 2016 @ 23:51:15
Author: heftig
Revision: 264455
3.20.0-2: FS#48850
Added:
gnome-session/trunk/0001-main-fix-starting-gnome-session-via-startx.patch
Modified:
gnome-session/trunk/PKGBUILD
---+
0001-main-fix-starting-gnome-session-via-startx.patch | 66
PKGBUILD |6 +
2 files changed, 71 insertions(+), 1 deletion(-)
Added: 0001-main-fix-starting-gnome-session-via-startx.patch
===
--- 0001-main-fix-starting-gnome-session-via-startx.patch
(rev 0)
+++ 0001-main-fix-starting-gnome-session-via-startx.patch 2016-04-09
21:51:15 UTC (rev 264455)
@@ -0,0 +1,66 @@
+From 2d2dcf3354701aa663d08e8337c608e245a9f2c1 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson
+Date: Wed, 30 Mar 2016 18:49:15 +0200
+Subject: [PATCH] main: fix starting gnome session via startx
+
+The changes related to gsm_util_setenv during 3.19.x seems to have
+broken starting a gnome desktop the old fashioned way, eg. via startx.
+
+The gnome.session required components has OnlyShowIn=GNOME; which
+disqualifies them from being started unless XDG_CURRENT_DESKTOP is also
+set to GNOME (by the gio utility function used to look up info).
+
+Currently gnome-session already carries code to catch the case of
+XDG_CURRENT_DESKTOP being unset and set it to GNOME as a fallback.
+Unfortunately the changes to gsm_util_setenv seems to have made it only
+set the values in the (dbus activated) child environment, rather than
+the current environment which g_desktop_app_info_get_show_in is looking
+at.
+
+Make the fallback code set XDG_CURRENT_DESKTOP in both current
+and child environment fixes it.
+Also move the entire hunk of code before initializing gio to
+prevent potential thread issues, now that is uses g_setenv.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764379
+---
+ gnome-session/main.c | 16 +---
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/gnome-session/main.c b/gnome-session/main.c
+index 14b201b..9f3ca0f 100644
+--- a/gnome-session/main.c
b/gnome-session/main.c
+@@ -292,6 +292,15 @@ main (int argc, char **argv)
+ gsm_util_init_error (TRUE, "%s", error->message);
+ }
+
++/* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
++ * older versions of GDM, other display managers, and startx,
++ * set a fallback value if we don't find it set.
++ */
++if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL) {
++g_setenv("XDG_CURRENT_DESKTOP", "GNOME", TRUE);
++gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
++}
++
+ /* Make sure we initialize gio in a way that does not autostart any
daemon */
+ initialize_gio ();
+
+@@ -375,13 +384,6 @@ main (int argc, char **argv)
+ exit (1);
+ }
+
+-/* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
+- * older versions of GDM, other display managers, and startx,
+- * set a fallback value if we don't find it set.
+- */
+-if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL)
+-gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
+-
+ /* Push locale variables to dbus-daemon */
+ maybe_push_env_var ("LC_TIME");
+ maybe_push_env_var ("LC_NUMERIC");
+--
+2.8.0
+
Modified: PKGBUILD
===
--- PKGBUILD2016-04-09 20:07:54 UTC (rev 264454)
+++ PKGBUILD2016-04-09 21:51:15 UTC (rev 264455)
@@ -3,7 +3,7 @@
pkgname=gnome-session
pkgver=3.20.0
-pkgrel=1
+pkgrel=2
pkgdesc="The GNOME Session Handler"
arch=(i686 x86_64)
license=(GPL LGPL)
@@ -15,13 +15,17 @@
url="http://www.gnome.org";
groups=(gnome)
source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+0001-main-fix-starting-gnome-session-via-startx.patch
timeout.patch)
sha256sums=('66ff72379a2e7ee11ab7fcec37ad911d36f12471845dc7755e1ce55d29301b34'
+'5b23b7718531d610bb94611599bd9771e1cd7ca1353dcb9868ddead76aa37c96'
'9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
prepare() {
cd $pkgname-$pkgver
+ patch -Np1 -i ../0001-main-fix-starting-gnome-session-via-startx.patch
+
# Increase timeout, for slow machines
patch -Np1 -i ../timeout.patch
}
[arch-commits] Commit in gnome-session/trunk (2 files)
Date: Tuesday, March 26, 2013 @ 08:32:09
Author: heftig
Revision: 180771
3.8.0
Modified:
gnome-session/trunk/PKGBUILD
Deleted:
gnome-session/trunk/gnome-session-3.3.1-llvmpipe.patch
+
PKGBUILD | 22 +-
gnome-session-3.3.1-llvmpipe.patch |9 -
2 files changed, 9 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-26 07:02:11 UTC (rev 180770)
+++ PKGBUILD2013-03-26 07:32:09 UTC (rev 180771)
@@ -2,31 +2,27 @@
# Maintainer: Jan Alexander Steffens (heftig)
pkgname=gnome-session
-pkgver=3.6.2
+pkgver=3.8.0
pkgrel=1
pkgdesc="The GNOME Session Handler"
arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
- 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst'
'polkit-gnome'
- 'upower')
-makedepends=('intltool' 'mesa' 'xtrans')
+license=(GPL LGPL)
+depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop
+ hicolor-icon-theme json-glib libgl libsm libxtst polkit-gnome
+ upower)
+makedepends=(intltool mesa gtk-doc)
options=('!emptydirs')
install=gnome-session.install
url="http://www.gnome.org";
-groups=('gnome')
+groups=(gnome)
source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-gnome-session-3.3.1-llvmpipe.patch timeout.patch)
-sha256sums=('2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4'
-'59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
+timeout.patch)
+sha256sums=('7892c4ef5049bf5f4ac75bc82b554c1c5f962249108c8467df1be0f947b5a99f'
'9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
build() {
cd $pkgname-$pkgver
- # Allow software rendering
- patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch
-
# Increase timeout, for slow machines
patch -Np1 -i ../timeout.patch
Deleted: gnome-session-3.3.1-llvmpipe.patch
===
--- gnome-session-3.3.1-llvmpipe.patch 2013-03-26 07:02:11 UTC (rev 180770)
+++ gnome-session-3.3.1-llvmpipe.patch 2013-03-26 07:32:09 UTC (rev 180771)
@@ -1,9 +0,0 @@
-diff -up gnome-session-3.3.1/data/hardware-compatibility.jx
gnome-session-3.3.1/data/hardware-compatibility
gnome-session-3.3.1/data/hardware-compatibility.jx 2011-10-21
10:35:39.0 -0400
-+++ gnome-session-3.3.1/data/hardware-compatibility2011-11-03
17:53:17.156407217 -0400
-@@ -20,4 +20,4 @@
-
- # Gallium has softpipe and llvmpipe
- -softpipe
---llvmpipe
-+#llvmpipe
[arch-commits] Commit in gnome-session/trunk (2 files)
Date: Monday, June 4, 2012 @ 05:13:39 Author: heftig Revision: 160709 ...and the actual patches Added: gnome-session/trunk/gnome-session-3.3.1-llvmpipe.patch gnome-session/trunk/timeout.patch + gnome-session-3.3.1-llvmpipe.patch |9 + timeout.patch | 12 2 files changed, 21 insertions(+) Added: gnome-session-3.3.1-llvmpipe.patch === --- gnome-session-3.3.1-llvmpipe.patch (rev 0) +++ gnome-session-3.3.1-llvmpipe.patch 2012-06-04 09:13:39 UTC (rev 160709) @@ -0,0 +1,9 @@ +diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility +--- gnome-session-3.3.1/data/hardware-compatibility.jx 2011-10-21 10:35:39.0 -0400 gnome-session-3.3.1/data/hardware-compatibility2011-11-03 17:53:17.156407217 -0400 +@@ -20,4 +20,4 @@ + + # Gallium has softpipe and llvmpipe + -softpipe +--llvmpipe ++#llvmpipe Added: timeout.patch === --- timeout.patch (rev 0) +++ timeout.patch 2012-06-04 09:13:39 UTC (rev 160709) @@ -0,0 +1,12 @@ +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-04 11:06:35.911690067 +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 1 + + /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ + #define NO_ACCEL0
