Accepting request 707949 from home:mauriziogalli:branches:X11:xfce

- Removed add-light-locker-support.patch. Replaced by 
  additional-lockers-support.patch which supports both 
  xfce4-screensaver and lightlocker

OBS-URL: https://build.opensuse.org/request/show/707949
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=138
This commit is contained in:
Marcel Kuehlhorn 2019-06-07 15:53:19 +00:00 committed by Git OBS Bridge
parent 061ef35ce7
commit 19ce2331b5
4 changed files with 22 additions and 13 deletions

View File

@ -1,12 +0,0 @@
--- 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 \
"xscreensaver-command -lock" \
- "gnome-screensaver-command --lock"
+ "gnome-screensaver-command --lock" \
+ "light-locker-command -l"
do
$lock_cmd >/dev/null 2>&1 && exit
done

View File

@ -0,0 +1,13 @@
diff -ru a/scripts/xflock4 b/scripts/xflock4
--- a/scripts/xflock4 2014-08-31 02:24:02.000000000 +0800
+++ b/scripts/xflock4 2019-06-06 07:52:48.399462547 +0800
@@ -26,7 +26,9 @@
# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
for lock_cmd in \
+ "xfce4-screensaver-command -l" \
"xscreensaver-command -lock" \
+ "light-locker-command -l" \
"gnome-screensaver-command --lock"
do
$lock_cmd >/dev/null 2>&1 && exit

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 5 23:59:55 UTC 2019 - maurizio.galli@gmail.com
- Removed add-light-locker-support.patch. Replaced by
additional-lockers-support.patch which supports both
xfce4-screensaver and lightlocker
-------------------------------------------------------------------
Sat Mar 30 21:20:52 UTC 2019 - olaf@aepfle.de

View File

@ -34,7 +34,8 @@ Patch1: xfce4-session-adapt-session-scripts.patch
Patch2: xfce4-session-Make-verbose-logging-conditional.patch
# PATCH-FIX-OPENSUSE xfce4-session-systemd-user-addons.patch seife+dev@b1-systems.com -- fix systemd-user session settings
Patch3: xfce4-session-systemd-user-addons.patch
Patch4: add-light-locker-support.patch
# PATCH-FIX-OPENSUSE additional-lockers-support.patch maurizio.galli@gmail.com -- add xfce4-screensaver and lightlocker to xflock4 script
Patch4: additional-lockers-support.patch
BuildRequires: iceauth
BuildRequires: intltool
BuildRequires: update-desktop-files