Hello community,
here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2016-11-16 13:45:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old)
and /work/SRC/openSUSE:Factory/.xdg-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-utils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2016-06-13 21:54:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xdg-utils.new/xdg-utils.changes 2016-11-16 13:46:00.000000000 +0100
@@ -0,0 +1,11 @@
+-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------
Old:
----
fix-enlightenment-support.patch
xdg-utils-20160520.tar.xz
New:
----
fix-enlightenment-lxqt-support.patch
xdg-utils-20160610.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-utils.spec ++++++
--- /var/tmp/diff_new_pack.YwCiym/_old 2016-11-16 13:46:01.000000000 +0100
+++ /var/tmp/diff_new_pack.YwCiym/_new 2016-11-16 13:46:01.000000000 +0100
@@ -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 @@
# 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)
++++++ common-vendor-dirs-in-desktop_to_binary.patch ++++++
--- /var/tmp/diff_new_pack.YwCiym/_old 2016-11-16 13:46:01.000000000 +0100
+++ /var/tmp/diff_new_pack.YwCiym/_new 2016-11-16 13:46:01.000000000 +0100
@@ -4,10 +4,10 @@
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 @@
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 @@
+ 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
++++++ fix-enlightenment-lxqt-support.patch ++++++
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
++++++ xdg-utils-20160520.tar.xz -> xdg-utils-20160610.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20160520/ChangeLog new/xdg-utils-20160610/ChangeLog
--- old/xdg-utils-20160520/ChangeLog 2016-06-07 07:21:43.000000000 +0200
+++ new/xdg-utils-20160610/ChangeLog 2016-06-10 14:27:03.000000000 +0200
@@ -1,5 +1,8 @@
=== xdg-utils 1.1.2 (unreleased) ===
+2016-06-10 Rex Dieter
+ * xdg-open: prefer open_generic_xdg_x_scheme_handler over open_envvar (BR96472)
+
2016-05-20 Rex Dieter
* xdg-mime: ensure check_mimeapps_list returns only primary item (BR44163)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20160520/scripts/xdg-open.in new/xdg-utils-20160610/scripts/xdg-open.in
--- old/xdg-utils-20160520/scripts/xdg-open.in 2016-06-07 07:21:43.000000000 +0200
+++ new/xdg-utils-20160610/scripts/xdg-open.in 2016-06-10 14:27:03.000000000 +0200
@@ -380,14 +380,14 @@
fi
fi
- if [ -n "$BROWSER" ]; then
- open_envvar "$1"
- fi
-
if has_display; then
open_generic_xdg_x_scheme_handler "$1"
fi
+ if [ -n "$BROWSER" ]; then
+ open_envvar "$1"
+ fi
+
# if BROWSER variable is not set, check some well known browsers instead
if [ x"$BROWSER" = x"" ]; then
BROWSER=www-browser:links2:elinks:links:lynx:w3m