[Pkg-xfce-commits] r8691 - in /desktop/trunk/xfce4-session/debian: changelog patches/0001-Add-DesktopNames-to-.desktop-file.patch patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch patches/series

Mon Oct 20 20:59:02 UTC 2014

Author: corsac
Date: Mon Oct 20 20:59:02 2014
New Revision: 8691

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8691
Log:
* debian/patches:
  - 0001-Add-DesktopNames-to-.desktop-file added, set the DesktopNames
  property in the .desktop file so the DMs can set XDG_CURRENT_DESKTOP.
  - 0001-Export-XDG_CURRENT_DESKTOP-Bug-11239 added, set XDG_CURRENT_DESKTOP
  to XFCE if not already set (for example because the DM doesn't handle it
  or because the selected session is the default, alternatives managed, one)
  closes: #765728

Added:
    desktop/trunk/xfce4-session/debian/patches/0001-Add-DesktopNames-to-.desktop-file.patch
    desktop/trunk/xfce4-session/debian/patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch
Modified:
    desktop/trunk/xfce4-session/debian/changelog
    desktop/trunk/xfce4-session/debian/patches/series

Modified: desktop/trunk/xfce4-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/changelog?rev=8691&op=diff
==============================================================================

--- desktop/trunk/xfce4-session/debian/changelog	(original)
+++ desktop/trunk/xfce4-session/debian/changelog	Mon Oct 20 20:59:02 2014
@@ -1,3 +1,15 @@
+xfce4-session (4.10.1-9) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 0001-Add-DesktopNames-to-.desktop-file added, set the DesktopNames
+    property in the .desktop file so the DMs can set XDG_CURRENT_DESKTOP.
+    - 0001-Export-XDG_CURRENT_DESKTOP-Bug-11239 added, set XDG_CURRENT_DESKTOP
+    to XFCE if not already set (for example because the DM doesn't handle it
+    or because the selected session is the default, alternatives managed, one)
+    closes: #765728
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 18 Oct 2014 15:20:11 +0200
+
 xfce4-session (4.10.1-8) unstable; urgency=medium
 
   * debian/patches:

Added: desktop/trunk/xfce4-session/debian/patches/0001-Add-DesktopNames-to-.desktop-file.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/patches/0001-Add-DesktopNames-to-.desktop-file.patch?rev=8691&op=file
==============================================================================
--- desktop/trunk/xfce4-session/debian/patches/0001-Add-DesktopNames-to-.desktop-file.patch	(added)
+++ desktop/trunk/xfce4-session/debian/patches/0001-Add-DesktopNames-to-.desktop-file.patch	Mon Oct 20 20:59:02 2014
@@ -0,0 +1,25 @@
+From 860aea2d6686e9dcf0359a6dfab3ccdb9caf34c3 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Mon, 20 Oct 2014 17:04:32 +0300
+Subject: [PATCH] Add DesktopNames to .desktop file
+
+GDM looks for a DesktopNames property added in the desktop file
+to set the XDG_CURRENT_DESKTOP env variable with. See
+https://bugzilla.gnome.org/show_bug.cgi?id=727546
+Thanks to Guido Berhoerster for pointing this out.
+---
+ xfce.desktop.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xfce.desktop.in b/xfce.desktop.in
+index f4d6926..58fb274 100644
+--- a/xfce.desktop.in
++++ b/xfce.desktop.in
+@@ -5,3 +5,4 @@ _Comment=Use this session to run Xfce as your desktop environment
+ Exec=startxfce4
+ Icon=
+ Type=Application
++DesktopNames=XFCE
+-- 
+2.1.1
+

Added: desktop/trunk/xfce4-session/debian/patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch?rev=8691&op=file
==============================================================================
--- desktop/trunk/xfce4-session/debian/patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch	(added)
+++ desktop/trunk/xfce4-session/debian/patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch	Mon Oct 20 20:59:02 2014
@@ -0,0 +1,34 @@
+From 4daf68ebb6991194848756ff4f05a3ed736118bb Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Mon, 20 Oct 2014 08:17:13 +0300
+Subject: [PATCH] Export XDG_CURRENT_DESKTOP (Bug #11239)
+
+We already have been using XDG_CURRENT_DESKTOP in things such as
+garcon and other libraries but xfce4-session hasn't been setting
+it if it was left unset. This is now used by things like QT5 for
+theme decorations. Patch provided in:
+https://forum.manjaro.org/index.php?topic=13728
+---
+ scripts/xinitrc.in.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
+index c67232e..b234407 100755
+--- a/scripts/xinitrc.in.in
++++ b/scripts/xinitrc.in.in
+@@ -22,6 +22,12 @@ if test "x$DESKTOP_SESSION" = "x"; then
+   export DESKTOP_SESSION
+ fi
+ 
++# set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme
++if test "x$XDG_CURRENT_DESKTOP" = "x"; then
++  XDG_CURRENT_DESKTOP="XFCE"
++  export XDG_CURRENT_DESKTOP
++fi
++
+ # $XDG_CONFIG_HOME defines the base directory relative to which user specific
+ # configuration files should be stored. If $XDG_CONFIG_HOME is either not set
+ # or empty, a default equal to $HOME/.config should be used.
+-- 
+2.1.1
+

Modified: desktop/trunk/xfce4-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/patches/series?rev=8691&op=diff
==============================================================================
--- desktop/trunk/xfce4-session/debian/patches/series	(original)
+++ desktop/trunk/xfce4-session/debian/patches/series	Mon Oct 20 20:59:02 2014
@@ -1,3 +1,5 @@
 01_fix-xrdb-call.patch
 02_add-light-locker-to-xflock4.patch 
 03_runtime-logind-support.patch
+0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch
+0001-Add-DesktopNames-to-.desktop-file.patch


