[arch-commits] Commit in exo/trunk (3 files)
Date: Sunday, March 22, 2015 @ 17:46:06
Author: foutrelis
Revision: 234473
upgpkg: exo 0.10.4-2
Revert startup notification support; prevents some applications started by
exo-helper to receive focus (FS#44282).
Added:
exo/trunk/0001-Fix-StartupNotify-Bug-9570-thanks-Thaddaeus.patch
exo/trunk/0001-Fix-implicit-declaration-of-function-xfce_spawn_on_s.patch
Modified:
exo/trunk/PKGBUILD
-+
0001-Fix-StartupNotify-Bug-9570-thanks-Thaddaeus.patch | 87
++
0001-Fix-implicit-declaration-of-function-xfce_spawn_on_s.patch | 44 +
PKGBUILD| 12 +
3 files changed, 142 insertions(+), 1 deletion(-)
Added: 0001-Fix-StartupNotify-Bug-9570-thanks-Thaddaeus.patch
===
--- 0001-Fix-StartupNotify-Bug-9570-thanks-Thaddaeus.patch
(rev 0)
+++ 0001-Fix-StartupNotify-Bug-9570-thanks-Thaddaeus.patch 2015-03-22
16:46:06 UTC (rev 234473)
@@ -0,0 +1,87 @@
+From 3a2c05bd68f924f5c8bd530a2fe8f4cc5b671b16 Mon Sep 17 00:00:00 2001
+From: Sean Davis smd.seanda...@gmail.com
+Date: Thu, 5 Mar 2015 15:55:59 -0500
+Subject: [PATCH] Fix StartupNotify (Bug 9570, thanks Thaddaeus)
+
+---
+ exo-helper/exo-helper.c | 52 +++--
+ 1 file changed, 3 insertions(+), 49 deletions(-)
+
+diff --git a/exo-helper/exo-helper.c b/exo-helper/exo-helper.c
+index 37d8901..aba3749 100644
+--- a/exo-helper/exo-helper.c
b/exo-helper/exo-helper.c
+@@ -359,8 +359,6 @@ exo_helper_execute (ExoHelper *helper,
+ gint pid;
+ const gchar *real_parameter = parameter;
+
+- // FIXME: startup-notification
+-
+ g_return_val_if_fail (EXO_IS_HELPER (helper), FALSE);
+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
+@@ -399,58 +397,14 @@ exo_helper_execute (ExoHelper *helper,
+ continue;
+
+ /* try to run the command */
+- succeed = gdk_spawn_on_screen (screen, NULL, argv, NULL,
G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, err);
++ succeed = xfce_spawn_on_screen (screen, NULL, argv, NULL,
G_SPAWN_SEARCH_PATH, helper-startup_notify, gtk_get_current_event_time (),
NULL, err);
+
+ /* cleanup */
+ g_strfreev (argv);
+
+- /* check if the execution was successful */
++ /* check if we should retry with the next command */
+ if (G_LIKELY (succeed))
+-{
+- /* determine the current time */
+- g_get_current_time (previous);
+-
+- /* wait up to 5 seconds to see whether the command worked */
+- for (;;)
+-{
+- /* check if the command exited with an error */
+- result = waitpid (pid, status, WNOHANG);
+- if (result 0)
+-{
+- /* something weird happened */
+- err = g_error_new_literal (G_FILE_ERROR,
g_file_error_from_errno (errno), g_strerror (errno));
+- succeed = FALSE;
+- break;
+-}
+- else if (result 0 status != 0)
+-{
+- /* the command failed */
+- err = g_error_new_literal (G_FILE_ERROR,
g_file_error_from_errno (EIO), g_strerror (EIO));
+- succeed = FALSE;
+- break;
+-}
+- else if (result == pid)
+-{
+- /* the command succeed */
+- succeed = TRUE;
+- break;
+-}
+-
+- /* determine the current time */
+- g_get_current_time (current);
+-
+- /* check if the command is still running after 5 seconds (which
indicates that the command worked) */
+- if (((current.tv_sec - previous.tv_sec) * 1000ll +
(current.tv_usec - previous.tv_usec) / 1000ll) 5000ll)
+-break;
+-
+- /* wait some time */
+- g_usleep (50 * 1000);
+-}
+-
+- /* check if we should retry with the next command */
+- if (G_LIKELY (succeed))
+-break;
+-}
++break;
+ }
+
+ /* propagate the error */
+--
+2.3.3
+
Added: 0001-Fix-implicit-declaration-of-function-xfce_spawn_on_s.patch
===
--- 0001-Fix-implicit-declaration-of-function-xfce_spawn_on_s.patch
(rev 0)
+++ 0001-Fix-implicit-declaration-of-function-xfce_spawn_on_s.patch
2015-03-22 16:46:06 UTC (rev 234473)
@@ -0,0 +1,44 @@
+From 4e68afc085d23bd77cf94e0e8e2e1435f0b4ebaa Mon Sep 17 00:00:00 2001
+From: Matt Thirtytwo matt.59...@gmail.com
+Date: Sat, 7 Mar 2015 22:23:45 +0100
+Subject: [PATCH] Fix implicit declaration of function
[arch-commits] Commit in exo/trunk (3 files)
Date: Wednesday, March 18, 2015 @ 15:20:17 Author: foutrelis Revision: 234097 upgpkg: exo 0.10.4-1 New upstream release. Added: exo/trunk/0001-Do-not-use-x-scheme-handler-file-mimetype-bug-7257.patch Modified: exo/trunk/PKGBUILD Deleted: exo/trunk/0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch -+ 0001-Do-not-use-x-scheme-handler-file-mimetype-bug-7257.patch | 24 ++ 0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch | 116 -- PKGBUILD| 16 - 3 files changed, 32 insertions(+), 124 deletions(-) Added: 0001-Do-not-use-x-scheme-handler-file-mimetype-bug-7257.patch === --- 0001-Do-not-use-x-scheme-handler-file-mimetype-bug-7257.patch (rev 0) +++ 0001-Do-not-use-x-scheme-handler-file-mimetype-bug-7257.patch 2015-03-18 14:20:17 UTC (rev 234097) @@ -0,0 +1,24 @@ +From b74caf97642ae2bf00a7754a5fb193f695b6f3d4 Mon Sep 17 00:00:00 2001 +From: Sean Davis smd.seanda...@gmail.com +Date: Tue, 17 Mar 2015 19:43:44 -0400 +Subject: [PATCH] Do not use x-scheme-handler/file mimetype (bug 7257) + +--- + exo-open/exo-file-manager.desktop.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/exo-open/exo-file-manager.desktop.in b/exo-open/exo-file-manager.desktop.in +index 3d7653e..8d0a6cf 100644 +--- a/exo-open/exo-file-manager.desktop.in b/exo-open/exo-file-manager.desktop.in +@@ -7,6 +7,6 @@ StartupNotify=true + Terminal=false + Categories=Utility;X-XFCE;X-Xfce-Toplevel; + OnlyShowIn=XFCE; +-X-XFCE-MimeType=x-scheme-handler/file;x-scheme-handler/trash; ++X-XFCE-MimeType=inode/directory;x-scheme-handler/trash; + _Name=File Manager + _Comment=Browse the file system +-- +2.3.3 + Deleted: 0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch === --- 0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch 2015-03-18 14:07:44 UTC (rev 234096) +++ 0001-Don-t-quote-arguments-passed-to-terminal-emulators-b.patch 2015-03-18 14:20:17 UTC (rev 234097) @@ -1,116 +0,0 @@ -From 23b17d5c622a8f496ebfdd011149722ecd6b8ebe Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras evange...@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; -
[arch-commits] Commit in exo/trunk (3 files)
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
