Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2018-05-08 13:31:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old) and /work/SRC/openSUSE:Factory/.xdg-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-utils" Tue May 8 13:31:29 2018 rev:46 rq:603863 version:20170508 Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2017-06-02 10:29:51.445364654 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new/xdg-utils.changes 2018-05-08 13:31:31.498143466 +0200 @@ -0,0 +1,5 @@ +Tue May 1 05:28:49 UTC 2018 - sfl...@suse.de + +- boo#1051353 can't set default browser on kde. + * fix-kde-browser-check.patch + New: ---- fix-kde-browser-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.eOenC2/_old 2018-05-08 13:31:32.346112872 +0200 +++ /var/tmp/diff_new_pack.eOenC2/_new 2018-05-08 13:31:32.346112872 +0200 @@ -31,6 +31,7 @@ Patch1: xdg-terminal-fix-gsettings.patch # PATCH-FIX-UPSTREAM xdg-terminal-fix-terminal--x-arg.patch fdo#93231 sor.ale...@meowr.ru -- https://bugs.freedesktop.org/show_bug.cgi?id=93231#c5 Patch3: xdg-terminal-fix-terminal--x-arg.patch +Patch4: fix-kde-browser-check.patch BuildRequires: make # for xmlto to be able to generate text from html BuildRequires: w3m @@ -65,9 +66,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch3 -p1 +%autopatch -p1 %build %configure ++++++ fix-kde-browser-check.patch ++++++ Index: xdg-utils-20160610/scripts/xdg-settings.in =================================================================== --- xdg-utils-20160610.orig/scripts/xdg-settings.in +++ xdg-utils-20160610/scripts/xdg-settings.in @@ -226,6 +226,14 @@ check_browser_kde() fi browser="`read_kde_browser`" binary="`resolve_kde_browser`" + + # The browser may contain a relative entry to the binary starting with ! + if [ x"!" == x"${browser:0:1}" ]; then + # get the full path + browser="`binary_to_desktop_file ${browser:1}`" + binary="`desktop_file_to_binary $browser`" + fi + # Because KDE will use the handler for MIME type text/html if this value # is empty, we allow either the empty string or a match to $check here. if [ x"$binary" != x -a x"$binary" != x"$check" ]; then @@ -575,16 +583,23 @@ check_url_scheme_handler_kde() fi if [ x"$1" = "mailto" ]; then binary="`read_kde_config emaildefaults PROFILE_Default EmailClient`" + # The field may contain a relative entry to the binary starting with ! + if [ x"!" == x"${binary:0:1}" ]; then + # get the full path + desktop_file="`binary_to_desktop_file ${binary:1}`" + binary="`desktop_file_to_binary $desktop_file`" + fi + if [ x"$binary" != x"$check" ]; then + echo no + exit_success + fi + else + handler="`get_browser_mime x-scheme-handler/$1`" + binary="`desktop_file_to_binary "$handler"`" if [ x"$binary" != x"$check" ]; then echo no exit_success fi - fi - handler="`get_browser_mime x-scheme-handler/$1`" - binary="`desktop_file_to_binary "$handler"`" - if [ x"$binary" != x"$check" ]; then - echo no - exit_success fi echo yes exit_success
