From 061ef35ce7a3b8ea4540f700ba0a5f17b16c3f4f88a2928cda5dde1390fa2215 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 1 Apr 2019 15:54:12 +0000 Subject: [PATCH] Accepting request 690086 from home:olh:branches:X11:xfce - Remove a hunk from xinitrd. Upstream already sets XDG_CURRENT_DESKTOP with commit 4daf68eb xfce4-session-adapt-session-scripts.patch - Use autosetup for simpler quilt setup refresh add-light-locker-support.patch OBS-URL: https://build.opensuse.org/request/show/690086 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=137 --- add-light-locker-support.patch | 6 +-- xfce4-session-adapt-session-scripts.patch | 62 ++++------------------- xfce4-session.changes | 9 ++++ xfce4-session.spec | 7 +-- 4 files changed, 22 insertions(+), 62 deletions(-) diff --git a/add-light-locker-support.patch b/add-light-locker-support.patch index 117ddb4..fcb0114 100644 --- a/add-light-locker-support.patch +++ b/add-light-locker-support.patch @@ -1,7 +1,5 @@ -Index: scripts/xflock4 -=================================================================== ---- scripts/xflock4.orig -+++ scripts/xflock4 +--- a/scripts/xflock4 ++++ b/scripts/xflock4 @@ -27,7 +27,8 @@ export PATH # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running for lock_cmd in \ diff --git a/xfce4-session-adapt-session-scripts.patch b/xfce4-session-adapt-session-scripts.patch index 2bfc509..06513e1 100644 --- a/xfce4-session-adapt-session-scripts.patch +++ b/xfce4-session-adapt-session-scripts.patch @@ -1,26 +1,6 @@ -Index: xfce4-session-4.12.1/scripts/xinitrc.in -=================================================================== ---- xfce4-session-4.12.1.orig/scripts/xinitrc.in -+++ xfce4-session-4.12.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 - - # set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme - if test "x$XDG_CURRENT_DESKTOP" = "x"; then -@@ -44,12 +49,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then +--- a/scripts/xinitrc.in ++++ b/scripts/xinitrc.in +@@ -44,12 +44,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then fi [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" @@ -33,7 +13,7 @@ Index: xfce4-session-4.12.1/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:" -@@ -87,112 +86,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -87,112 +81,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap @@ -158,29 +138,9 @@ Index: xfce4-session-4.12.1/scripts/xinitrc.in -esac - -xsetroot -bg white -fg red -solid black -cursor_name watch -Index: xfce4-session-4.12.1/scripts/xinitrc.in.in -=================================================================== ---- xfce4-session-4.12.1.orig/scripts/xinitrc.in.in -+++ xfce4-session-4.12.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 - - # set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme - if test "x$XDG_CURRENT_DESKTOP" = "x"; then -@@ -44,12 +49,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then +--- a/scripts/xinitrc.in.in ++++ b/scripts/xinitrc.in.in +@@ -44,12 +44,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then fi [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" @@ -193,7 +153,7 @@ Index: xfce4-session-4.12.1/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@" -@@ -87,112 +86,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -87,112 +81,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap @@ -318,10 +278,8 @@ Index: xfce4-session-4.12.1/scripts/xinitrc.in.in -esac - -xsetroot -bg white -fg red -solid black -cursor_name watch -Index: xfce4-session-4.12.1/scripts/startxfce4.in -=================================================================== ---- xfce4-session-4.12.1.orig/scripts/startxfce4.in -+++ xfce4-session-4.12.1/scripts/startxfce4.in +--- a/scripts/startxfce4.in ++++ b/scripts/startxfce4.in @@ -66,13 +66,22 @@ fi if test "x$XDG_DATA_DIRS" = "x" diff --git a/xfce4-session.changes b/xfce4-session.changes index 7252fe8..f78a87d 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Mar 30 21:20:52 UTC 2019 - olaf@aepfle.de + +- Remove a hunk from xinitrd. Upstream already sets + XDG_CURRENT_DESKTOP with commit 4daf68eb + xfce4-session-adapt-session-scripts.patch +- Use autosetup for simpler quilt setup + refresh add-light-locker-support.patch + ------------------------------------------------------------------- Wed Oct 24 08:54:47 UTC 2018 - vpereira@suse.com diff --git a/xfce4-session.spec b/xfce4-session.spec index cc7f56b..865cafb 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -116,12 +116,7 @@ This package provides the upstream look and feel for the Xfce Session Manager. %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p0 +%autosetup -p1 %build xdt-autogen