From 20ced1ca3a558ab6b19194b652a05eaebed5cf3f2f2d66b7b1e9140cee01f6e6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 23 Jul 2010 19:37:35 +0000 Subject: [PATCH] Accepting request 43701 from X11:common:Factory checked in (request 43701) OBS-URL: https://build.opensuse.org/request/show/43701 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=11 --- xdg-kde4-upstream.patch | 148 ++++------------------------------------ xdg-utils.changes | 5 -- 2 files changed, 14 insertions(+), 139 deletions(-) diff --git a/xdg-kde4-upstream.patch b/xdg-kde4-upstream.patch index ea5d431..4ac896d 100644 --- a/xdg-kde4-upstream.patch +++ b/xdg-kde4-upstream.patch @@ -1,7 +1,11 @@ -Index: xdg-utils-1.0.2/scripts/xdg-email +Index: xdg-utils/scripts/xdg-email =================================================================== ---- xdg-utils-1.0.2.orig/scripts/xdg-email -+++ xdg-utils-1.0.2/scripts/xdg-email +RCS file: /cvs/portland/portland/xdg-utils/scripts/xdg-email,v +retrieving revision 1.37 +retrieving revision 1.39 +diff -u -p -r1.37 -r1.39 +--- xdg-utils/scripts/xdg-email 24 Jan 2008 20:24:50 -0000 1.37 ++++ xdg-utils/scripts/xdg-email 27 Jul 2009 15:44:14 -0000 1.39 @@ -367,7 +367,7 @@ detectDE() kfmclient_fix_exit_code() @@ -26,10 +30,14 @@ Index: xdg-utils-1.0.2/scripts/xdg-email kfmclient_fix_exit_code $? if [ $? -eq 0 ]; then -Index: xdg-utils-1.0.2/scripts/xdg-mime +Index: xdg-utils/scripts/xdg-mime =================================================================== ---- xdg-utils-1.0.2.orig/scripts/xdg-mime -+++ xdg-utils-1.0.2/scripts/xdg-mime +RCS file: /cvs/portland/portland/xdg-utils/scripts/xdg-mime,v +retrieving revision 1.46 +retrieving revision 1.56 +diff -u -p -r1.46 -r1.56 +--- xdg-utils/scripts/xdg-mime 4 Nov 2006 06:23:49 -0000 1.46 ++++ xdg-utils/scripts/xdg-mime 31 Jul 2009 06:42:46 -0000 1.56 @@ -436,7 +436,7 @@ detectDE() kfmclient_fix_exit_code() @@ -378,131 +386,3 @@ Index: xdg-utils-1.0.2/scripts/xdg-mime DEBUG 1 "Removing $kde_dir/$x.desktop (KDE 3.x support)" rm -f $kde_dir/$x.desktop fi -Index: xdg-utils-1.0.2/scripts/xdg-screensaver -=================================================================== ---- xdg-utils-1.0.2.orig/scripts/xdg-screensaver -+++ xdg-utils-1.0.2/scripts/xdg-screensaver -@@ -344,7 +344,7 @@ detectDE() - - kfmclient_fix_exit_code() - { -- version=`kde-config --version 2>/dev/null | grep KDE` -+ version=`kde${KDE_SESSION_VERSION}-config --version 2>/dev/null | grep KDE` - major=`echo $version | sed 's/KDE: \([0-9]\).*/\1/'` - minor=`echo $version | sed 's/KDE: [0-9]*\.\([0-9]\).*/\1/'` - release=`echo $version | sed 's/KDE: [0-9]*\.[0-9]*\.\([0-9]\).*/\1/'` -@@ -414,7 +414,11 @@ perform_action() - - case "$DE" in - kde) -- screensaver_kde "$1" -+ if [ x"$KDE_SESSION_VERSION" = x"4" ]; then -+ screensaver_freedesktop "$1" -+ else -+ screensaver_kde "$1" -+ fi - ;; - - gnome) -@@ -535,6 +539,101 @@ track_window() - cleanup_suspend - } - -+screensaver_freedesktop() -+{ -+ case "$1" in -+ suspend) -+ dbus-send --session \ -+ --dest=org.freedesktop.ScreenSaver \ -+ --type=method_call \ -+ --print-reply \ -+ --reply-timeout=2000 \ -+ /ScreenSaver \ -+ org.freedesktop.ScreenSaver.Inhibit \ -+ string:$window_id \ -+ string:xdg-screensaver \ -+ | grep uint32 | cut -d ' ' -f 5 >| "$screensaver_file.cookie" \ -+ 2> /dev/null -+ result=$? -+ ;; -+ -+ resume) -+ if [ -f "$screensaver_file.cookie" ] ; then -+ value=`cat "$screensaver_file.cookie"` -+ dbus-send --session \ -+ --dest=org.freedesktop.ScreenSaver \ -+ --type=method_call \ -+ /ScreenSaver \ -+ org.freedesktop.ScreenSaver.UnInhibit \ -+ uint32:$value \ -+ 2> /dev/null -+ rm -f "$screensaver_file.cookie" -+ fi -+ result=$? -+ ;; -+ -+ activate) -+ dbus-send --session \ -+ --dest=org.freedesktop.ScreenSaver \ -+ --type=method_call \ -+ /ScreenSaver \ -+ org.freedesktop.ScreenSaver.SetActive \ -+ boolean:true \ -+ 2> /dev/null -+ result=$? -+ ;; -+ -+ lock) -+ dbus-send --session \ -+ --dest=org.freedesktop.ScreenSaver \ -+ --type=method_call \ -+ /ScreenSaver \ -+ org.freedesktop.ScreenSaver.Lock \ -+ 2> /dev/null -+ ;; -+ -+ reset) -+ if [ -f "$screensaver_file.cookie" ] ; then -+ value=`cat "$screensaver_file.cookie"` -+ dbus-send --session \ -+ --dest=org.freedesktop.ScreenSaver \ -+ --type=method_call \ -+ /ScreenSaver \ -+ org.freedesktop.ScreenSaver.UnInhibit \ -+ uint32:$value \ -+ 2> /dev/null -+ rm -f "$screensaver_file.cookie" -+ fi -+ result=$? -+ ;; -+ -+ status) -+ status=`dbus-send --session \ -+ --dest=org.freedesktop.ScreenSaver \ -+ --type=method_call \ -+ --print-reply \ -+ --reply-timeout=2000 \ -+ /ScreenSaver \ -+ org.freedesktop.ScreenSaver.GetActive \ -+ | grep boolean | cut -d ' ' -f 5` -+ result=$? -+ if [ x"$status" = "xtrue" ]; then -+ echo "enabled" -+ elif [ x"$status" = "xfalse" ]; then -+ echo "disabled" -+ else -+ echo "ERROR: dbus org.freedesktop.ScreenSaver.GetActive returned '$status'" >&2 -+ return 1 -+ fi -+ ;; -+ -+ *) -+ echo "ERROR: Unknown command '$1'" >&2 -+ return 1 -+ ;; -+ esac -+} -+ - screensaver_kde() - { - case "$1" in diff --git a/xdg-utils.changes b/xdg-utils.changes index 7a2dce5..431cf3f 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Jul 20 21:21:59 UTC 2010 - reddwarf@opensuse.org - -- Fix screensaver handling in KDE4 - ------------------------------------------------------------------- Sun Mar 28 17:43:15 UTC 2010 - andrea@opensuse.org