[arch-commits] Commit in exo/trunk (2 files)

Evangelos Foutras foutrelis at archlinux.org
Sun Mar 1 19:43:46 UTC 2015 

    Date: Sunday, March 1, 2015 @ 20:43:45
  Author: foutrelis
Revision: 232394

upgpkg: exo 0.10.3-2

Don't quote arguments passed to terminal emulators (xfce bug #10731).

Added:
  exo/trunk/0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch
Modified:
  exo/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch |  116 ++++++++++
 PKGBUILD                                                        |   18 +
 2 files changed, 128 insertions(+), 6 deletions(-)

Added: 0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch
===================================================================
--- 0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch	                        (rev 0)
+++ 0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch	2015-03-01 19:43:45 UTC (rev 232394)
@@ -0,0 +1,116 @@
+From 23b17d5c622a8f496ebfdd011149722ecd6b8ebe Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Sun, 1 Mar 2015 21:14:25 +0200
+Subject: [PATCH] Don't quote arguments passed to terminal emulators (bug
+ 10731)
+
+Commit 8cd3233 added argument quoting to several helpers to properly
+pass URIs that contain spaces to web browsers like Firefox.
+
+This broke invocations such as the following:
+
+  $ exo-open --launch TerminalEmulator screen -S test
+
+resulting in errors similar to:
+
+  Failed to execute child
+  Failed to execute child process "screen -S test" (No such file or
+  directory)
+
+Fix this by reverting the quoting changes made to TerminalEmulator
+helpers. The Sakura terminal, surprisingly enough, seems to require
+quotes around the command-line passed to it so I kept it with quotes.
+---
+ exo-helper/helpers/aterm.desktop.in.in                      | 2 +-
+ exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in | 2 +-
+ exo-helper/helpers/gnome-terminal.desktop.in.in             | 2 +-
+ exo-helper/helpers/nxterm.desktop.in.in                     | 2 +-
+ exo-helper/helpers/qterminal.desktop.in.in                  | 2 +-
+ exo-helper/helpers/urxvt.desktop.in.in                      | 2 +-
+ exo-helper/helpers/xfce4-terminal.desktop.in.in             | 2 +-
+ exo-helper/helpers/xterm.desktop.in.in                      | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/exo-helper/helpers/aterm.desktop.in.in b/exo-helper/helpers/aterm.desktop.in.in
+index 0eeb5ab..bbe06fc 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 a4d2cd1..b4de7ee 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/gnome-terminal.desktop.in.in b/exo-helper/helpers/gnome-terminal.desktop.in.in
+index f6af417..bb31360 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/nxterm.desktop.in.in b/exo-helper/helpers/nxterm.desktop.in.in
+index b095f5c..9dbd157 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/qterminal.desktop.in.in b/exo-helper/helpers/qterminal.desktop.in.in
+index 05aca6b..a456bee 100644
+--- a/exo-helper/helpers/qterminal.desktop.in.in
++++ b/exo-helper/helpers/qterminal.desktop.in.in
+@@ -7,4 +7,4 @@ StartupNotify=false
+ X-XFCE-Binaries=qterminal;
+ 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/urxvt.desktop.in.in b/exo-helper/helpers/urxvt.desktop.in.in
+index b90217a..d442e42 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/xfce4-terminal.desktop.in.in b/exo-helper/helpers/xfce4-terminal.desktop.in.in
+index a9444cd..1b10ee0 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 3697935..b2bc89c 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 19:27:20 UTC (rev 232393)
+++ PKGBUILD	2015-03-01 19:43:45 UTC (rev 232394)
@@ -5,7 +5,7 @@
 
 pkgname=exo
 pkgver=0.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -15,15 +15,21 @@
 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/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('95704b14ef9065268c3aa9a7c0bacbe0ddb490a183a4f5ab13bba4a1722826bd')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch)
+sha256sums=('95704b14ef9065268c3aa9a7c0bacbe0ddb490a183a4f5ab13bba4a1722826bd'
+            '999ebaa725c11d6c0a72467b5a24b57ae3f077dfa0a5adb71e119cc8bb0464c9')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=10731#c4
+  patch -Np1 -i ../0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Python 2 fix
-  export PYTHON=python2
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \

More information about the arch-commits mailing list