rpm/xfce4-session
SHA256
1
0
Fork 0
forked from pool/xfce4-session
Code Pull Requests Activity

Accepting request 257629 from X11:xfce

Browse Source 
- add xfce4-session-set-desktop-name.patch.changes in order to set
  the DesktopName property in the xsession file (bxo#11239)

- modify xfce4-session-adapt-session-scripts.patch to set
  XDG_CURRENT_DESKTOP (bxo#11239)

OBS-URL: https://build.opensuse.org/request/show/257629
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=68
This commit is contained in:
Stephan Kulow 2014-10-20 05:27:13 +00:00 committed by Git OBS Bridge
commit 78a4128109
4 changed files with 74 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
xfce4-session-adapt-session-scripts.patch
View File

@ -1,8 +1,26 @@
Index: xfce4-session-4.10.0/scripts/xinitrc.in Index: xfce4-session-4.10.1/scripts/xinitrc.in
=================================================================== ===================================================================
--- xfce4-session-4.10.0.orig/scripts/xinitrc.in --- xfce4-session-4.10.1.orig/scripts/xinitrc.in
+++ xfce4-session-4.10.0/scripts/xinitrc.in +++ xfce4-session-4.10.1/scripts/xinitrc.in
@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then @@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then
export XDG_MENU_PREFIX
fi
-# set DESKTOP_SESSION so that one can detect easily if an Xfce session is running
+# set DESKTOP_SESSION and XDG_CURRENT_DESKTOP so that one can detect easily if
+# an Xfce session is running
if test "x$DESKTOP_SESSION" = "x"; then
DESKTOP_SESSION="xfce"
export DESKTOP_SESSION
fi
+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
@@ -38,12 +43,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then
fi fi
[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
@ -15,7 +33,7 @@ Index: xfce4-session-4.10.0/scripts/xinitrc.in
# Modify libglade and glade environment variables so that # Modify libglade and glade environment variables so that
# it will find the files installed by Xfce # it will find the files installed by Xfce
GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs"
@@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp @@ -81,112 +80,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
# load local modmap # load local modmap
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
@ -140,11 +158,29 @@ Index: xfce4-session-4.10.0/scripts/xinitrc.in
-esac -esac
- -
-xsetroot -bg white -fg red -solid black -cursor_name watch -xsetroot -bg white -fg red -solid black -cursor_name watch
Index: xfce4-session-4.10.0/scripts/xinitrc.in.in Index: xfce4-session-4.10.1/scripts/xinitrc.in.in
=================================================================== ===================================================================
--- xfce4-session-4.10.0.orig/scripts/xinitrc.in.in --- xfce4-session-4.10.1.orig/scripts/xinitrc.in.in
+++ xfce4-session-4.10.0/scripts/xinitrc.in.in +++ xfce4-session-4.10.1/scripts/xinitrc.in.in
@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then @@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then
export XDG_MENU_PREFIX
fi
-# set DESKTOP_SESSION so that one can detect easily if an Xfce session is running
+# set DESKTOP_SESSION and XDG_CURRENT_DESKTOP so that one can detect easily if
+# an Xfce session is running
if test "x$DESKTOP_SESSION" = "x"; then
DESKTOP_SESSION="xfce"
export DESKTOP_SESSION
fi
+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
@@ -38,12 +43,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then
fi fi
[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
@ -157,7 +193,7 @@ Index: xfce4-session-4.10.0/scripts/xinitrc.in.in
# Modify libglade and glade environment variables so that # Modify libglade and glade environment variables so that
# it will find the files installed by Xfce # it will find the files installed by Xfce
GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@" GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@"
@@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp @@ -81,112 +80,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
# load local modmap # load local modmap
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
@ -282,10 +318,10 @@ Index: xfce4-session-4.10.0/scripts/xinitrc.in.in
-esac -esac
- -
-xsetroot -bg white -fg red -solid black -cursor_name watch -xsetroot -bg white -fg red -solid black -cursor_name watch
Index: xfce4-session-4.10.0/scripts/startxfce4.in Index: xfce4-session-4.10.1/scripts/startxfce4.in
=================================================================== ===================================================================
--- xfce4-session-4.10.0.orig/scripts/startxfce4.in --- xfce4-session-4.10.1.orig/scripts/startxfce4.in
+++ xfce4-session-4.10.0/scripts/startxfce4.in +++ xfce4-session-4.10.1/scripts/startxfce4.in
@@ -66,13 +66,22 @@ fi @@ -66,13 +66,22 @@ fi
if test "x$XDG_DATA_DIRS" = "x" if test "x$XDG_DATA_DIRS" = "x"

9
xfce4-session-set-desktop-name.patch Normal file
View File

@ -0,0 +1,9 @@
Index: xfce4-session-4.10.1/xfce.desktop.in
===================================================================
--- xfce4-session-4.10.1.orig/xfce.desktop.in
+++ xfce4-session-4.10.1/xfce.desktop.in
@@ -5,3 +5,4 @@ _Comment=Use this session to run Xfce as
Exec=startxfce4
Icon=
Type=Application
+DesktopName=XFCE

12
xfce4-session.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Oct 19 08:27:57 UTC 2014 - gber@opensuse.org
- add xfce4-session-set-desktop-name.patch.changes in order to set
the DesktopName property in the xsession file (bxo#11239)
-------------------------------------------------------------------
Sun Oct 19 08:17:58 UTC 2014 - gber@opensuse.org
- modify xfce4-session-adapt-session-scripts.patch to set
XDG_CURRENT_DESKTOP (bxo#11239)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 10 13:20:46 UTC 2013 - rmilasan@suse.com Thu Oct 10 13:20:46 UTC 2013 - rmilasan@suse.com

5
xfce4-session.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xfce4-session # spec file for package xfce4-session
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -32,6 +32,8 @@ Patch0: xfce4-session-simple-splash-remove-shadows.patch
Patch1: xfce4-session-adapt-session-scripts.patch Patch1: xfce4-session-adapt-session-scripts.patch
# PATCH-FIX-UPSTREAM xfce4-session-systemd-suspend-hibernate-support.patch bnc#9952 gber@opensuse.org -- Add systemd suspend/hibernate support # PATCH-FIX-UPSTREAM xfce4-session-systemd-suspend-hibernate-support.patch bnc#9952 gber@opensuse.org -- Add systemd suspend/hibernate support
Patch2: xfce4-session-systemd-suspend-hibernate-support.patch Patch2: xfce4-session-systemd-suspend-hibernate-support.patch
# PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239 gber@opensuse.org -- Set DesktopName property in the xsession file
Patch3: xfce4-session-set-desktop-name.patch
BuildRequires: iceauth BuildRequires: iceauth
BuildRequires: intltool BuildRequires: intltool
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
@ -120,6 +122,7 @@ This package provides the upstream look and feel for the Xfce Session Manager.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
xdt-autogen xdt-autogen