r47751 - in /desktop/experimental/gnome-session/debian: changelog patches/0001-main-fix-starting-gnome-session-via-startx.patch

[ah at users.alioth.debian.org]

Author: ah
Date: Thu Mar 31 08:15:09 2016
New Revision: 47751

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47751
Log:
* debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch
  - updated to match what was committed upstream.

Modified:
    desktop/experimental/gnome-session/debian/changelog
    desktop/experimental/gnome-session/debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch

Modified: desktop/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=47751&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/changelog	[utf-8] Thu Mar 31 08:15:09 2016
@@ -1,3 +1,10 @@
+gnome-session (3.20.0-3) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch
+    - updated to match what was committed upstream.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 31 Mar 2016 10:00:46 +0200
+
 gnome-session (3.20.0-2) experimental; urgency=medium
 
   * Add debian/patches/Revert-switch-to-Xorg-by-default.patch

Modified: desktop/experimental/gnome-session/debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch?rev=47751&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch	[utf-8] Thu Mar 31 08:15:09 2016
@@ -1,4 +1,4 @@
-From e74f5e2e0a8835dec6271b5f42cc5de867d99ac2 Mon Sep 17 00:00:00 2001
+From 2d2dcf3354701aa663d08e8337c608e245a9f2c1 Mon Sep 17 00:00:00 2001
 From: Andreas Henriksson <andreas at fatal.se>
 Date: Wed, 30 Mar 2016 18:49:15 +0200
 Subject: [PATCH] main: fix starting gnome session via startx
@@ -19,28 +19,48 @@
 
 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 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ 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..e54b229 100644
+index 14b201b..9f3ca0f 100644
 --- a/gnome-session/main.c
 +++ b/gnome-session/main.c
-@@ -379,8 +379,10 @@ main (int argc, char **argv)
-          * 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)
+@@ -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");
++            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.rc3