Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2015-12-13 09:37:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-11-11 10:30:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new/xdg-utils.changes 2015-12-13 09:37:07.000000000 +0100 @@ -1,0 +2,13 @@ +Sun Dec 6 10:23:11 UTC 2015 - jsl...@suse.com + +- update to 20151112 + * xdg-utils-common: bump version number + * Check for $WAYLAND_DISPLAY as well as $DISPLAY. + +------------------------------------------------------------------- +Thu Dec 3 17:08:12 UTC 2015 - roni...@gmail.com + +- Add patch `xdg-terminal-fix-gsettings.patch` to fix upstream + bfo#93231 + +------------------------------------------------------------------- Old: ---- xdg-utils-20151005.tar.xz New: ---- xdg-terminal-fix-gsettings.patch xdg-utils-20151112.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.JnONKL/_old 2015-12-13 09:37:08.000000000 +0100 +++ /var/tmp/diff_new_pack.JnONKL/_new 2015-12-13 09:37:08.000000000 +0100 @@ -26,14 +26,15 @@ Summary: Utilities to uniformly interface desktop environments License: MIT Group: System/GUI/Other -Version: 20151005 +Version: 20151112 Release: 0 BuildArch: noarch Url: http://portland.freedesktop.org/ # http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz Source0: xdg-utils-%{version}.tar.xz Patch0: install-some-more-scripts.diff -Patch3: fix-enlightenment-support.patch +Patch1: xdg-terminal-fix-gsettings.patch +Patch2: fix-enlightenment-support.patch Requires: perl Requires: perl-Net-DBus Requires: perl-X11-Protocol @@ -61,7 +62,8 @@ %prep %setup -q -n %name-%{version} %patch0 -p1 -%patch3 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure ++++++ xdg-terminal-fix-gsettings.patch ++++++ From: Ronan Arraes Jardim Chagas <roni...@gmail.com> References: bfo#93231 Subject: Fix a bug when xdg-terminal needs gsettings to get the default terminal xdg-terminal is not working when it needs gsettings to obtain the default terminal. Thus, xdg-terminal cannot be used in MATE, Cinnamon or GNOME. This issue was already reported in: https://bugs.freedesktop.org/show_bug.cgi?id=93231 Thus, this patch provides a temporary workaround until upstream fixes it. Link: https://bugs.freedesktop.org/show_bug.cgi?id=93231 --- scripts/xdg-terminal.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/scripts/xdg-terminal.in +++ b/scripts/xdg-terminal.in @@ -86,8 +86,8 @@ terminal_gsettings() { term_schema="$1"; shift - term_exec=`gsettings get ${term_schema} exec` - term_exec_arg=`gsettings get ${term_schema} exec-arg` + term_exec=`gsettings get ${term_schema} exec | sed -r "s/^'(.*)'$/\1/"` + term_exec_arg=`gsettings get ${term_schema} exec-arg | sed -r "s/^'(.*)'$/\1/"` terminal_exec=`which $term_exec 2>/dev/null` ++++++ xdg-utils-20151005.tar.xz -> xdg-utils-20151112.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20151005/ChangeLog new/xdg-utils-20151112/ChangeLog --- old/xdg-utils-20151005/ChangeLog 2015-11-03 11:54:49.000000000 +0100 +++ new/xdg-utils-20151112/ChangeLog 2015-12-06 11:19:52.000000000 +0100 @@ -1,3 +1,9 @@ +=== xdg-utils 1.1.2 (unreleased) === + +2015-11-03 Per Olofsson <pe...@debian.org> + * Check for $WAYLAND_DISPLAY as well as $DISPLAY. Move display checking + to a common has_display() function. Thanks to Pasi Sjöholm for reporting. + === xdg-utils 1.1.1 === 2015-10-05 Per Olofsson <pe...@debian.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20151005/scripts/xdg-email.in new/xdg-utils-20151112/scripts/xdg-email.in --- old/xdg-utils-20151005/scripts/xdg-email.in 2015-11-03 11:54:49.000000000 +0100 +++ new/xdg-utils-20151112/scripts/xdg-email.in 2015-12-06 11:19:52.000000000 +0100 @@ -433,7 +433,7 @@ # 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 - if [ -n "$DISPLAY" ]; then + if has_display; then BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20151005/scripts/xdg-mime.in new/xdg-utils-20151112/scripts/xdg-mime.in --- old/xdg-utils-20151005/scripts/xdg-mime.in 2015-11-03 11:54:49.000000000 +0100 +++ new/xdg-utils-20151112/scripts/xdg-mime.in 2015-12-06 11:19:52.000000000 +0100 @@ -32,7 +32,7 @@ update_mime_database() { - if [ x"$mode" = x"user" -a -n "$DISPLAY" ] ; then + if [ "$mode" = user ] && has_display; then detectDE if [ x"$DE" = x"kde" ] ; then DEBUG 1 "Running kbuildsycoca" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20151005/scripts/xdg-open.in new/xdg-utils-20151112/scripts/xdg-open.in --- old/xdg-utils-20151005/scripts/xdg-open.in 2015-11-03 11:54:49.000000000 +0100 +++ new/xdg-utils-20151112/scripts/xdg-open.in 2015-12-06 11:19:52.000000000 +0100 @@ -348,7 +348,7 @@ check_input_file "$file" - if [ -n "$DISPLAY" ]; then + if has_display; then filetype=`xdg-mime query filetype "$file" | sed "s/;.*//"` open_generic_xdg_mime "$file" "$filetype" fi @@ -360,7 +360,7 @@ fi fi - if [ -n "$DISPLAY" ] && mimeopen -v 2>/dev/null 1>&2; then + if has_display && mimeopen -v 2>/dev/null 1>&2; then mimeopen -L -n "$file" if [ $? -eq 0 ]; then exit_success @@ -372,14 +372,14 @@ open_envvar "$1" fi - if [ -n "$DISPLAY" ]; then + if has_display; then open_generic_xdg_x_scheme_handler "$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 - if [ -n "$DISPLAY" ]; then + if has_display; then BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20151005/scripts/xdg-utils-common.in new/xdg-utils-20151112/scripts/xdg-utils-common.in --- old/xdg-utils-20151005/scripts/xdg-utils-common.in 2015-11-03 11:54:49.000000000 +0100 +++ new/xdg-utils-20151112/scripts/xdg-utils-common.in 2015-12-06 11:19:52.000000000 +0100 @@ -227,7 +227,7 @@ ;; --version) - echo "@NAME@ 1.1.0 rc3" + echo "@NAME@ 1.1.1+" exit_success ;; esac @@ -350,3 +350,15 @@ test "$release" -gt 4 && return $1 return 0 } + +#---------------------------------------------------------------------------- +# Returns true if there is a graphical display attached. + +has_display() +{ + if [ -n "$DISPLAY" ] || [ -n "$WAYLAND_DISPLAY" ]; then + return 0 + else + return 1 + fi +}
