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

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Mar 30 17:19:38 2016
New Revision: 47746

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47746
Log:
 * Add debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch
   - fixes starting "System Default" session

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

Modified: desktop/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=47746&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/changelog	[utf-8] Wed Mar 30 17:19:38 2016
@@ -1,4 +1,4 @@
-gnome-session (3.20.0-2) UNRELEASED; urgency=medium
+gnome-session (3.20.0-2) experimental; urgency=medium
 
   * Add debian/patches/Revert-switch-to-Xorg-by-default.patch
     - revert upstreams switch (back) to Xorg by default, as we need
@@ -8,8 +8,10 @@
    * debian/gnome-session.install:
      - accept any *.desktop name for wayland-sessions.
      - install all *.desktop files for xsessions.
-
- -- Andreas Henriksson <andreas at fatal.se>  Fri, 25 Mar 2016 13:58:08 +0100
+   * Add debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch
+     - fixes starting "System Default" session
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 30 Mar 2016 19:16:31 +0200
 
 gnome-session (3.20.0-1) experimental; urgency=medium
 

Added: 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=47746&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch	(added)
+++ desktop/experimental/gnome-session/debian/patches/0001-main-fix-starting-gnome-session-via-startx.patch	[utf-8] Wed Mar 30 17:19:38 2016
@@ -0,0 +1,46 @@
+From e74f5e2e0a8835dec6271b5f42cc5de867d99ac2 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
+
+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.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764379
+---
+ 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 14b201b..e54b229 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)
++        if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL) {
++            g_setenv("XDG_CURRENT_DESKTOP", "GNOME", TRUE);
+             gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
++        }
+ 
+         /* Push locale variables to dbus-daemon */
+         maybe_push_env_var ("LC_TIME");
+-- 
+2.8.0.rc3
+

Modified: desktop/experimental/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/series?rev=47746&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/patches/series	[utf-8] Wed Mar 30 17:19:38 2016
@@ -1 +1,2 @@
 Revert-switch-to-Xorg-by-default.patch
+0001-main-fix-starting-gnome-session-via-startx.patch