diff --git a/0026-xdg-screensaver-plasma5-support.patch b/0026-xdg-screensaver-plasma5-support.patch new file mode 100644 index 0000000..d188b23 --- /dev/null +++ b/0026-xdg-screensaver-plasma5-support.patch @@ -0,0 +1,62 @@ +From aa251a926130fbd3f4bade766ce5d2e0e2cb4c73 Mon Sep 17 00:00:00 2001 +From: Rex Dieter +Date: Thu, 9 Oct 2014 09:35:21 -0500 +Subject: [PATCH 26/26] xdg-screensaver plasma5 support + +--- + ChangeLog | 3 +++ + scripts/xdg-screensaver.in | 16 ++++++++++------ + 2 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 077fb52..3399286 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,8 @@ + === xdg-utils 1.1.x === + ++2014-10-09 Rex Dieter ++ * xdg-screensaver plasma5 support ++ + 2014-09-22 Rex Dieter + * Initial support for Plasma5 (largely thanks to Karol Herbst) + +diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in +index 8315f6a..6ad9930 100644 +--- a/scripts/xdg-screensaver.in ++++ b/scripts/xdg-screensaver.in +@@ -86,13 +86,17 @@ perform_action() + + case "$DE" in + kde) +- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then +- screensaver_freedesktop "$1" +- else +- screensaver_kde "$1" ++ if [ -n "${KDE_SESSION_VERSION}" ]; then ++ case "${KDE_SESSION_VERSION}" in ++ 4|5) ++ screensaver_freedesktop "$1" ++ ;; ++ *) ++ screensaver_kde3 "$1" ++ ;; ++ esac + fi + ;; +- + gnome_screensaver) + screensaver_gnome_screensaver "$1" + ;; +@@ -314,7 +318,7 @@ screensaver_freedesktop() + esac + } + +-screensaver_kde() ++screensaver_kde3() + { + case "$1" in + suspend) +-- +1.9.3 + diff --git a/xdg-utils.spec b/xdg-utils.spec index 58ae743..f4387d1 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -4,7 +4,7 @@ Summary: Basic desktop integration functions Name: xdg-utils Version: 1.1.0 -Release: 0.28.%{pre}%{?dist} +Release: 0.29.%{pre}%{?dist} URL: http://portland.freedesktop.org/ %if 0%{?pre:1} @@ -42,6 +42,7 @@ Patch122: 0022-update-Changelog-for-recent-contributed-patches.patch Patch123: 0023-make-release-distclean-targets-suck-less.patch Patch124: 0024-Initial-support-for-Plasma5.patch Patch125: 0025-more-plasma5-ktraderclient5-kreadconfig5-kwriteconfi.patch +Patch126: 0026-xdg-screensaver-plasma5-support.patch BuildRequires: gawk BuildRequires: xmlto text-www-browser @@ -112,6 +113,9 @@ make install DESTDIR=%{buildroot} %changelog +* Thu Oct 09 2014 Rex Dieter 1.1.0-0.29.rc2 +- xdg-screensaver plasma5 support + * Mon Sep 22 2014 Rex Dieter 1.1.0-0.28.rc2 - plasma5: ktraderclient5, kreadconfig5, kwriteconfig5