Date: Thursday, February 26, 2015 @ 16:21:08
Author: foutrelis
Revision: 232001
upgpkg: exo 0.10.2-3
Fix FS#43958: exo-open no longer works with Firefox 36
Added:
exo/trunk/0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch
exo/trunk/0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch
Modified:
exo/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch | 58 +++
0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch | 188
++++++++++
PKGBUILD | 14
3 files changed, 257 insertions(+), 3 deletions(-)
Added: 0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch
===================================================================
--- 0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch
(rev 0)
+++ 0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch 2015-02-26
15:21:08 UTC (rev 232001)
@@ -0,0 +1,58 @@
+From e3f8846f06a9bd3aa43a1662ab8e682e8866ea13 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evange...@foutrelis.com>
+Date: Thu, 26 Feb 2015 14:25:31 +0200
+Subject: [PATCH] Drop use of the -remote option in Firefox helpers
+
+The -remote option was removed in Firefox 36.
+
+Affected helpers: Firefox, Iceweasel, IceCat.
+
+The Mozilla Browser and Netscape Navigator helpers are left alone
+since the respective browsers are no longer actively developed.
+
+https://bugzilla.xfce.org/show_bug.cgi?id=11601
+---
+ exo-helper/helpers/firefox.desktop.in.in | 4 ++--
+ exo-helper/helpers/icecat.desktop.in.in | 4 ++--
+ exo-helper/helpers/iceweasel.desktop.in.in | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/exo-helper/helpers/firefox.desktop.in.in
b/exo-helper/helpers/firefox.desktop.in.in
+index 9ed8104..c235a69 100644
+--- a/exo-helper/helpers/firefox.desktop.in.in
++++ b/exo-helper/helpers/firefox.desktop.in.in
+@@ -6,5 +6,5 @@ _Name=Mozilla Firefox
+ StartupNotify=false
+ X-XFCE-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox;
+ X-XFCE-Category=WebBrowser
+-X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
+-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B "%s";
++X-XFCE-Commands=%B;
++X-XFCE-CommandsWithParameter=%B "%s";
+diff --git a/exo-helper/helpers/icecat.desktop.in.in
b/exo-helper/helpers/icecat.desktop.in.in
+index cb635f5..5a15ff2 100644
+--- a/exo-helper/helpers/icecat.desktop.in.in
++++ b/exo-helper/helpers/icecat.desktop.in.in
+@@ -6,5 +6,5 @@ _Name=Icecat
+ StartupNotify=false
+ X-XFCE-Binaries=icecat;icecat-gtk2;icecat-gtk;
+ X-XFCE-Category=WebBrowser
+-X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
+-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B "%s";
++X-XFCE-Commands=%B;
++X-XFCE-CommandsWithParameter=%B "%s";
+diff --git a/exo-helper/helpers/iceweasel.desktop.in.in
b/exo-helper/helpers/iceweasel.desktop.in.in
+index 6fb6be8..99d9eca 100644
+--- a/exo-helper/helpers/iceweasel.desktop.in.in
++++ b/exo-helper/helpers/iceweasel.desktop.in.in
+@@ -6,5 +6,5 @@ _Name=Iceweasel
+ StartupNotify=false
+ X-XFCE-Binaries=iceweasel;iceweasel-gtk2;iceweasel-gtk;
+ X-XFCE-Category=WebBrowser
+-X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
+-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B "%s";
++X-XFCE-Commands=%B;
++X-XFCE-CommandsWithParameter=%B "%s";
+--
+2.3.1
+
Added: 0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch
===================================================================
--- 0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch
(rev 0)
+++ 0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch
2015-02-26 15:21:08 UTC (rev 232001)
@@ -0,0 +1,188 @@
+From 8cd3233f1d2312670444a202f79d55b98286aa4f Mon Sep 17 00:00:00 2001
+From: Sean Davis <smd.seanda...@gmail.com>
+Date: Mon, 16 Feb 2015 17:04:07 -0500
+Subject: [PATCH] Wrap URIs with quotes in exo-helpers to better handle
+ filenames with spaces (bug 10731)
+
+---
+ exo-helper/helpers/aterm.desktop.in.in | 2 +-
+ exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in | 2 +-
+ exo-helper/helpers/firefox.desktop.in.in | 2 +-
+ exo-helper/helpers/gnome-terminal.desktop.in.in | 2 +-
+ exo-helper/helpers/icecat.desktop.in.in | 2 +-
+ exo-helper/helpers/iceweasel.desktop.in.in | 2 +-
+ exo-helper/helpers/links.desktop.in.in | 2 +-
+ exo-helper/helpers/lynx.desktop.in.in | 2 +-
+ exo-helper/helpers/mozilla-browser.desktop.in.in | 2 +-
+ exo-helper/helpers/netscape-navigator.desktop.in.in | 2 +-
+ exo-helper/helpers/nxterm.desktop.in.in | 2 +-
+ exo-helper/helpers/sakura.desktop.in.in | 2 +-
+ exo-helper/helpers/urxvt.desktop.in.in | 2 +-
+ exo-helper/helpers/w3m.desktop.in.in | 2 +-
+ exo-helper/helpers/xfce4-terminal.desktop.in.in | 2 +-
+ exo-helper/helpers/xterm.desktop.in.in | 2 +-
+ 16 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/exo-helper/helpers/aterm.desktop.in.in
b/exo-helper/helpers/aterm.desktop.in.in
+index bbe06fc..0eeb5ab 100644
+--- a/exo-helper/helpers/aterm.desktop.in.in
++++ b/exo-helper/helpers/aterm.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=aterm;
+ X-XFCE-Category=TerminalEmulator
+ X-XFCE-Commands=%B;
+-X-XFCE-CommandsWithParameter=%B -e %s;
++X-XFCE-CommandsWithParameter=%B -e "%s";
+diff --git a/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in
b/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in
+index b4de7ee..a4d2cd1 100644
+--- a/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in
++++ b/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=x-terminal-emulator;
+ X-XFCE-Category=TerminalEmulator
+ X-XFCE-Commands=%B;
+-X-XFCE-CommandsWithParameter=%B -e %s;
++X-XFCE-CommandsWithParameter=%B -e "%s";
+diff --git a/exo-helper/helpers/firefox.desktop.in.in
b/exo-helper/helpers/firefox.desktop.in.in
+index e89684b..9ed8104 100644
+--- a/exo-helper/helpers/firefox.desktop.in.in
++++ b/exo-helper/helpers/firefox.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox;
+ X-XFCE-Category=WebBrowser
+ X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
+-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B %s;
++X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B "%s";
+diff --git a/exo-helper/helpers/gnome-terminal.desktop.in.in
b/exo-helper/helpers/gnome-terminal.desktop.in.in
+index bb31360..f6af417 100644
+--- a/exo-helper/helpers/gnome-terminal.desktop.in.in
++++ b/exo-helper/helpers/gnome-terminal.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=true
+ X-XFCE-Binaries=gnome-terminal;gnometerminal;
+ X-XFCE-Category=TerminalEmulator
+ X-XFCE-Commands=%B;
+-X-XFCE-CommandsWithParameter=%B -x %s;
++X-XFCE-CommandsWithParameter=%B -x "%s";
+diff --git a/exo-helper/helpers/icecat.desktop.in.in
b/exo-helper/helpers/icecat.desktop.in.in
+index fb4ea37..cb635f5 100644
+--- a/exo-helper/helpers/icecat.desktop.in.in
++++ b/exo-helper/helpers/icecat.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=icecat;icecat-gtk2;icecat-gtk;
+ X-XFCE-Category=WebBrowser
+ X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
+-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B %s;
++X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B "%s";
+diff --git a/exo-helper/helpers/iceweasel.desktop.in.in
b/exo-helper/helpers/iceweasel.desktop.in.in
+index bb3d5fe..6fb6be8 100644
+--- a/exo-helper/helpers/iceweasel.desktop.in.in
++++ b/exo-helper/helpers/iceweasel.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=iceweasel;iceweasel-gtk2;iceweasel-gtk;
+ X-XFCE-Category=WebBrowser
+ X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
+-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B %s;
++X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B "%s";
+diff --git a/exo-helper/helpers/links.desktop.in.in
b/exo-helper/helpers/links.desktop.in.in
+index 66dd4c7..35b41a8 100644
+--- a/exo-helper/helpers/links.desktop.in.in
++++ b/exo-helper/helpers/links.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=links;links-current;
+ X-XFCE-Category=WebBrowser
+ X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
+-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s;
++X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B "%s";
+diff --git a/exo-helper/helpers/lynx.desktop.in.in
b/exo-helper/helpers/lynx.desktop.in.in
+index 759e67e..ffca6f5 100644
+--- a/exo-helper/helpers/lynx.desktop.in.in
++++ b/exo-helper/helpers/lynx.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=lynx;lynx-current;
+ X-XFCE-Category=WebBrowser
+ X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
+-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s;
++X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B "%s";
+diff --git a/exo-helper/helpers/mozilla-browser.desktop.in.in
b/exo-helper/helpers/mozilla-browser.desktop.in.in
+index 76d3e54..7f0fb11 100644
+--- a/exo-helper/helpers/mozilla-browser.desktop.in.in
++++ b/exo-helper/helpers/mozilla-browser.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
+ X-XFCE-Category=WebBrowser
+ X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
+-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B %s;
++X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B "%s";
+diff --git a/exo-helper/helpers/netscape-navigator.desktop.in.in
b/exo-helper/helpers/netscape-navigator.desktop.in.in
+index c874459..0dde8e6 100644
+--- a/exo-helper/helpers/netscape-navigator.desktop.in.in
++++ b/exo-helper/helpers/netscape-navigator.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=netscape;
+ X-XFCE-Category=WebBrowser
+ X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
+-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B %s;
++X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B "%s";
+diff --git a/exo-helper/helpers/nxterm.desktop.in.in
b/exo-helper/helpers/nxterm.desktop.in.in
+index 9dbd157..b095f5c 100644
+--- a/exo-helper/helpers/nxterm.desktop.in.in
++++ b/exo-helper/helpers/nxterm.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=nxterm;
+ X-XFCE-Category=TerminalEmulator
+ X-XFCE-Commands=%B;
+-X-XFCE-CommandsWithParameter=%B -e %s;
++X-XFCE-CommandsWithParameter=%B -e "%s";
+diff --git a/exo-helper/helpers/sakura.desktop.in.in
b/exo-helper/helpers/sakura.desktop.in.in
+index af8b1d9..dd3ca0c 100644
+--- a/exo-helper/helpers/sakura.desktop.in.in
++++ b/exo-helper/helpers/sakura.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=sakura;
+ X-XFCE-Category=TerminalEmulator
+ X-XFCE-Commands=%B;
+-X-XFCE-CommandsWithParameter=%B -x %s;
++X-XFCE-CommandsWithParameter=%B -x "%s";
+diff --git a/exo-helper/helpers/urxvt.desktop.in.in
b/exo-helper/helpers/urxvt.desktop.in.in
+index d442e42..b90217a 100644
+--- a/exo-helper/helpers/urxvt.desktop.in.in
++++ b/exo-helper/helpers/urxvt.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=urxvt;
+ X-XFCE-Category=TerminalEmulator
+ X-XFCE-Commands=%B;
+-X-XFCE-CommandsWithParameter=%B -e %s;
++X-XFCE-CommandsWithParameter=%B -e "%s";
+diff --git a/exo-helper/helpers/w3m.desktop.in.in
b/exo-helper/helpers/w3m.desktop.in.in
+index cc5af29..bccaffe 100644
+--- a/exo-helper/helpers/w3m.desktop.in.in
++++ b/exo-helper/helpers/w3m.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=w3m;
+ X-XFCE-Category=WebBrowser
+ X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
+-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s;
++X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B "%s";
+diff --git a/exo-helper/helpers/xfce4-terminal.desktop.in.in
b/exo-helper/helpers/xfce4-terminal.desktop.in.in
+index 1b10ee0..a9444cd 100644
+--- a/exo-helper/helpers/xfce4-terminal.desktop.in.in
++++ b/exo-helper/helpers/xfce4-terminal.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=true
+ X-XFCE-Binaries=xfce4-terminal;Terminal;xterminal;
+ X-XFCE-Category=TerminalEmulator
+ X-XFCE-Commands=%B;
+-X-XFCE-CommandsWithParameter=%B -x %s;
++X-XFCE-CommandsWithParameter=%B -x "%s";
+diff --git a/exo-helper/helpers/xterm.desktop.in.in
b/exo-helper/helpers/xterm.desktop.in.in
+index b2bc89c..3697935 100644
+--- a/exo-helper/helpers/xterm.desktop.in.in
++++ b/exo-helper/helpers/xterm.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=xterm;
+ X-XFCE-Category=TerminalEmulator
+ X-XFCE-Commands=%B;
+-X-XFCE-CommandsWithParameter=%B -e %s;
++X-XFCE-CommandsWithParameter=%B -e "%s";
+--
+2.3.1
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-02-26 13:57:46 UTC (rev 232000)
+++ PKGBUILD 2015-02-26 15:21:08 UTC (rev 232001)
@@ -5,7 +5,7 @@
pkgname=exo
pkgver=0.10.2
-pkgrel=2
+pkgrel=3
pkgdesc="Extensions to Xfce by os-cillation"
arch=('i686' 'x86_64')
url="http://www.xfce.org/";
@@ -16,9 +16,13 @@
optdepends=('perl-uri: for mail-compose helper script')
install=$pkgname.install
source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2
- 0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch)
+ 0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch
+ 0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch
+ 0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch)
sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce'
- 'f3a92ea399c5786845d3c3a9d74a427299ecd5ed7e5ef2ac1cf636492050e247')
+ 'f3a92ea399c5786845d3c3a9d74a427299ecd5ed7e5ef2ac1cf636492050e247'
+ '7d73621d9a94609490b207d2229609997443a9850d7db56394125f1fed533cac'
+ '9ef87f55e7d3cb1e0bc38797683063f571021d32319db8b69237a5105d8206c3')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -25,6 +29,10 @@
# https://bugzilla.xfce.org/show_bug.cgi?id=10098
patch -Np1 -i "$srcdir/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=11601
+ patch -Np1 -i
"$srcdir/0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch"
+ patch -Np1 -i
"$srcdir/0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch"
}
build() {
