diff --git a/common-vendor-dirs-in-desktop_to_binary.patch b/common-vendor-dirs-in-desktop_to_binary.patch index 18484a0..6d7d98c 100644 --- a/common-vendor-dirs-in-desktop_to_binary.patch +++ b/common-vendor-dirs-in-desktop_to_binary.patch @@ -4,10 +4,10 @@ Date: Tue May 31 13:13:53 2016 +0930 common: implement vendor dirs in desktop_file_to_binary -diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in -index cf08cd3..19400a4 100644 ---- a/scripts/xdg-utils-common.in -+++ b/scripts/xdg-utils-common.in +Index: xdg-utils-20160610/scripts/xdg-utils-common.in +=================================================================== +--- xdg-utils-20160610.orig/scripts/xdg-utils-common.in ++++ xdg-utils-20160610/scripts/xdg-utils-common.in @@ -50,7 +50,6 @@ binary_to_desktop_file() #------------------------------------------------------------- @@ -16,7 +16,7 @@ index cf08cd3..19400a4 100644 desktop_file_to_binary() { search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" -@@ -58,14 +57,32 @@ desktop_file_to_binary() +@@ -58,14 +57,33 @@ desktop_file_to_binary() IFS=: for dir in $search; do unset IFS @@ -38,7 +38,8 @@ index cf08cd3..19400a4 100644 + elif [ -r $dir/applnk/$vendor/$app ]; then + file_path=$dir/applnk/$vendor/$app + fi -+ else ++ fi ++ if test -z "$file_path" ; then + for indir in "$dir"/applications/ "$dir"/applications/*/ "$dir"/applnk/ "$dir"/applnk/*/; do + file="$indir/$desktop" + if [ -r "$file" ]; then diff --git a/fix-enlightenment-lxqt-support.patch b/fix-enlightenment-lxqt-support.patch new file mode 100644 index 0000000..2b7facb --- /dev/null +++ b/fix-enlightenment-lxqt-support.patch @@ -0,0 +1,196 @@ +Index: xdg-utils-20160610/ChangeLog +=================================================================== +--- xdg-utils-20160610.orig/ChangeLog ++++ xdg-utils-20160610/ChangeLog +@@ -1,5 +1,9 @@ + === xdg-utils 1.1.2 (unreleased) === + ++2016-08-25 Simon Lees ++ * Add support for LXQt ++ * Add enlightenment to xdg-email, xdg-settings ++ + 2016-06-10 Rex Dieter + * xdg-open: prefer open_generic_xdg_x_scheme_handler over open_envvar (BR96472) + +Index: xdg-utils-20160610/scripts/xdg-email.in +=================================================================== +--- xdg-utils-20160610.orig/scripts/xdg-email.in ++++ xdg-utils-20160610/scripts/xdg-email.in +@@ -459,7 +459,7 @@ case "$DE" in + open_xfce "${mailto}" + ;; + +- generic) ++ generic|lxqt|enlightenment) + open_generic "${mailto}" + ;; + +Index: xdg-utils-20160610/scripts/xdg-open.in +=================================================================== +--- xdg-utils-20160610.orig/scripts/xdg-open.in ++++ xdg-utils-20160610/scripts/xdg-open.in +@@ -488,7 +488,7 @@ case "$DE" in + open_xfce "$url" + ;; + +- lxde) ++ lxde|lxqt) + open_lxde "$url" + ;; + +Index: xdg-utils-20160610/scripts/xdg-settings.in +=================================================================== +--- xdg-utils-20160610.orig/scripts/xdg-settings.in ++++ xdg-utils-20160610/scripts/xdg-settings.in +@@ -852,7 +852,7 @@ case "$DE" in + dispatch_specific xfce "$@" + ;; + +- generic) ++ generic|lxqt|enlightenment) + dispatch_specific generic "$@" + ;; + +Index: xdg-utils-20160610/scripts/xdg-su.in +=================================================================== +--- xdg-utils-20160610.orig/scripts/xdg-su.in ++++ xdg-utils-20160610/scripts/xdg-su.in +@@ -78,6 +78,49 @@ su_gnome() + fi + } + ++su_lxqt() ++{ ++ LXQTSU=`which lxqt-sudo 2>/dev/null` ++ if [ $? -eq 0 ] ; then ++ if [ -z "$user" ] ; then ++ # -s option runs as su rather then sudo ++ $LXQTSU -s "$cmd" ++ else ++ # lxqt-sudo does not support specifying a user ++ su_generic ++ fi ++ ++ if [ $? -eq 0 ]; then ++ exit_success ++ else ++ exit_failure_operation_failed ++ fi ++ else ++ su_generic ++ fi ++} ++ ++su_enlightenment() ++{ ++# Enlightenment doesn't have any reasonably working su/sudo graphical interface ++# but terminology works as a drop in replacement for xterm and has a matching theme ++ if which terminology >/dev/null ; then ++ if [ -z "$user" ] ; then ++ terminology -g 60x5 -T "xdg-su: $cmd" -e "su -c '$cmd'" ++ else ++ terminology -g 60x5 -T "xdg-su: $cmd" -e "su -c '$cmd' '$user'" ++ fi ++ ++ if [ $? -eq 0 ]; then ++ exit_success ++ else ++ exit_failure_operation_failed ++ fi ++ else ++ su_generic ++ fi ++} ++ + su_generic() + { + if [ -z "$user" ] ; then +@@ -167,6 +210,14 @@ case "$DE" in + su_xfce + ;; + ++ lxqt) ++ su_lxqt ++ ;; ++ ++ enlightenment) ++ su_enlightenment ++ ;; ++ + *) + [ x"$user" = x"" ] && user=root + exit_failure_operation_impossible "no graphical method available for invoking '$cmd' as '$user'" +Index: xdg-utils-20160610/scripts/xdg-terminal.in +=================================================================== +--- xdg-utils-20160610.orig/scripts/xdg-terminal.in ++++ xdg-utils-20160610/scripts/xdg-terminal.in +@@ -176,6 +176,32 @@ terminal_lxde() + fi + } + ++terminal_lxqt() ++{ ++ if which qterminal &>/dev/null; then ++ if [ x"$1" = x"" ]; then ++ qterminal ++ else ++ qterminal -e "$1" ++ fi ++ else ++ terminal_generic "$1" ++ fi ++} ++ ++terminal_enlightenment() ++{ ++ if which terminology &>/dev/null; then ++ if [ x"$1" = x"" ]; then ++ terminology ++ else ++ terminology -e "$1" ++ fi ++ else ++ terminal_generic "$1" ++ fi ++} ++ + #[ x"$1" != x"" ] || exit_failure_syntax + + command= +@@ -232,6 +258,14 @@ case "$DE" in + terminal_lxde "$command" + ;; + ++ lxqt) ++ terminal_lxqt "$command" ++ ;; ++ ++ enlightenment) ++ terminal_enlightenment "$command" ++ ;; ++ + generic) + terminal_generic "$command" + ;; +Index: xdg-utils-20160610/scripts/xdg-utils-common.in +=================================================================== +--- xdg-utils-20160610.orig/scripts/xdg-utils-common.in ++++ xdg-utils-20160610/scripts/xdg-utils-common.in +@@ -273,6 +273,9 @@ detectDE() + LXDE) + DE=lxde; + ;; ++ LXQt) ++ DE=lxqt; ++ ;; + MATE) + DE=mate; + ;; +@@ -294,6 +297,7 @@ detectDE() + elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce + elif echo $DESKTOP | grep -q '^Enlightenment'; then DE=enlightenment; ++ elif [ x"$LXQT_SESSION_CONFIG" != x"" ]; then DE=mate; + fi + fi + diff --git a/fix-enlightenment-support.patch b/fix-enlightenment-support.patch deleted file mode 100644 index d6e191a..0000000 --- a/fix-enlightenment-support.patch +++ /dev/null @@ -1,91 +0,0 @@ -From: Simon Lees - -Based off an earlier patch by Tomas Cech. - -This patch does 2 things: -1. In both xdg-su and xdg-terminal enlightenment is detected but then - no action is performed, this patch performs an action in these cases. -2. Rather than performing the generic action, specific enlightenment - actions have been added. They use terminology rather than xterm as it - is essientially the enlightenment terminal emulator and matches the - terminology theme. - ---- - scripts/xdg-su.in | 25 +++++++++++++++++++++++++ - scripts/xdg-terminal.in | 17 +++++++++++++++++ - 2 files changed, 42 insertions(+) - ---- a/scripts/xdg-su.in -+++ b/scripts/xdg-su.in -@@ -104,6 +104,27 @@ su_xfce() - - [ x"$1" != x"" ] || exit_failure_syntax - -+su_enlightenment() -+{ -+# Enlightenment doesn't have any reasonably working su/sudo graphical interface -+# but terminology works as a drop in replacement for xterm and has a matching theme -+ if which terminology >/dev/null ; then -+ if [ -z "$user" ] ; then -+ terminology -g 60x5 -T "xdg-su: $cmd" -e "su -c '$cmd'" -+ else -+ terminology -g 60x5 -T "xdg-su: $cmd" -e "su -c '$cmd' '$user'" -+ fi -+ -+ if [ $? -eq 0 ]; then -+ exit_success -+ else -+ exit_failure_operation_failed -+ fi -+ else -+ su_generic -+ fi -+} -+ - user= - cmd= - while [ $# -gt 0 ] ; do -@@ -167,6 +188,10 @@ case "$DE" in - su_xfce - ;; - -+ enlightenment) -+ su_enlightenment -+ ;; -+ - *) - [ x"$user" = x"" ] && user=root - exit_failure_operation_impossible "no graphical method available for invoking '$cmd' as '$user'" ---- a/scripts/xdg-terminal.in -+++ b/scripts/xdg-terminal.in -@@ -176,6 +176,19 @@ terminal_lxde() - fi - } - -+terminal_enlightenment() -+{ -+ if which terminology &>/dev/null; then -+ if [ x"$1" = x"" ]; then -+ terminology -+ else -+ terminology -e "$1" -+ fi -+ else -+ terminal_generic "$1" -+ fi -+} -+ - #[ x"$1" != x"" ] || exit_failure_syntax - - command= -@@ -231,6 +244,10 @@ case "$DE" in - lxde) - terminal_lxde "$command" - ;; -+ -+ enlightenment) -+ terminal_enlightenment "$command" -+ ;; - - generic) - terminal_generic "$command" diff --git a/xdg-utils-20160520.tar.xz b/xdg-utils-20160520.tar.xz deleted file mode 100644 index 8f0fc2e..0000000 --- a/xdg-utils-20160520.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d1967e9f1d546377182a45eeade0859a97f9b564f3073085b3c2d78de89681b -size 268508 diff --git a/xdg-utils-20160610.tar.xz b/xdg-utils-20160610.tar.xz new file mode 100644 index 0000000..f4caeb0 --- /dev/null +++ b/xdg-utils-20160610.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d92a29242de41b0581f9743f043670997fd56fe521e5a57412056cc3c300a2d0 +size 268452 diff --git a/xdg-utils.changes b/xdg-utils.changes index 31c94e9..e9be0f4 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Nov 15 00:26:14 UTC 2016 - sflees@suse.de + +- Update to 20160610 + * Fixes for last update +- boo#1004321 desktop files with a - are still valid, issue in + common-vendor-dirs-in-desktop_to_binary.patch +- boo#959912 Introduce LXQt support, renamed + fix-enlightenment-support.patch to fix-enlightenment-lxqt-support.patch + +------------------------------------------------------------------- Fri May 20 04:54:39 UTC 2016 - sflees@suse.de - Update to 20160520 diff --git a/xdg-utils.spec b/xdg-utils.spec index 9916d06..7abf201 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -17,7 +17,7 @@ Name: xdg-utils -Version: 20160520 +Version: 20160610 Release: 0 Summary: Utilities to uniformly interface desktop environments License: MIT @@ -30,7 +30,7 @@ Patch0: install-some-more-scripts.diff # PATCH-FIX-UPSTREAM xdg-terminal-fix-gsettings.patch fdo#93231 ronisbr@gmail.com Patch1: xdg-terminal-fix-gsettings.patch # PATCH-FIX-UPSTREAM fix-enlightenment-support.patch fdo#88280 simon@simotek.net -Patch2: fix-enlightenment-support.patch +Patch2: fix-enlightenment-lxqt-support.patch # PATCH-FIX-UPSTREAM xdg-terminal-fix-terminal--x-arg.patch fdo#93231 sor.alexei@meowr.ru -- https://bugs.freedesktop.org/show_bug.cgi?id=93231#c5 Patch3: xdg-terminal-fix-terminal--x-arg.patch # PATCH-FIX-UPSTREAM (2 patches) xdg-mime / xdg-open generic implementations only return 1 item sflees@suse.de (boo#979265)