From feaef1dc9484c0e0d2847fae8701b9535a2a9385f6cb76a39278af53f6867138 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 15 Jan 2010 17:34:24 +0000 Subject: [PATCH 01/10] Accepting request 29682 from home:anubisg1:branches:X11:common:Factory Copy from home:anubisg1:branches:X11:common:Factory/xdg-utils via accept of submit request 29682 revision 8. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/29682 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=4 --- ready | 0 xdg-kde4-upstream.patch | 148 +++-------------------------- xdg-utils-1.0.2-bnc591714.patch | 43 --------- xdg-utils-1.0.2-lxde-support.patch | 16 ++-- xdg-utils.changes | 10 -- xdg-utils.spec | 10 +- 6 files changed, 25 insertions(+), 202 deletions(-) create mode 100644 ready delete mode 100644 xdg-utils-1.0.2-bnc591714.patch diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 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-1.0.2-bnc591714.patch b/xdg-utils-1.0.2-bnc591714.patch deleted file mode 100644 index 4b04443..0000000 --- a/xdg-utils-1.0.2-bnc591714.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -uNr old-xdg-utils-1.0.2//scripts/xdg-email xdg-utils-1.0.2/scripts/xdg-email ---- old-xdg-utils-1.0.2//scripts/xdg-email 2010-04-02 16:58:27.281598288 +0200 -+++ xdg-utils-1.0.2/scripts/xdg-email 2010-04-02 17:00:27.931347778 +0200 -@@ -617,11 +617,12 @@ - detectDE - - if [ x"$DE" = x"" ]; then -- # if BROWSER variable is not set, check some well known browsers instead -- if [ x"$BROWSER" = x"" ]; then -- BROWSER=firefox:mozilla:netscape -- fi -- DE=generic -+ DE=generic -+fi -+ -+# if BROWSER variable is not set, check some well known browsers instead -+if [ x"$BROWSER" = x"" ]; then -+ BROWSER=firefox:mozilla:netscape - fi - - case "$DE" in -diff -uNr old-xdg-utils-1.0.2//scripts/xdg-open xdg-utils-1.0.2/scripts/xdg-open ---- old-xdg-utils-1.0.2//scripts/xdg-open 2010-04-02 16:58:27.290596083 +0200 -+++ xdg-utils-1.0.2/scripts/xdg-open 2010-04-02 16:59:40.015352868 +0200 -@@ -408,13 +408,14 @@ - detectDE - - if [ x"$DE" = x"" ]; then -- # if BROWSER variable is not set, check some well known browsers instead -- if [ x"$BROWSER" = x"" ]; then -- BROWSER=firefox:mozilla:netscape -- fi - DE=generic - fi - -+# if BROWSER variable is not set, check some well known browsers instead -+if [ x"$BROWSER" = x"" ]; then -+ BROWSER=firefox:mozilla:netscape -+fi -+ - case "$DE" in - kde) - open_kde "$url" diff --git a/xdg-utils-1.0.2-lxde-support.patch b/xdg-utils-1.0.2-lxde-support.patch index b94f70c..94b47b3 100644 --- a/xdg-utils-1.0.2-lxde-support.patch +++ b/xdg-utils-1.0.2-lxde-support.patch @@ -5,7 +5,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-desktop-icon newxdg-utils-1.0.2//scripts/x if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; fi } @@ -16,7 +16,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-desktop-menu newxdg-utils-1.0.2//scripts/x if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; fi } @@ -27,7 +27,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-email newxdg-utils-1.0.2//scripts/xdg-emai if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; fi } @@ -49,7 +49,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-icon-resource newxdg-utils-1.0.2//scripts/ if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; fi } @@ -60,7 +60,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-mime newxdg-utils-1.0.2//scripts/xdg-mime if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; fi } @@ -71,7 +71,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-open newxdg-utils-1.0.2//scripts/xdg-open if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; fi } @@ -93,7 +93,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-screensaver newxdg-utils-1.0.2//scripts/xd if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; fi } @@ -104,7 +104,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-su newxdg-utils-1.0.2//scripts/xdg-su if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; fi } diff --git a/xdg-utils.changes b/xdg-utils.changes index 7a2dce5..6720ed1 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,13 +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 - -- added xdg-utils-1.0.2-bnc591714.patch to fix bnc#591714 - ------------------------------------------------------------------- Thu Jan 14 18:01:21 UTC 2010 - andrea@opensuse.org diff --git a/xdg-utils.spec b/xdg-utils.spec index 5f4a9df..1be42d5 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -1,7 +1,7 @@ # # spec file for package xdg-utils (Version 1.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ License: MIT License (or similar) Group: System/GUI/Other Summary: Utilities to uniformly interface desktop environments Version: 1.0.2 -Release: 85 +Release: 82 BuildArch: noarch Url: http://portland.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,10 +35,7 @@ Patch2: CVE-2008-0386.diff Patch3: xdg-kde4-upstream.patch # PATCH-FEATURE-UPSTREAM xdg-utils-1.0.2-lxde-support.patch fdo#26058 andrea@opensuse.org # this patch add lxde support to xdg-su and other scripts -Patch4: %name-1.0.2-lxde-support.patch -# PATCH-FIX-UPSTREAM xdg-utils-1.0.2-bnc591714.patch fdo#27551 andrea@opensuse.org -# this patch fix bnc#591714 -Patch5: %name-1.0.2-bnc591714.patch +Patch4: %name-1.0.2-lxde-support.patch %description The xdg-utils package is a set of simple scripts that provide basic @@ -64,7 +61,6 @@ these utilities work properly in their environment. %patch2 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build %configure From c1b9baa290c03be4320c5459caf5c078555994074ca8dfbf14c45f8e7486de06 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 16 Jan 2010 16:51:52 +0000 Subject: [PATCH 02/10] Accepting request 29771 from X11:lxde Copy from X11:lxde/xdg-utils via accept of submit request 29771 revision 3. Request was accepted with message: I take this without .changes file, but you should not do this again OBS-URL: https://build.opensuse.org/request/show/29771 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=5 --- xdg-utils-1.0.2-lxde-support.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xdg-utils-1.0.2-lxde-support.patch b/xdg-utils-1.0.2-lxde-support.patch index 94b47b3..b94f70c 100644 --- a/xdg-utils-1.0.2-lxde-support.patch +++ b/xdg-utils-1.0.2-lxde-support.patch @@ -5,7 +5,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-desktop-icon newxdg-utils-1.0.2//scripts/x if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; fi } @@ -16,7 +16,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-desktop-menu newxdg-utils-1.0.2//scripts/x if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; fi } @@ -27,7 +27,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-email newxdg-utils-1.0.2//scripts/xdg-emai if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; fi } @@ -49,7 +49,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-icon-resource newxdg-utils-1.0.2//scripts/ if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; fi } @@ -60,7 +60,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-mime newxdg-utils-1.0.2//scripts/xdg-mime if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; fi } @@ -71,7 +71,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-open newxdg-utils-1.0.2//scripts/xdg-open if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; fi } @@ -93,7 +93,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-screensaver newxdg-utils-1.0.2//scripts/xd if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; fi } @@ -104,7 +104,7 @@ diff -uNr xdg-utils-1.0.2/scripts/xdg-su newxdg-utils-1.0.2//scripts/xdg-su if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE"]; then DE=lxde; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; fi } From 5de34a12e9256758f57cf9c67feb64bc548d27a69494764b544363f966c59c0c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 18 Jan 2010 13:18:22 +0000 Subject: [PATCH 03/10] checked in (request 29828) OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=6 --- xdg-utils-1.0.2-lxde-support.patch | 138 ----------------------------- xdg-utils.changes | 5 -- xdg-utils.spec | 4 - 3 files changed, 147 deletions(-) delete mode 100644 xdg-utils-1.0.2-lxde-support.patch diff --git a/xdg-utils-1.0.2-lxde-support.patch b/xdg-utils-1.0.2-lxde-support.patch deleted file mode 100644 index b94f70c..0000000 --- a/xdg-utils-1.0.2-lxde-support.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -uNr xdg-utils-1.0.2/scripts/xdg-desktop-icon newxdg-utils-1.0.2//scripts/xdg-desktop-icon ---- xdg-utils-1.0.2/scripts/xdg-desktop-icon 2007-06-24 21:57:55.000000000 +0200 -+++ newxdg-utils-1.0.2//scripts/xdg-desktop-icon 2010-01-15 09:43:28.426802335 +0100 -@@ -405,6 +405,7 @@ - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; - fi - } - -diff -uNr xdg-utils-1.0.2/scripts/xdg-desktop-menu newxdg-utils-1.0.2//scripts/xdg-desktop-menu ---- xdg-utils-1.0.2/scripts/xdg-desktop-menu 2007-06-24 21:57:53.000000000 +0200 -+++ newxdg-utils-1.0.2//scripts/xdg-desktop-menu 2010-01-15 09:43:50.089551069 +0100 -@@ -601,6 +601,7 @@ - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; - fi - } - -diff -uNr xdg-utils-1.0.2/scripts/xdg-email newxdg-utils-1.0.2//scripts/xdg-email ---- xdg-utils-1.0.2/scripts/xdg-email 2010-01-15 09:48:49.339576494 +0100 -+++ newxdg-utils-1.0.2//scripts/xdg-email 2010-01-15 09:45:06.868551938 +0100 -@@ -357,6 +357,7 @@ - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; - fi - } - -@@ -636,6 +637,10 @@ - open_xfce "${mailto}" - ;; - -+ lxde) -+ open_generic "${mailto}" -+ ;; -+ - generic) - open_generic "${mailto}" - ;; -diff -uNr xdg-utils-1.0.2/scripts/xdg-icon-resource newxdg-utils-1.0.2//scripts/xdg-icon-resource ---- xdg-utils-1.0.2/scripts/xdg-icon-resource 2007-06-24 21:57:59.000000000 +0200 -+++ newxdg-utils-1.0.2//scripts/xdg-icon-resource 2010-01-15 09:41:58.299551265 +0100 -@@ -397,6 +397,7 @@ - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; - fi - } - -diff -uNr xdg-utils-1.0.2/scripts/xdg-mime newxdg-utils-1.0.2//scripts/xdg-mime ---- xdg-utils-1.0.2/scripts/xdg-mime 2010-01-15 09:48:49.340574736 +0100 -+++ newxdg-utils-1.0.2//scripts/xdg-mime 2010-01-15 09:45:30.882550232 +0100 -@@ -426,6 +426,7 @@ - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; - fi - } - -diff -uNr xdg-utils-1.0.2/scripts/xdg-open newxdg-utils-1.0.2//scripts/xdg-open ---- xdg-utils-1.0.2/scripts/xdg-open 2010-01-15 09:48:42.104831802 +0100 -+++ newxdg-utils-1.0.2//scripts/xdg-open 2010-01-15 09:46:51.860550227 +0100 -@@ -304,6 +304,7 @@ - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; - fi - } - -@@ -427,6 +428,10 @@ - open_xfce "$url" - ;; - -+ lxde) -+ open_generic "$url" -+ ;; -+ - generic) - open_generic "$url" - ;; -diff -uNr xdg-utils-1.0.2/scripts/xdg-screensaver newxdg-utils-1.0.2//scripts/xdg-screensaver ---- xdg-utils-1.0.2/scripts/xdg-screensaver 2007-06-24 21:58:06.000000000 +0200 -+++ newxdg-utils-1.0.2//scripts/xdg-screensaver 2010-01-15 09:47:04.734550060 +0100 -@@ -334,6 +334,7 @@ - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; - fi - } - -diff -uNr xdg-utils-1.0.2/scripts/xdg-su newxdg-utils-1.0.2//scripts/xdg-su ---- xdg-utils-1.0.2/scripts/xdg-su 2010-01-15 09:50:47.725800172 +0100 -+++ newxdg-utils-1.0.2//scripts/xdg-su 2010-01-15 09:26:22.031552239 +0100 -@@ -301,6 +301,7 @@ - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; - fi - } - -@@ -376,6 +377,15 @@ - fi - } - -+su_lxde() -+{ -+ if which gnomesu &>/dev/null ; then -+ su_gnome -+ else -+ su_generic -+ fi -+} -+ - [ x"$1" != x"" ] || exit_failure_syntax - - user= -@@ -441,6 +451,10 @@ - su_xfce - ;; - -+ lxde) -+ su_lxde -+ ;; -+ - *) - [ x"$user" = x"" ] && user=root - exit_failure_operation_impossible "no graphical method available for invoking '$cmd' as '$user'" - diff --git a/xdg-utils.changes b/xdg-utils.changes index 6720ed1..cd49f51 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 14 18:01:21 UTC 2010 - andrea@opensuse.org - -- added LXDE support - ------------------------------------------------------------------- Sun Aug 16 13:43:52 CEST 2009 - aj@suse.de diff --git a/xdg-utils.spec b/xdg-utils.spec index 1be42d5..af34d32 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -33,9 +33,6 @@ Patch0: xdg-su.diff Patch1: xfce-su.diff Patch2: CVE-2008-0386.diff Patch3: xdg-kde4-upstream.patch -# PATCH-FEATURE-UPSTREAM xdg-utils-1.0.2-lxde-support.patch fdo#26058 andrea@opensuse.org -# this patch add lxde support to xdg-su and other scripts -Patch4: %name-1.0.2-lxde-support.patch %description The xdg-utils package is a set of simple scripts that provide basic @@ -60,7 +57,6 @@ these utilities work properly in their environment. %patch1 %patch2 %patch3 -p1 -%patch4 -p1 %build %configure From 46e35c38db9e1740c05307d09725461b68066b1ccc5df8400538ff5f63e742ac Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Feb 2010 15:58:47 +0000 Subject: [PATCH 04/10] converted link to branch OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=7 --- xdg-utils-1.0.2-lxde-support.patch | 138 +++++++++++++++++++++++++++++ xdg-utils.changes | 5 ++ xdg-utils.spec | 8 +- 3 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 xdg-utils-1.0.2-lxde-support.patch diff --git a/xdg-utils-1.0.2-lxde-support.patch b/xdg-utils-1.0.2-lxde-support.patch new file mode 100644 index 0000000..b94f70c --- /dev/null +++ b/xdg-utils-1.0.2-lxde-support.patch @@ -0,0 +1,138 @@ +diff -uNr xdg-utils-1.0.2/scripts/xdg-desktop-icon newxdg-utils-1.0.2//scripts/xdg-desktop-icon +--- xdg-utils-1.0.2/scripts/xdg-desktop-icon 2007-06-24 21:57:55.000000000 +0200 ++++ newxdg-utils-1.0.2//scripts/xdg-desktop-icon 2010-01-15 09:43:28.426802335 +0100 +@@ -405,6 +405,7 @@ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; + fi + } + +diff -uNr xdg-utils-1.0.2/scripts/xdg-desktop-menu newxdg-utils-1.0.2//scripts/xdg-desktop-menu +--- xdg-utils-1.0.2/scripts/xdg-desktop-menu 2007-06-24 21:57:53.000000000 +0200 ++++ newxdg-utils-1.0.2//scripts/xdg-desktop-menu 2010-01-15 09:43:50.089551069 +0100 +@@ -601,6 +601,7 @@ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; + fi + } + +diff -uNr xdg-utils-1.0.2/scripts/xdg-email newxdg-utils-1.0.2//scripts/xdg-email +--- xdg-utils-1.0.2/scripts/xdg-email 2010-01-15 09:48:49.339576494 +0100 ++++ newxdg-utils-1.0.2//scripts/xdg-email 2010-01-15 09:45:06.868551938 +0100 +@@ -357,6 +357,7 @@ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; + fi + } + +@@ -636,6 +637,10 @@ + open_xfce "${mailto}" + ;; + ++ lxde) ++ open_generic "${mailto}" ++ ;; ++ + generic) + open_generic "${mailto}" + ;; +diff -uNr xdg-utils-1.0.2/scripts/xdg-icon-resource newxdg-utils-1.0.2//scripts/xdg-icon-resource +--- xdg-utils-1.0.2/scripts/xdg-icon-resource 2007-06-24 21:57:59.000000000 +0200 ++++ newxdg-utils-1.0.2//scripts/xdg-icon-resource 2010-01-15 09:41:58.299551265 +0100 +@@ -397,6 +397,7 @@ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; + fi + } + +diff -uNr xdg-utils-1.0.2/scripts/xdg-mime newxdg-utils-1.0.2//scripts/xdg-mime +--- xdg-utils-1.0.2/scripts/xdg-mime 2010-01-15 09:48:49.340574736 +0100 ++++ newxdg-utils-1.0.2//scripts/xdg-mime 2010-01-15 09:45:30.882550232 +0100 +@@ -426,6 +426,7 @@ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; + fi + } + +diff -uNr xdg-utils-1.0.2/scripts/xdg-open newxdg-utils-1.0.2//scripts/xdg-open +--- xdg-utils-1.0.2/scripts/xdg-open 2010-01-15 09:48:42.104831802 +0100 ++++ newxdg-utils-1.0.2//scripts/xdg-open 2010-01-15 09:46:51.860550227 +0100 +@@ -304,6 +304,7 @@ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; + fi + } + +@@ -427,6 +428,10 @@ + open_xfce "$url" + ;; + ++ lxde) ++ open_generic "$url" ++ ;; ++ + generic) + open_generic "$url" + ;; +diff -uNr xdg-utils-1.0.2/scripts/xdg-screensaver newxdg-utils-1.0.2//scripts/xdg-screensaver +--- xdg-utils-1.0.2/scripts/xdg-screensaver 2007-06-24 21:58:06.000000000 +0200 ++++ newxdg-utils-1.0.2//scripts/xdg-screensaver 2010-01-15 09:47:04.734550060 +0100 +@@ -334,6 +334,7 @@ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; + fi + } + +diff -uNr xdg-utils-1.0.2/scripts/xdg-su newxdg-utils-1.0.2//scripts/xdg-su +--- xdg-utils-1.0.2/scripts/xdg-su 2010-01-15 09:50:47.725800172 +0100 ++++ newxdg-utils-1.0.2//scripts/xdg-su 2010-01-15 09:26:22.031552239 +0100 +@@ -301,6 +301,7 @@ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; ++ elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; + fi + } + +@@ -376,6 +377,15 @@ + fi + } + ++su_lxde() ++{ ++ if which gnomesu &>/dev/null ; then ++ su_gnome ++ else ++ su_generic ++ fi ++} ++ + [ x"$1" != x"" ] || exit_failure_syntax + + user= +@@ -441,6 +451,10 @@ + su_xfce + ;; + ++ lxde) ++ su_lxde ++ ;; ++ + *) + [ x"$user" = x"" ] && user=root + exit_failure_operation_impossible "no graphical method available for invoking '$cmd' as '$user'" + diff --git a/xdg-utils.changes b/xdg-utils.changes index cd49f51..6720ed1 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 14 18:01:21 UTC 2010 - andrea@opensuse.org + +- added LXDE support + ------------------------------------------------------------------- Sun Aug 16 13:43:52 CEST 2009 - aj@suse.de diff --git a/xdg-utils.spec b/xdg-utils.spec index af34d32..d632687 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -1,7 +1,7 @@ # # spec file for package xdg-utils (Version 1.0.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ License: MIT License (or similar) Group: System/GUI/Other Summary: Utilities to uniformly interface desktop environments Version: 1.0.2 -Release: 82 +Release: 83 BuildArch: noarch Url: http://portland.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,6 +33,9 @@ Patch0: xdg-su.diff Patch1: xfce-su.diff Patch2: CVE-2008-0386.diff Patch3: xdg-kde4-upstream.patch +# PATCH-FEATURE-UPSTREAM xdg-utils-1.0.2-lxde-support.patch fdo#26058 andrea@opensuse.org +# this patch add lxde support to xdg-su and other scripts +Patch4: %name-1.0.2-lxde-support.patch %description The xdg-utils package is a set of simple scripts that provide basic @@ -57,6 +60,7 @@ these utilities work properly in their environment. %patch1 %patch2 %patch3 -p1 +%patch4 -p1 %build %configure From e79601e384281927e5d6cb07fd926a8a341aaa24fbb4b7db3002cec125eb1e3b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 15:35:48 +0000 Subject: [PATCH 05/10] Updating link to change in openSUSE:Factory/xdg-utils revision 12.0 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=f5dc523cd63cfc038ebd73131c780d13 --- ready | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 2088d842abbdcf4f9889e472aa3250e64ac49bc789223b9d3a2cfc26cd65a39c Mon Sep 17 00:00:00 2001 From: Lubos Lunak Date: Fri, 9 Apr 2010 13:10:44 +0000 Subject: [PATCH 06/10] Accepting request 37549 from X11:lxde Copy from X11:lxde/xdg-utils via accept of submit request 37549 revision 8. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/37549 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=8 --- xdg-utils-1.0.2-bnc591714.patch | 43 +++++++++++++++++++++++++++++++++ xdg-utils.changes | 5 ++++ xdg-utils.spec | 4 +++ 3 files changed, 52 insertions(+) create mode 100644 xdg-utils-1.0.2-bnc591714.patch diff --git a/xdg-utils-1.0.2-bnc591714.patch b/xdg-utils-1.0.2-bnc591714.patch new file mode 100644 index 0000000..4b04443 --- /dev/null +++ b/xdg-utils-1.0.2-bnc591714.patch @@ -0,0 +1,43 @@ +diff -uNr old-xdg-utils-1.0.2//scripts/xdg-email xdg-utils-1.0.2/scripts/xdg-email +--- old-xdg-utils-1.0.2//scripts/xdg-email 2010-04-02 16:58:27.281598288 +0200 ++++ xdg-utils-1.0.2/scripts/xdg-email 2010-04-02 17:00:27.931347778 +0200 +@@ -617,11 +617,12 @@ + detectDE + + if [ x"$DE" = x"" ]; then +- # if BROWSER variable is not set, check some well known browsers instead +- if [ x"$BROWSER" = x"" ]; then +- BROWSER=firefox:mozilla:netscape +- fi +- DE=generic ++ DE=generic ++fi ++ ++# if BROWSER variable is not set, check some well known browsers instead ++if [ x"$BROWSER" = x"" ]; then ++ BROWSER=firefox:mozilla:netscape + fi + + case "$DE" in +diff -uNr old-xdg-utils-1.0.2//scripts/xdg-open xdg-utils-1.0.2/scripts/xdg-open +--- old-xdg-utils-1.0.2//scripts/xdg-open 2010-04-02 16:58:27.290596083 +0200 ++++ xdg-utils-1.0.2/scripts/xdg-open 2010-04-02 16:59:40.015352868 +0200 +@@ -408,13 +408,14 @@ + detectDE + + if [ x"$DE" = x"" ]; then +- # if BROWSER variable is not set, check some well known browsers instead +- if [ x"$BROWSER" = x"" ]; then +- BROWSER=firefox:mozilla:netscape +- fi + DE=generic + fi + ++# if BROWSER variable is not set, check some well known browsers instead ++if [ x"$BROWSER" = x"" ]; then ++ BROWSER=firefox:mozilla:netscape ++fi ++ + case "$DE" in + kde) + open_kde "$url" diff --git a/xdg-utils.changes b/xdg-utils.changes index 6720ed1..431cf3f 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 28 17:43:15 UTC 2010 - andrea@opensuse.org + +- added xdg-utils-1.0.2-bnc591714.patch to fix bnc#591714 + ------------------------------------------------------------------- Thu Jan 14 18:01:21 UTC 2010 - andrea@opensuse.org diff --git a/xdg-utils.spec b/xdg-utils.spec index d632687..9970b8a 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -36,6 +36,9 @@ Patch3: xdg-kde4-upstream.patch # PATCH-FEATURE-UPSTREAM xdg-utils-1.0.2-lxde-support.patch fdo#26058 andrea@opensuse.org # this patch add lxde support to xdg-su and other scripts Patch4: %name-1.0.2-lxde-support.patch +# PATCH-FIX-UPSTREAM xdg-utils-1.0.2-bnc591714.patch fdo#27551 andrea@opensuse.org +# this patch fix bnc#591714 +Patch5: %name-1.0.2-bnc591714.patch %description The xdg-utils package is a set of simple scripts that provide basic @@ -61,6 +64,7 @@ these utilities work properly in their environment. %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %configure From 1e0c74ea28ca5b1e10c648a1ba0778adbc455c7d04a721fe2d5f52bbb64be056 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 15 Apr 2010 23:56:27 +0000 Subject: [PATCH 07/10] Accepting request 37559 from X11:common:Factory checked in (request 37559) OBS-URL: https://build.opensuse.org/request/show/37559 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=9 --- xdg-utils-1.0.2-bnc591714.patch | 43 --------------------------------- xdg-utils.changes | 5 ---- xdg-utils.spec | 4 --- 3 files changed, 52 deletions(-) delete mode 100644 xdg-utils-1.0.2-bnc591714.patch diff --git a/xdg-utils-1.0.2-bnc591714.patch b/xdg-utils-1.0.2-bnc591714.patch deleted file mode 100644 index 4b04443..0000000 --- a/xdg-utils-1.0.2-bnc591714.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -uNr old-xdg-utils-1.0.2//scripts/xdg-email xdg-utils-1.0.2/scripts/xdg-email ---- old-xdg-utils-1.0.2//scripts/xdg-email 2010-04-02 16:58:27.281598288 +0200 -+++ xdg-utils-1.0.2/scripts/xdg-email 2010-04-02 17:00:27.931347778 +0200 -@@ -617,11 +617,12 @@ - detectDE - - if [ x"$DE" = x"" ]; then -- # if BROWSER variable is not set, check some well known browsers instead -- if [ x"$BROWSER" = x"" ]; then -- BROWSER=firefox:mozilla:netscape -- fi -- DE=generic -+ DE=generic -+fi -+ -+# if BROWSER variable is not set, check some well known browsers instead -+if [ x"$BROWSER" = x"" ]; then -+ BROWSER=firefox:mozilla:netscape - fi - - case "$DE" in -diff -uNr old-xdg-utils-1.0.2//scripts/xdg-open xdg-utils-1.0.2/scripts/xdg-open ---- old-xdg-utils-1.0.2//scripts/xdg-open 2010-04-02 16:58:27.290596083 +0200 -+++ xdg-utils-1.0.2/scripts/xdg-open 2010-04-02 16:59:40.015352868 +0200 -@@ -408,13 +408,14 @@ - detectDE - - if [ x"$DE" = x"" ]; then -- # if BROWSER variable is not set, check some well known browsers instead -- if [ x"$BROWSER" = x"" ]; then -- BROWSER=firefox:mozilla:netscape -- fi - DE=generic - fi - -+# if BROWSER variable is not set, check some well known browsers instead -+if [ x"$BROWSER" = x"" ]; then -+ BROWSER=firefox:mozilla:netscape -+fi -+ - case "$DE" in - kde) - open_kde "$url" diff --git a/xdg-utils.changes b/xdg-utils.changes index 431cf3f..6720ed1 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Mar 28 17:43:15 UTC 2010 - andrea@opensuse.org - -- added xdg-utils-1.0.2-bnc591714.patch to fix bnc#591714 - ------------------------------------------------------------------- Thu Jan 14 18:01:21 UTC 2010 - andrea@opensuse.org diff --git a/xdg-utils.spec b/xdg-utils.spec index 9970b8a..d632687 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -36,9 +36,6 @@ Patch3: xdg-kde4-upstream.patch # PATCH-FEATURE-UPSTREAM xdg-utils-1.0.2-lxde-support.patch fdo#26058 andrea@opensuse.org # this patch add lxde support to xdg-su and other scripts Patch4: %name-1.0.2-lxde-support.patch -# PATCH-FIX-UPSTREAM xdg-utils-1.0.2-bnc591714.patch fdo#27551 andrea@opensuse.org -# this patch fix bnc#591714 -Patch5: %name-1.0.2-bnc591714.patch %description The xdg-utils package is a set of simple scripts that provide basic @@ -64,7 +61,6 @@ these utilities work properly in their environment. %patch2 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build %configure From 82bd7911b4fe4385dfe69ffb359b0ff95fde805f765130bd78124f8efda5b06f Mon Sep 17 00:00:00 2001 From: Lubos Lunak Date: Thu, 22 Jul 2010 09:23:46 +0000 Subject: [PATCH 08/10] Accepting request 43546 from home:RedDwarf:branches:X11:common:Factory Copy from home:RedDwarf:branches:X11:common:Factory/xdg-utils via accept of submit request 43546 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/43546 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=10 --- xdg-kde4-upstream.patch | 148 +++++++++++++++++++++++++++++--- xdg-utils-1.0.2-bnc591714.patch | 43 ++++++++++ xdg-utils.changes | 10 +++ xdg-utils.spec | 6 +- 4 files changed, 192 insertions(+), 15 deletions(-) create mode 100644 xdg-utils-1.0.2-bnc591714.patch diff --git a/xdg-kde4-upstream.patch b/xdg-kde4-upstream.patch index 4ac896d..ea5d431 100644 --- a/xdg-kde4-upstream.patch +++ b/xdg-kde4-upstream.patch @@ -1,11 +1,7 @@ -Index: xdg-utils/scripts/xdg-email +Index: 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 +--- xdg-utils-1.0.2.orig/scripts/xdg-email ++++ xdg-utils-1.0.2/scripts/xdg-email @@ -367,7 +367,7 @@ detectDE() kfmclient_fix_exit_code() @@ -30,14 +26,10 @@ diff -u -p -r1.37 -r1.39 kfmclient_fix_exit_code $? if [ $? -eq 0 ]; then -Index: xdg-utils/scripts/xdg-mime +Index: 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 +--- xdg-utils-1.0.2.orig/scripts/xdg-mime ++++ xdg-utils-1.0.2/scripts/xdg-mime @@ -436,7 +436,7 @@ detectDE() kfmclient_fix_exit_code() @@ -386,3 +378,131 @@ diff -u -p -r1.46 -r1.56 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-1.0.2-bnc591714.patch b/xdg-utils-1.0.2-bnc591714.patch new file mode 100644 index 0000000..4b04443 --- /dev/null +++ b/xdg-utils-1.0.2-bnc591714.patch @@ -0,0 +1,43 @@ +diff -uNr old-xdg-utils-1.0.2//scripts/xdg-email xdg-utils-1.0.2/scripts/xdg-email +--- old-xdg-utils-1.0.2//scripts/xdg-email 2010-04-02 16:58:27.281598288 +0200 ++++ xdg-utils-1.0.2/scripts/xdg-email 2010-04-02 17:00:27.931347778 +0200 +@@ -617,11 +617,12 @@ + detectDE + + if [ x"$DE" = x"" ]; then +- # if BROWSER variable is not set, check some well known browsers instead +- if [ x"$BROWSER" = x"" ]; then +- BROWSER=firefox:mozilla:netscape +- fi +- DE=generic ++ DE=generic ++fi ++ ++# if BROWSER variable is not set, check some well known browsers instead ++if [ x"$BROWSER" = x"" ]; then ++ BROWSER=firefox:mozilla:netscape + fi + + case "$DE" in +diff -uNr old-xdg-utils-1.0.2//scripts/xdg-open xdg-utils-1.0.2/scripts/xdg-open +--- old-xdg-utils-1.0.2//scripts/xdg-open 2010-04-02 16:58:27.290596083 +0200 ++++ xdg-utils-1.0.2/scripts/xdg-open 2010-04-02 16:59:40.015352868 +0200 +@@ -408,13 +408,14 @@ + detectDE + + if [ x"$DE" = x"" ]; then +- # if BROWSER variable is not set, check some well known browsers instead +- if [ x"$BROWSER" = x"" ]; then +- BROWSER=firefox:mozilla:netscape +- fi + DE=generic + fi + ++# if BROWSER variable is not set, check some well known browsers instead ++if [ x"$BROWSER" = x"" ]; then ++ BROWSER=firefox:mozilla:netscape ++fi ++ + case "$DE" in + kde) + open_kde "$url" diff --git a/xdg-utils.changes b/xdg-utils.changes index 6720ed1..7a2dce5 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 + +- added xdg-utils-1.0.2-bnc591714.patch to fix bnc#591714 + ------------------------------------------------------------------- Thu Jan 14 18:01:21 UTC 2010 - andrea@opensuse.org diff --git a/xdg-utils.spec b/xdg-utils.spec index d632687..20db65f 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -24,7 +24,7 @@ License: MIT License (or similar) Group: System/GUI/Other Summary: Utilities to uniformly interface desktop environments Version: 1.0.2 -Release: 83 +Release: 84 BuildArch: noarch Url: http://portland.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,6 +36,9 @@ Patch3: xdg-kde4-upstream.patch # PATCH-FEATURE-UPSTREAM xdg-utils-1.0.2-lxde-support.patch fdo#26058 andrea@opensuse.org # this patch add lxde support to xdg-su and other scripts Patch4: %name-1.0.2-lxde-support.patch +# PATCH-FIX-UPSTREAM xdg-utils-1.0.2-bnc591714.patch fdo#27551 andrea@opensuse.org +# this patch fix bnc#591714 +Patch5: %name-1.0.2-bnc591714.patch %description The xdg-utils package is a set of simple scripts that provide basic @@ -61,6 +64,7 @@ these utilities work properly in their environment. %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %configure From 20ced1ca3a558ab6b19194b652a05eaebed5cf3f2f2d66b7b1e9140cee01f6e6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 23 Jul 2010 19:37:35 +0000 Subject: [PATCH 09/10] 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 From ed746783d506841b1ef27b98bf6310300a361ae48a9155be712ee74766f9cb43 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 23 May 2011 13:43:53 +0000 Subject: [PATCH 10/10] Accepting request 70894 from home:christiantrippe:branches:X11:common:Factory - Fix xdg-open to probably parse the version for KDE4 (bnc#694543) OBS-URL: https://build.opensuse.org/request/show/70894 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=12 --- xdg-kde4-upstream.patch | 161 ++++++++++++++++++++++++++++++++++++---- xdg-utils.changes | 10 +++ xdg-utils.spec | 2 +- 3 files changed, 158 insertions(+), 15 deletions(-) diff --git a/xdg-kde4-upstream.patch b/xdg-kde4-upstream.patch index 4ac896d..773e6a1 100644 --- a/xdg-kde4-upstream.patch +++ b/xdg-kde4-upstream.patch @@ -1,11 +1,7 @@ -Index: xdg-utils/scripts/xdg-email +Index: 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 +--- xdg-utils-1.0.2.orig/scripts/xdg-email ++++ xdg-utils-1.0.2/scripts/xdg-email @@ -367,7 +367,7 @@ detectDE() kfmclient_fix_exit_code() @@ -30,14 +26,10 @@ diff -u -p -r1.37 -r1.39 kfmclient_fix_exit_code $? if [ $? -eq 0 ]; then -Index: xdg-utils/scripts/xdg-mime +Index: 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 +--- xdg-utils-1.0.2.orig/scripts/xdg-mime ++++ xdg-utils-1.0.2/scripts/xdg-mime @@ -436,7 +436,7 @@ detectDE() kfmclient_fix_exit_code() @@ -386,3 +378,144 @@ diff -u -p -r1.46 -r1.56 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 +Index: xdg-utils-1.0.2/scripts/xdg-open +=================================================================== +--- xdg-utils-1.0.2.orig/scripts/xdg-open ++++ xdg-utils-1.0.2/scripts/xdg-open +@@ -315,7 +315,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/'` diff --git a/xdg-utils.changes b/xdg-utils.changes index 431cf3f..1b1ddfe 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat May 21 13:48:19 UTC 2011 - ctrippe@opensuse.org + +- Fix xdg-open to probably parse the version for KDE4 (bnc#694543) + +------------------------------------------------------------------- +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 diff --git a/xdg-utils.spec b/xdg-utils.spec index 20db65f..5f4a9df 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -24,7 +24,7 @@ License: MIT License (or similar) Group: System/GUI/Other Summary: Utilities to uniformly interface desktop environments Version: 1.0.2 -Release: 84 +Release: 85 BuildArch: noarch Url: http://portland.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build