forked from pool/xdg-utils
checked in (request 29828)
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=6
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
c1b9baa290
commit
5de34a12e9
@ -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'"
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user