xdg-utils:moved into main repo for pisi 2.0
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
Index: xdg-utils-1.0.2.20100618/scripts/Makefile.in
|
||||
===================================================================
|
||||
--- xdg-utils-1.0.2.20100618.orig/scripts/Makefile.in
|
||||
+++ xdg-utils-1.0.2.20100618/scripts/Makefile.in
|
||||
@@ -5,7 +5,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(IN
|
||||
INSTALL_LIBRARY = @INSTALL_PROGRAM@ $(INSTALL_PROGRAM_FLAGS)
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@ $(INSTALL_SCRIPT_FLAGS)
|
||||
INSTALL_DATA = @INSTALL_DATA@ $(INSTALL_DATA_FLAGS)
|
||||
-XMLTO = @XMLTO@
|
||||
+XMLTO = @XMLTO@ --skip-validation
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
@@ -0,0 +1,20 @@
|
||||
diff -Nur xdg-utils-1.0.2.20100618-old//scripts/Makefile.in xdg-utils-1.0.2.20100618//scripts/Makefile.in
|
||||
--- xdg-utils-1.0.2.20100618-old//scripts/Makefile.in 2010-10-27 10:39:56.381000014 +0300
|
||||
+++ xdg-utils-1.0.2.20100618//scripts/Makefile.in 2010-10-27 10:41:44.799000093 +0300
|
||||
@@ -20,11 +20,11 @@
|
||||
xdg-open \
|
||||
xdg-email \
|
||||
xdg-screensaver \
|
||||
- xdg-settings
|
||||
-# xdg-su
|
||||
-# xdg-copy \
|
||||
-# xdg-file-dialog
|
||||
-# xdg-terminal
|
||||
+ xdg-settings \
|
||||
+ xdg-su \
|
||||
+ xdg-copy \
|
||||
+ xdg-file-dialog \
|
||||
+ xdg-terminal
|
||||
|
||||
MANPAGES= $(SCRIPTS:%=man/%.1)
|
||||
WEBPAGES= $(SCRIPTS:%=%.html)
|
||||
@@ -0,0 +1,42 @@
|
||||
Index: xdg-utils-1.0.2/scripts/xdg-su
|
||||
===================================================================
|
||||
--- xdg-utils-1.0.2.orig/scripts/xdg-su
|
||||
+++ xdg-utils-1.0.2/scripts/xdg-su
|
||||
@@ -351,6 +351,26 @@ su_gnome()
|
||||
exit_failure_operation_failed
|
||||
fi
|
||||
else
|
||||
+ su_gk
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
+su_gk()
|
||||
+{
|
||||
+ GKSU=`which gksu 2>/dev/null`
|
||||
+ if [ $? -eq 0 ] ; then
|
||||
+ if [ -z "$user" ] ; then
|
||||
+ $GKSU "$cmd"
|
||||
+ else
|
||||
+ $GKSU -u "$user" "$cmd"
|
||||
+ fi
|
||||
+
|
||||
+ if [ $? -eq 0 ]; then
|
||||
+ exit_success
|
||||
+ else
|
||||
+ exit_failure_operation_failed
|
||||
+ fi
|
||||
+ else
|
||||
su_generic
|
||||
fi
|
||||
}
|
||||
@@ -427,6 +447,10 @@ case "$DE" in
|
||||
su_gnome
|
||||
;;
|
||||
|
||||
+ xfce)
|
||||
+ su_gk
|
||||
+ ;;
|
||||
+
|
||||
generic)
|
||||
su_generic
|
||||
;;
|
||||
@@ -0,0 +1,11 @@
|
||||
--- scripts/xdg-utils-common.in.OSmanOS 2012-10-08 18:26:46.000000000 +0300
|
||||
+++ scripts/xdg-utils-common.in 2013-04-05 18:22:55.816631216 +0300
|
||||
@@ -280,7 +280,7 @@
|
||||
elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
|
||||
elif [ x"$MATE_DESKTOP_SESSION_ID" != x"" ]; then DE=mate;
|
||||
elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
|
||||
- elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
|
||||
+ elif xprop -root | grep -qw XFCE_DESKTOP_WINDOW 2>&1; then DE=xfce;
|
||||
elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce
|
||||
fi
|
||||
fi
|
||||
Reference in New Issue
Block a user