[xdg-utils] pull in latest upstream fixes
Rex Dieter
rdieter at fedoraproject.org
Sat Sep 20 14:12:23 UTC 2014
commit 9d089546cbd2f3a61db63a19223411fbe2b0f6ba
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Sep 20 09:12:26 2014 -0500
pull in latest upstream fixes
.gitignore | 2 -
0001-mention-xdg-settings.patch | 4 +-
...rovement-of-detecting-KDE-session-BR63157.patch | 4 +-
0003-xdg-terminal-incompatible-.-BR44357.patch | 4 +-
0004-remove-generated-html-files.patch | 4 +-
0005-remove-generated-man-pages.patch | 4 +-
0006-all-re-generate-html-man-too.patch | 4 +-
...-drop-references-to-Value-1.0-key-BR74688.patch | 4 +-
...-open-Remove-first_word-already-in-common.patch | 4 +-
0009-xdg-open-Expand-i-and-c-from-Exec.patch | 4 +-
0010-xdg-open-Support-multiple-groups.patch | 10 ++--
0011-followup-fix-for-prior-commit.patch | 25 +++++++++++
...ils-to-open-web-browser-urls-with-a-query.patch | 42 +++++++++++++++++++
...-open-use-kde-open-noninteractive-BR16295.patch | 38 +++++++++++++++++
...-open-use-kde-open-noninteractive-BR16295.patch | 43 ++++++++++++++++++++
...aver-use-D-Bus-api-instead-of-gnome-scree.patch | 31 ++++++++++++++
0016-xdg-email-do-not-encode-character.patch | 39 ++++++++++++++++++
0017-bump-version-output-to-rc3.patch | 28 +++++++++++++
...ommon-is-broken-xdg-open-uses-bashism-839.patch | 40 ++++++++++++++++++
...s-convert-multi-group-desktop-file-to-XFC.patch | 41 +++++++++++++++++++
...eset-the-IFS-before-interpreting-a-shell-.patch | 27 ++++++++++++
...-open-fixes-63153-keeping-the-path-as-URL.patch | 29 +++++++++++++
...-Changelog-for-recent-contributed-patches.patch | 28 +++++++++++++
xdg-utils.spec | 30 ++++++++------
24 files changed, 451 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c36e69c..cf1bf02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/xdg-utils-1.1.0-20120809git.tar.gz
-/xdg-utils-1.1.0-20131005git.tar.gz
/xdg-utils-1.1.0-rc2.tar.gz
diff --git a/0001-mention-xdg-settings.patch b/0001-mention-xdg-settings.patch
index 3d6a8da..dbcfb66 100644
--- a/0001-mention-xdg-settings.patch
+++ b/0001-mention-xdg-settings.patch
@@ -1,7 +1,7 @@
From a983a14293129ea94b634579a46dc69835e88e15 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 7 Feb 2014 10:31:08 -0600
-Subject: [PATCH 1/9] mention xdg-settings
+Subject: [PATCH 01/22] mention xdg-settings
gleaned from 1.1.0-rc1 release announcement
---
@@ -23,5 +23,5 @@ index 7f84063..484b2b9 100644
Release notes for xdg-utils 1.0.2
=================================
--
-1.9.0
+2.1.0
diff --git a/0002-Improvement-of-detecting-KDE-session-BR63157.patch b/0002-Improvement-of-detecting-KDE-session-BR63157.patch
index 0bade0e..c018f65 100644
--- a/0002-Improvement-of-detecting-KDE-session-BR63157.patch
+++ b/0002-Improvement-of-detecting-KDE-session-BR63157.patch
@@ -1,7 +1,7 @@
From cba39e7a00abe27b3bff49e2d455bb30ad33dde6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 7 Feb 2014 10:51:10 -0600
-Subject: [PATCH 2/9] Improvement of detecting KDE session (BR63157)
+Subject: [PATCH 02/22] Improvement of detecting KDE session (BR63157)
---
ChangeLog | 3 +++
@@ -35,5 +35,5 @@ index 5b50f9b..c365cca 100644
elif [ x"$MATE_DESKTOP_SESSION_ID" != x"" ]; then DE=mate;
elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
--
-1.9.0
+2.1.0
diff --git a/0003-xdg-terminal-incompatible-.-BR44357.patch b/0003-xdg-terminal-incompatible-.-BR44357.patch
index d18aed1..ed95cd8 100644
--- a/0003-xdg-terminal-incompatible-.-BR44357.patch
+++ b/0003-xdg-terminal-incompatible-.-BR44357.patch
@@ -1,7 +1,7 @@
From 495fa68306f6f5b0c0bb312e92f0f2a0e35fa567 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 7 Feb 2014 10:56:17 -0600
-Subject: [PATCH 3/9] xdg-terminal incompatible ... (BR44357)
+Subject: [PATCH 03/22] xdg-terminal incompatible ... (BR44357)
fix harder! put the code in the right place this time.
---
@@ -51,5 +51,5 @@ index 614dacf..21d8309 100644
if [ $? -eq 0 ]; then
--
-1.9.0
+2.1.0
diff --git a/0004-remove-generated-html-files.patch b/0004-remove-generated-html-files.patch
index 13b15be..59508bc 100644
--- a/0004-remove-generated-html-files.patch
+++ b/0004-remove-generated-html-files.patch
@@ -1,7 +1,7 @@
From 3af8eeca3be36c7dfb52a816f5e9cf57c3be1bd5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 7 Feb 2014 12:23:34 -0600
-Subject: [PATCH 4/9] remove generated html files
+Subject: [PATCH 04/22] remove generated html files
---
scripts/html/.gitignore | 9 +
@@ -1103,5 +1103,5 @@ index 380ad2a..0000000
- </pre><p>
- </p></div></div></body></html>
--
-1.9.0
+2.1.0
diff --git a/0005-remove-generated-man-pages.patch b/0005-remove-generated-man-pages.patch
index 850993a..64b7a05 100644
--- a/0005-remove-generated-man-pages.patch
+++ b/0005-remove-generated-man-pages.patch
@@ -1,7 +1,7 @@
From 668c5e140a07a4b739d791caba3232e590a3e26c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 7 Feb 2014 12:25:28 -0600
-Subject: [PATCH 5/9] remove generated man pages
+Subject: [PATCH 05/22] remove generated man pages
---
scripts/man/.gitignore | 8 +
@@ -1935,5 +1935,5 @@ index d02fa2b..0000000
-Copyright \(co 2009-2011
-.br
--
-1.9.0
+2.1.0
diff --git a/0006-all-re-generate-html-man-too.patch b/0006-all-re-generate-html-man-too.patch
index 7f4b6b0..779372a 100644
--- a/0006-all-re-generate-html-man-too.patch
+++ b/0006-all-re-generate-html-man-too.patch
@@ -1,7 +1,7 @@
From 6da906f59933133612d006e1bff9918a2b8c5a60 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 7 Feb 2014 12:31:40 -0600
-Subject: [PATCH 6/9] all: (re)generate html/man too
+Subject: [PATCH 06/22] all: (re)generate html/man too
---
scripts/Makefile.in | 2 +-
@@ -21,5 +21,5 @@ index f93dfd6..9a772bc 100644
html: index.html $(WEBPAGES)
--
-1.9.0
+2.1.0
diff --git a/0007-drop-references-to-Value-1.0-key-BR74688.patch b/0007-drop-references-to-Value-1.0-key-BR74688.patch
index 9e07a6f..1d076cc 100644
--- a/0007-drop-references-to-Value-1.0-key-BR74688.patch
+++ b/0007-drop-references-to-Value-1.0-key-BR74688.patch
@@ -1,7 +1,7 @@
From 50254545a0d2c181bf9bce4c7723044ee7186cb5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 8 Feb 2014 12:39:43 -0600
-Subject: [PATCH 7/9] drop references to Value=1.0 key (BR74688)
+Subject: [PATCH 07/22] drop references to Value=1.0 key (BR74688)
Can't find this decomented anywhere in current fdo specs.
---
@@ -66,5 +66,5 @@ index e7bda35..e3bab7c 100644
<varlistentry>
<term>Type=Directory</term>
--
-1.9.0
+2.1.0
diff --git a/0008-xdg-open-Remove-first_word-already-in-common.patch b/0008-xdg-open-Remove-first_word-already-in-common.patch
index 68b3d52..6a68e45 100644
--- a/0008-xdg-open-Remove-first_word-already-in-common.patch
+++ b/0008-xdg-open-Remove-first_word-already-in-common.patch
@@ -1,7 +1,7 @@
From 3eaf93ab3303e14813885b6b743b48a1c3b5a6ab Mon Sep 17 00:00:00 2001
From: Till Maas <opensource at till.name>
Date: Wed, 26 Feb 2014 15:19:33 +0100
-Subject: [PATCH 8/9] xdg-open: Remove first_word, already in common
+Subject: [PATCH 08/22] xdg-open: Remove first_word, already in common
---
scripts/xdg-open.in | 6 ------
@@ -25,5 +25,5 @@ index 87e161d..1f768d8 100644
{
read first rest
--
-1.9.0
+2.1.0
diff --git a/0009-xdg-open-Expand-i-and-c-from-Exec.patch b/0009-xdg-open-Expand-i-and-c-from-Exec.patch
index 80dbdf1..e2e0263 100644
--- a/0009-xdg-open-Expand-i-and-c-from-Exec.patch
+++ b/0009-xdg-open-Expand-i-and-c-from-Exec.patch
@@ -1,7 +1,7 @@
From 316b9adc05c6d871360afb1195939c5fc975ccff Mon Sep 17 00:00:00 2001
From: Till Maas <opensource at till.name>
Date: Wed, 26 Feb 2014 15:26:59 +0100
-Subject: [PATCH 9/9] xdg-open: Expand %i and %c from Exec
+Subject: [PATCH 09/22] xdg-open: Expand %i and %c from Exec
---
scripts/xdg-open.in | 29 ++++++++++++++++++++++++++---
@@ -57,5 +57,5 @@ index 1f768d8..e7a15a9 100644
if [ -x "$command_exec" ] ; then
if echo "$arguments" | grep -iq '%[fFuU]' ; then
--
-1.9.0
+2.1.0
diff --git a/0010-xdg-open-Support-multiple-groups.patch b/0010-xdg-open-Support-multiple-groups.patch
index dff1c50..ae69007 100644
--- a/0010-xdg-open-Support-multiple-groups.patch
+++ b/0010-xdg-open-Support-multiple-groups.patch
@@ -1,7 +1,7 @@
-From 29b93bdf83712b75be0d6992da4aafa509ab43b7 Mon Sep 17 00:00:00 2001
+From ba265f969b9061d221915c2528122c44a85ad7c2 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource at till.name>
Date: Fri, 11 Apr 2014 18:35:34 +0200
-Subject: [PATCH 10/10] xdg-open: Support multiple groups
+Subject: [PATCH 10/22] xdg-open: Support multiple groups
Desktop files might contain multiple groups. Check for keys only in the
Desktop Entry group.
@@ -10,7 +10,7 @@ Desktop Entry group.
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
-index e7a15a9..35f4b76 100644
+index e7a15a9..b994fa5 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -36,15 +36,36 @@ last_word()
@@ -46,7 +46,7 @@ index e7a15a9..35f4b76 100644
+ # Only match Desktop Entry group
+ if [ -n "${desktop_entry}" ]
+ then
-+ echo "${line}" | grep -E "^${key}=" | cut -d= -f 2-
++ echo "${line}" | grep -E "^${key}=" "${file}" | cut -d= -f 2-
+ fi
+ esac
+ done < "${file}"
@@ -55,5 +55,5 @@ index e7a15a9..35f4b76 100644
open_darwin()
--
-1.8.3.1
+2.1.0
diff --git a/0011-followup-fix-for-prior-commit.patch b/0011-followup-fix-for-prior-commit.patch
new file mode 100644
index 0000000..468ebcc
--- /dev/null
+++ b/0011-followup-fix-for-prior-commit.patch
@@ -0,0 +1,25 @@
+From 69adcfeb4679f75eb24f357f304715d3c014273b Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Tue, 15 Apr 2014 09:17:12 -0500
+Subject: [PATCH 11/22] followup fix for prior commit
+
+---
+ scripts/xdg-open.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index b994fa5..35f4b76 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -61,7 +61,7 @@ get_key()
+ # Only match Desktop Entry group
+ if [ -n "${desktop_entry}" ]
+ then
+- echo "${line}" | grep -E "^${key}=" "${file}" | cut -d= -f 2-
++ echo "${line}" | grep -E "^${key}=" | cut -d= -f 2-
+ fi
+ esac
+ done < "${file}"
+--
+2.1.0
+
diff --git a/0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch b/0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch
new file mode 100644
index 0000000..f00df49
--- /dev/null
+++ b/0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch
@@ -0,0 +1,42 @@
+From 5913207e625a92b73cd9489aea4b7b10bf3eb855 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Sat, 26 Apr 2014 17:20:35 -0500
+Subject: [PATCH 12/22] xdg-open fails to open web browser urls with a query
+ string (BR45857)
+
+---
+ ChangeLog | 3 +++
+ scripts/xdg-open.in | 4 +++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index b7fcf86..f29d9d6 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,8 @@
+ === xdg-utils 1.1.x ===
+
++2014-04-26 Rex Dieter <rdieter at fedoraproject.org>
++ * xdg-open fails to open web browser urls with a query string (BR45857)
++
+ 2014-02-07 Rex Dieter <rdieter at fedoraproject.org>
+ * Improvement of detecting KDE session (BR63157)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 35f4b76..917df2c 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -254,7 +254,9 @@ open_generic()
+ file=${file#file://}
+ file="$(printf "$(echo "$file" | sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1 at g')")"
+ fi
+- check_input_file "$file"
++ file_check=${file%%#*}
++ file_check=${file_check%%\?*}
++ check_input_file "$file_check"
+
+ open_generic_xdg_file_mime "$file"
+
+--
+2.1.0
+
diff --git a/0013-xdg-open-use-kde-open-noninteractive-BR16295.patch b/0013-xdg-open-use-kde-open-noninteractive-BR16295.patch
new file mode 100644
index 0000000..f19d940
--- /dev/null
+++ b/0013-xdg-open-use-kde-open-noninteractive-BR16295.patch
@@ -0,0 +1,38 @@
+From 869b22b75fc6e7c9e29ba5367bd97ebf7ce76cb3 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Sat, 26 Apr 2014 17:28:50 -0500
+Subject: [PATCH 13/22] xdg-open: use 'kde-open --noninteractive' (BR16295)
+
+---
+ ChangeLog | 1 +
+ scripts/xdg-open.in | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index f29d9d6..cb7cf65 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -2,6 +2,7 @@
+
+ 2014-04-26 Rex Dieter <rdieter at fedoraproject.org>
+ * xdg-open fails to open web browser urls with a query string (BR45857)
++ * xdg-open: use 'kde-open --noninteractive' (BR16295)
+
+ 2014-02-07 Rex Dieter <rdieter at fedoraproject.org>
+ * Improvement of detecting KDE session (BR63157)
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 917df2c..637a762 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -82,7 +82,7 @@ open_darwin()
+ open_kde()
+ {
+ if kde-open -v 2>/dev/null 1>&2; then
+- kde-open "$1"
++ kde-open --noninteractive "$1"
+ else
+ if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
+ kfmclient openURL "$1"
+--
+2.1.0
+
diff --git a/0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch b/0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch
new file mode 100644
index 0000000..0889f59
--- /dev/null
+++ b/0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch
@@ -0,0 +1,43 @@
+From 8369f878c08b435ecd5523b4c49eff36348c4bae Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Mon, 30 Jun 2014 07:54:50 -0500
+Subject: [PATCH 14/22] Revert "xdg-open: use 'kde-open --noninteractive'
+ (BR16295)"
+
+This reverts commit 869b22b75fc6e7c9e29ba5367bd97ebf7ce76cb3.
+
+kde-open --noninteractive is still crashy :(
+https://bugs.kde.org/show_bug.cgi?id=336117
+---
+ ChangeLog | 1 -
+ scripts/xdg-open.in | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index cb7cf65..f29d9d6 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -2,7 +2,6 @@
+
+ 2014-04-26 Rex Dieter <rdieter at fedoraproject.org>
+ * xdg-open fails to open web browser urls with a query string (BR45857)
+- * xdg-open: use 'kde-open --noninteractive' (BR16295)
+
+ 2014-02-07 Rex Dieter <rdieter at fedoraproject.org>
+ * Improvement of detecting KDE session (BR63157)
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 637a762..917df2c 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -82,7 +82,7 @@ open_darwin()
+ open_kde()
+ {
+ if kde-open -v 2>/dev/null 1>&2; then
+- kde-open --noninteractive "$1"
++ kde-open "$1"
+ else
+ if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
+ kfmclient openURL "$1"
+--
+2.1.0
+
diff --git a/0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch b/0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch
new file mode 100644
index 0000000..e8dedf9
--- /dev/null
+++ b/0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch
@@ -0,0 +1,31 @@
+From 34e033845ea6997bc4fdafd9bdd4856bfa5d0d36 Mon Sep 17 00:00:00 2001
+From: Frederic Crozat <fcrozat at suse.com>
+Date: Mon, 30 Jun 2014 17:31:46 +0200
+Subject: [PATCH 15/22] xdg-screensaver: use D-Bus api instead of
+ gnome-screensaver call.
+
+---
+ scripts/xdg-screensaver.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
+index b05ab2c..8315f6a 100644
+--- a/scripts/xdg-screensaver.in
++++ b/scripts/xdg-screensaver.in
+@@ -466,7 +466,12 @@ screensaver_gnome_screensaver()
+ ;;
+
+ lock)
+- gnome-screensaver-command --lock > /dev/null 2> /dev/null
++ dbus-send --session \
++ --dest=org.gnome.ScreenSaver \
++ --type=method_call \
++ /org/gnome/ScreenSaver \
++ org.gnome.ScreenSaver.Lock \
++ 2> /dev/null
+ result=$?
+ ;;
+
+--
+2.1.0
+
diff --git a/0016-xdg-email-do-not-encode-character.patch b/0016-xdg-email-do-not-encode-character.patch
new file mode 100644
index 0000000..1a08a94
--- /dev/null
+++ b/0016-xdg-email-do-not-encode-character.patch
@@ -0,0 +1,39 @@
+From 7cd846d62e17f36be2f7d29e56188ddf6a6d72cb Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Mon, 25 Aug 2014 07:31:15 -0500
+Subject: [PATCH 16/22] xdg-email: do not encode - character
+
+---
+ ChangeLog | 3 +++
+ scripts/xdg-email.in | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index f29d9d6..2554692 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,8 @@
+ === xdg-utils 1.1.x ===
+
++2014-08-25 Rex Dieter <rdieter at fedoraproject.org>
++ * xdg-email: do not encode - character
++
+ 2014-04-26 Rex Dieter <rdieter at fedoraproject.org>
+ * xdg-open fails to open web browser urls with a query string (BR45857)
+
+diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
+index 4c3cb83..54de71f 100644
+--- a/scripts/xdg-email.in
++++ b/scripts/xdg-email.in
+@@ -226,7 +226,7 @@ result=$(echo "$str" | awk '
+ c = substr ($0, i, 1)
+ if ( ord [c] > 127 ) {
+ e = e "%" sprintf("%02X", ord [c])
+- } else if ( c ~ /[@a-zA-Z0-9.-\\\/]/ ) {
++ } else if ( c ~ /[@a-zA-Z0-9.\-\\\/]/ ) {
+ e = e c
+ } else {
+ e = e "%" sprintf("%02X", ord [c])
+--
+2.1.0
+
diff --git a/0017-bump-version-output-to-rc3.patch b/0017-bump-version-output-to-rc3.patch
new file mode 100644
index 0000000..41fc4bb
--- /dev/null
+++ b/0017-bump-version-output-to-rc3.patch
@@ -0,0 +1,28 @@
+From 781023ef997bac433dbc258bd5cfdc1366f2ffa4 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Wed, 27 Aug 2014 15:35:16 -0500
+Subject: [PATCH 17/22] bump --version output to rc3
+
+missed the ball for rc2
+---
+ scripts/xdg-utils-common.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
+index c365cca..37c4082 100644
+--- a/scripts/xdg-utils-common.in
++++ b/scripts/xdg-utils-common.in
+@@ -226,8 +226,8 @@ check_common_commands()
+ exit_success
+ ;;
+
+- --version)
+- echo "@NAME@ 1.1.0 rc1"
++ t --version)
++ echo "@NAME@ 1.1.0 rc3"
+ exit_success
+ ;;
+ esac
+--
+2.1.0
+
diff --git a/0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch b/0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch
new file mode 100644
index 0000000..8a74273
--- /dev/null
+++ b/0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch
@@ -0,0 +1,40 @@
+From 48545132620f85d3ba133010116884a63f26f3a3 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Wed, 17 Sep 2014 06:31:40 -0500
+Subject: [PATCH 18/22] xdg-utils-common is broken, xdg-open uses bashism
+ (#83979)
+
+---
+ scripts/xdg-open.in | 2 +-
+ scripts/xdg-utils-common.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 917df2c..244f214 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -54,7 +54,7 @@ get_key()
+ desktop_entry="y"
+ ;;
+ # Reset match flag for other groups
+- [*)
++ "["*)
+ desktop_entry=""
+ ;;
+ *)
+diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
+index 37c4082..2c8fa46 100644
+--- a/scripts/xdg-utils-common.in
++++ b/scripts/xdg-utils-common.in
+@@ -226,7 +226,7 @@ check_common_commands()
+ exit_success
+ ;;
+
+- t --version)
++ --version)
+ echo "@NAME@ 1.1.0 rc3"
+ exit_success
+ ;;
+--
+2.1.0
+
diff --git a/0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch b/0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch
new file mode 100644
index 0000000..4b7351f
--- /dev/null
+++ b/0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch
@@ -0,0 +1,41 @@
+From 190448845baaccf68154e7d03392c74cbe163505 Mon Sep 17 00:00:00 2001
+From: Ken Neighbors <ken at nsds.com>
+Date: Fri, 19 Sep 2014 09:29:49 -0700
+Subject: [PATCH 19/22] xdg-settings: convert multi-group desktop file to XFCE
+ WebBrowser helper file
+
+When generating an XFCE helper file for the default WebBrowser, the
+XFCE keys cannot always simply be appended to the end of the file, but
+must be placed in the first group under "[Desktop Entry]". (A desktop
+file can contain additional group headers, such as
+"X-Ayatana-Desktop-Shortcuts" groups.)
+---
+ scripts/xdg-settings.in | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in
+index eaed991..460ffc9 100644
+--- a/scripts/xdg-settings.in
++++ b/scripts/xdg-settings.in
+@@ -407,13 +407,15 @@ check_xfce_desktop_file()
+ # Found a file to convert.
+ target="${XDG_DATA_HOME:-$HOME/.local/share}/xfce4/helpers"
+ mkdir -p "$target"
+- grep -v "^Type=" "$file" > "$target/$1"
+- echo "Type=X-XFCE-Helper" >> "$target/$1"
++ # Copy file up to first "Exec=" line.
++ sed -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$d' "$file" > "$target/$1"
+ echo "X-XFCE-Category=WebBrowser" >> "$target/$1"
+ # Change %F, %f, %U, and %u to "%s".
+- command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g'`"
++ command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g' | head -1`"
+ echo "X-XFCE-Commands=`echo "$command" | first_word`" >> "$target/$1"
+ echo "X-XFCE-CommandsWithParameter=$command" >> "$target/$1"
++ # Copy rest of file (from first "Exec=" line to end-of-file).
++ sed -n -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$p' "$file" >> "$target/$1"
+ return
+ fi
+ done
+--
+2.1.0
+
diff --git a/0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch b/0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch
new file mode 100644
index 0000000..eb48f24
--- /dev/null
+++ b/0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch
@@ -0,0 +1,27 @@
+From 0c465c119130c2739e3086b7d3573313cb19233a Mon Sep 17 00:00:00 2001
+From: Jehan <jehan at girinstud.io>
+Date: Tue, 15 Jul 2014 16:42:27 +0000
+Subject: [PATCH 20/22] xdg-email: reset the IFS before interpreting a shell
+ command.
+
+---
+ scripts/xdg-email.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
+index 54de71f..e68425c 100644
+--- a/scripts/xdg-email.in
++++ b/scripts/xdg-email.in
+@@ -207,6 +207,9 @@ open_generic()
+
+ url_encode()
+ {
++# The shell needs the default internal field separator
++# otherwise it would search for $utf8 as a command in whole.
++IFS=" "
+ str=$(echo "$1" | $utf8)
+ local ORIG_LANG="$LANG"
+ local ORIG_LC_ALL="$LC_ALL"
+--
+2.1.0
+
diff --git a/0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch b/0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch
new file mode 100644
index 0000000..dd9101e
--- /dev/null
+++ b/0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch
@@ -0,0 +1,29 @@
+From d6e0924bdf917d118dba993534cc3f335ab0a160 Mon Sep 17 00:00:00 2001
+From: David Costa <david.costa at ieee.org>
+Date: Tue, 24 Jun 2014 20:01:07 +0200
+Subject: [PATCH 21/22] xdg-open: fixes #63153 keeping the path as URL
+
+---
+ scripts/xdg-open.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 244f214..cc2fc9c 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -306,10 +306,10 @@ open_lxde()
+ if (echo "$1" | grep -q '^file://' ||
+ ! echo "$1" | egrep -q '^[[:alpha:]+\.\-]+:')
+ then
+- local file="$(echo "$1" | sed 's%^file://%%')"
++ local file="$1"
+
+ # handle relative paths
+- if ! echo "$file" | grep -q '^/'; then
++ if ! echo "$file" | egrep -q '^(file://)?/'; then
+ file="$(pwd)/$file"
+ fi
+
+--
+2.1.0
+
diff --git a/0022-update-Changelog-for-recent-contributed-patches.patch b/0022-update-Changelog-for-recent-contributed-patches.patch
new file mode 100644
index 0000000..98f81fe
--- /dev/null
+++ b/0022-update-Changelog-for-recent-contributed-patches.patch
@@ -0,0 +1,28 @@
+From 6b0f4390ab468c142ab51fd0851c64efeb996ff0 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Fri, 19 Sep 2014 13:07:11 -0500
+Subject: [PATCH 22/22] update Changelog for recent contributed patches
+
+---
+ ChangeLog | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 2554692..f90ba4e 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,4 +1,11 @@
+ === xdg-utils 1.1.x ===
++2014-09-19 Rex Dieter <rdieter at fedoraproject.org>
++ * XFCE .desktop file created for browser selection is broken (BR56092)
++ * Unnecessary filtering file:// for pcmanfm (BR63153)
++ * fails if user sets a custom IFS environment variable (BR81386)
++
++2014-09-17 Rex Dieter <rdieter at fedoraproject.org>
++ * xdg-utils-common is broken, xdg-open uses bashism (BR83979)
+
+ 2014-08-25 Rex Dieter <rdieter at fedoraproject.org>
+ * xdg-email: do not encode - character
+--
+2.1.0
+
diff --git a/xdg-utils.spec b/xdg-utils.spec
index 0086b2c..9c76432 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -4,7 +4,7 @@
Summary: Basic desktop integration functions
Name: xdg-utils
Version: 1.1.0
-Release: 0.25.%{pre}%{?dist}
+Release: 0.26.%{pre}%{?dist}
URL: http://portland.freedesktop.org/
%if 0%{?pre:1}
@@ -27,6 +27,18 @@ Patch107: 0007-drop-references-to-Value-1.0-key-BR74688.patch
Patch108: 0008-xdg-open-Remove-first_word-already-in-common.patch
Patch109: 0009-xdg-open-Expand-i-and-c-from-Exec.patch
Patch110: 0010-xdg-open-Support-multiple-groups.patch
+Patch111: 0011-followup-fix-for-prior-commit.patch
+Patch112: 0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch
+Patch113: 0013-xdg-open-use-kde-open-noninteractive-BR16295.patch
+Patch114: 0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch
+Patch115: 0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch
+Patch116: 0016-xdg-email-do-not-encode-character.patch
+Patch117: 0017-bump-version-output-to-rc3.patch
+Patch118: 0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch
+Patch119: 0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch
+Patch120: 0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch
+Patch121: 0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch
+Patch122: 0022-update-Changelog-for-recent-contributed-patches.patch
BuildRequires: gawk
BuildRequires: xmlto text-www-browser
@@ -59,18 +71,7 @@ The following scripts are provided at this time:
%prep
-%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
-
-%patch101 -p1 -b .0001
-%patch102 -p1 -b .0002
-%patch103 -p1 -b .0003
-%patch104 -p1 -b .0004
-%patch105 -p1 -b .0005
-%patch106 -p1 -b .0006
-%patch107 -p1 -b .0007
-%patch108 -p1 -b .0008
-%patch109 -p1 -b .0009
-%patch110 -p1 -b .0010
+%autosetup -n %{name}-%{version}%{?pre:-%{pre}} -p1
%build
@@ -108,6 +109,9 @@ make install DESTDIR=%{buildroot}
%changelog
+* Sat Sep 20 2014 Rex Dieter <rdieter at fedoraproject.org> 1.1.0-0.26.rc2
+- pull in latest upstream fixes
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-0.25.rc2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list