From 19ce2331b5b2ffbbda24f5b0923d4d36a77341cbc82ee6a5e56e81027c27fdde Mon Sep 17 00:00:00 2001 From: Marcel Kuehlhorn Date: Fri, 7 Jun 2019 15:53:19 +0000 Subject: [PATCH] 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 --- add-light-locker-support.patch | 12 ------------ additional-lockers-support.patch | 13 +++++++++++++ xfce4-session.changes | 7 +++++++ xfce4-session.spec | 3 ++- 4 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 add-light-locker-support.patch create mode 100644 additional-lockers-support.patch diff --git a/add-light-locker-support.patch b/add-light-locker-support.patch deleted file mode 100644 index fcb0114..0000000 --- a/add-light-locker-support.patch +++ /dev/null @@ -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 diff --git a/additional-lockers-support.patch b/additional-lockers-support.patch new file mode 100644 index 0000000..48016a0 --- /dev/null +++ b/additional-lockers-support.patch @@ -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 diff --git a/xfce4-session.changes b/xfce4-session.changes index f78a87d..542c2f9 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -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 diff --git a/xfce4-session.spec b/xfce4-session.spec index 865cafb..cd76215 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -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