[arch-commits] Commit in exo/trunk (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun Mar 1 06:21:13 UTC 2015
Date: Sunday, March 1, 2015 @ 07:21:13
Author: foutrelis
Revision: 232145
upgpkg: exo 0.10.3-1
New upstream release.
Modified:
exo/trunk/PKGBUILD
Deleted:
exo/trunk/0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch
exo/trunk/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch
exo/trunk/0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch
-----------------------------------------------------------------+
0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch | 58 ---
0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch | 53 --
0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch | 188 ----------
PKGBUILD | 25 -
4 files changed, 4 insertions(+), 320 deletions(-)
Deleted: 0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch
===================================================================
--- 0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch 2015-03-01 06:16:20 UTC (rev 232144)
+++ 0001-Drop-use-of-the-remote-option-in-Firefox-helpers.patch 2015-03-01 06:21:13 UTC (rev 232145)
@@ -1,58 +0,0 @@
-From e3f8846f06a9bd3aa43a1662ab8e682e8866ea13 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at 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
-
Deleted: 0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch
===================================================================
--- 0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch 2015-03-01 06:16:20 UTC (rev 232144)
+++ 0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch 2015-03-01 06:21:13 UTC (rev 232145)
@@ -1,53 +0,0 @@
-From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001
-From: Felipe Contreras <felipe.contreras at gmail.com>
-Date: Sat, 18 May 2013 22:50:01 -0500
-Subject: [PATCH] Fix exo_str_looks_like_an_uri() (bug #10098).
-
-Commit d11199b (Check if uris also contain a slash (bug #9244)) tried to
-fix a hang in thunar by properly recognizing that 'http:' is not an URI,
-however, while doing so, it broke proper URIs like 'magnet:foo'.
-
-As the RFC clearly states:
-
- The following are two example URIs and their component parts:
-
- foo://example.com:8042/over/there?name=ferret#nose
- \_/ \______________/\_________/ \_________/ \__/
- | | | | |
- scheme authority path query fragment
- | _____________________|__
- / \ / \
- urn:example:animal:ferret:nose
-
-But even with this succinct example exo_str_looks_like_an_uri() fails.
-
-There is an easy solution; fail only when component part is missing
-('urn:'), but succeed otherwise.
-
-This solution fixes 'magnet:foo', and doesn't break the current
-expectation from thunar that 'http:' should fail, having the best of
-both worlds.
-
-[1] http://www.ietf.org/rfc/rfc3986.txt
-
-Signed-off-by: Felipe Contreras <felipe.contreras at gmail.com>
----
- exo/exo-string.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/exo/exo-string.c b/exo/exo-string.c
-index 33f86f9..056b36a 100644
---- a/exo/exo-string.c
-+++ b/exo/exo-string.c
-@@ -429,7 +429,7 @@ exo_str_looks_like_an_uri (const gchar *str)
- for (++s; g_ascii_isalnum (*s) || *s == '+' || *s == '-' || *s == '.'; ++s);
-
- /* <scheme> must be followed by ":" */
-- return (*s == ':' && *(s+1) == '/');
-+ return (*s == ':' && *(s+1) != '\0');
- }
-
- return FALSE;
---
-1.8.4.2
-
Deleted: 0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch
===================================================================
--- 0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch 2015-03-01 06:16:20 UTC (rev 232144)
+++ 0001-Wrap-URIs-with-quotes-in-exo-helpers-to-better-handl.patch 2015-03-01 06:21:13 UTC (rev 232145)
@@ -1,188 +0,0 @@
-From 8cd3233f1d2312670444a202f79d55b98286aa4f Mon Sep 17 00:00:00 2001
-From: Sean Davis <smd.seandavis at 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-03-01 06:16:20 UTC (rev 232144)
+++ PKGBUILD 2015-03-01 06:21:13 UTC (rev 232145)
@@ -4,8 +4,8 @@
# Contributor: Aurelien Foret <orelien at chez.com>
pkgname=exo
-pkgver=0.10.2
-pkgrel=3
+pkgver=0.10.3
+pkgrel=1
pkgdesc="Extensions to Xfce by os-cillation"
arch=('i686' 'x86_64')
url="http://www.xfce.org/"
@@ -15,26 +15,9 @@
makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
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-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'
- '7d73621d9a94609490b207d2229609997443a9850d7db56394125f1fed533cac'
- '9ef87f55e7d3cb1e0bc38797683063f571021d32319db8b69237a5105d8206c3')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('95704b14ef9065268c3aa9a7c0bacbe0ddb490a183a4f5ab13bba4a1722826bd')
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # 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() {
cd "$srcdir/$pkgname-$pkgver"
More information about the arch-commits
mailing list