forked from pool/xfce4-session
- modify xfce4-session-adapt-session-scripts.patch to set
XDG_CURRENT_DESKTOP (bxo#11239) OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=116
This commit is contained in:
committed by
Git OBS Bridge
parent
6853c5c81f
commit
4ea7df8a29
@@ -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.0/scripts/xinitrc.in
|
||||
@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then
|
||||
--- xfce4-session-4.10.1.orig/scripts/xinitrc.in
|
||||
+++ xfce4-session-4.10.1/scripts/xinitrc.in
|
||||
@@ -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
|
||||
[ -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
|
||||
# it will find the files installed by Xfce
|
||||
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
|
||||
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
|
||||
|
||||
@@ -140,11 +158,29 @@ Index: xfce4-session-4.10.0/scripts/xinitrc.in
|
||||
-esac
|
||||
-
|
||||
-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.0/scripts/xinitrc.in.in
|
||||
@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then
|
||||
--- xfce4-session-4.10.1.orig/scripts/xinitrc.in.in
|
||||
+++ xfce4-session-4.10.1/scripts/xinitrc.in.in
|
||||
@@ -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
|
||||
[ -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
|
||||
# it will find the files installed by Xfce
|
||||
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
|
||||
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
|
||||
|
||||
@@ -282,10 +318,10 @@ Index: xfce4-session-4.10.0/scripts/xinitrc.in.in
|
||||
-esac
|
||||
-
|
||||
-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.0/scripts/startxfce4.in
|
||||
--- xfce4-session-4.10.1.orig/scripts/startxfce4.in
|
||||
+++ xfce4-session-4.10.1/scripts/startxfce4.in
|
||||
@@ -66,13 +66,22 @@ fi
|
||||
|
||||
if test "x$XDG_DATA_DIRS" = "x"
|
||||
|
@@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# 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
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
|
Reference in New Issue
Block a user