← Back to branch summary

~ubuntu-branches/ubuntu/wily/xdg-utils/wily

« back to all changes in this revision

Viewing changes to debian/patches/xdg-open-printf.diff

  • Committer: Package Import Robot
  • Author(s): Sean Davis
  • Date: 2015-09-13 12:39:10 UTC
  • mfrom: (13.1.13 sid)
  • Revision ID: package-import@ubuntu.com-20150913123910-uba8c1sph2iwnqlr
Tags: 1.1.0~rc3+git20150907-1ubuntu1
https://launchpad.net/bugs/1495273
https://launchpad.net/bugs/670128
https://launchpad.net/bugs/779156
https://launchpad.net/bugs/1363540
https://launchpad.net/bugs/1454833
https://launchpad.net/bugs/1388922
https://launchpad.net/bugs/1330386
https://launchpad.net/bugs/996304
https://launchpad.net/bugs/396162
* Merge from Debian unstable.  Remaining changes: (LP: #1495273)
  - debian/patches:
    * gnome-3.0.diff: Correctly open preferred browser with 
      gnome-open (LP: #670128)
    * lp779156-lubuntu.diff: Add open_lxde and run_sylpheed function
      for improved LXDE and sylpheed support (LP: #779156)
    * xdg-screensaver-restore-timeout.diff: restore previous X11 
      screensaver timeout when xdg-screensaver resume is used (LP: #1363540)
* New upstream release fixes the following bugs:
  - xdg-mime query filetype does not work on KDE 5 (LP: #1454833)
  - xdg-open doesn't properly detect Xfce/Xubuntu (LP: #1388922)
  - xserver-blanking patch in Ubuntu duplicates code (LP: #1330386)
  - Typo in manpage of 'xdg-icon-resource' (LP: #996304)
  - xdg-open (to gnome-open) fails to launch file:// URL with query string 
    (LP: #396162)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/xdg-open-printf.diff
3
3
Author: Per Olofsson <pelle@debian.org>
4
4
Bug: http://bugs.debian.org/613272
5
5
 
6
 
--- a/scripts/xdg-open
7
 
+++ b/scripts/xdg-open
8
 
@@ -420,7 +420,11 @@ open_generic()
 
6
--- a/scripts/xdg-open.in
 
7
+++ b/scripts/xdg-open.in
 
8
@@ -281,7 +281,11 @@ open_generic()
9
9
         # Decode URLs
10
10
         if echo "$file" | grep -q '^file:///'; then
11
11
             file=${file#file://}
16
16
+            fi
17
17
+            file="$($printf "$(echo "$file" | sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1@g')")"
18
18
         fi
19
 
         check_input_file "$file"
20
 
 
 
19
         file_check=${file%%#*}
 
20
         file_check=${file_check%%\?*}