forked from pool/xdg-utils
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
This commit is contained in:
parent
1e0c74ea28
commit
82bd7911b4
@ -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
|
--- xdg-utils-1.0.2.orig/scripts/xdg-email
|
||||||
retrieving revision 1.37
|
+++ xdg-utils-1.0.2/scripts/xdg-email
|
||||||
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()
|
@@ -367,7 +367,7 @@ detectDE()
|
||||||
|
|
||||||
kfmclient_fix_exit_code()
|
kfmclient_fix_exit_code()
|
||||||
@ -30,14 +26,10 @@ diff -u -p -r1.37 -r1.39
|
|||||||
kfmclient_fix_exit_code $?
|
kfmclient_fix_exit_code $?
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
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
|
--- xdg-utils-1.0.2.orig/scripts/xdg-mime
|
||||||
retrieving revision 1.46
|
+++ xdg-utils-1.0.2/scripts/xdg-mime
|
||||||
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()
|
@@ -436,7 +436,7 @@ detectDE()
|
||||||
|
|
||||||
kfmclient_fix_exit_code()
|
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)"
|
DEBUG 1 "Removing $kde_dir/$x.desktop (KDE 3.x support)"
|
||||||
rm -f $kde_dir/$x.desktop
|
rm -f $kde_dir/$x.desktop
|
||||||
fi
|
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
|
||||||
|
43
xdg-utils-1.0.2-bnc591714.patch
Normal file
43
xdg-utils-1.0.2-bnc591714.patch
Normal file
@ -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"
|
@ -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
|
Thu Jan 14 18:01:21 UTC 2010 - andrea@opensuse.org
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ License: MIT License (or similar)
|
|||||||
Group: System/GUI/Other
|
Group: System/GUI/Other
|
||||||
Summary: Utilities to uniformly interface desktop environments
|
Summary: Utilities to uniformly interface desktop environments
|
||||||
Version: 1.0.2
|
Version: 1.0.2
|
||||||
Release: 83
|
Release: 84
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Url: http://portland.freedesktop.org/
|
Url: http://portland.freedesktop.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
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
|
# 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
|
# this patch add lxde support to xdg-su and other scripts
|
||||||
Patch4: %name-1.0.2-lxde-support.patch
|
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
|
%description
|
||||||
The xdg-utils package is a set of simple scripts that provide basic
|
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
|
%patch2
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
|
Loading…
Reference in New Issue
Block a user