Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (155502e3d92a24b3c5309756657be8c053d7dc11)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (155502e3d92a24b3c5309756657be8c053d7dc11)
  • Date: Fri, 14 Nov 2008 10:38:36 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

xfce/thunar/HISTORY | 5 +++++
xfce/thunar/PRE_BUILD | 6 +++++-
xfce/thunar/thunar-zombie.patch | 31 +++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 155502e3d92a24b3c5309756657be8c053d7dc11
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

thunar: Added patch from
http://bugzilla.xfce.org/show_bug.cgi?id=2983 for Bug 14884.

diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index bcb9642..1dec369 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,8 @@
+2008-11-14 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added patch.
+ * thunar-zombie.patch: Added upstream patch. Bug #14884
+ See http://bugzilla.xfce.org/show_bug.cgi?id=2983
+
2008-10-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.3; quoting paths; fixed short desc
* PRE_BUILD: quoting paths; cleaned up
diff --git a/xfce/thunar/PRE_BUILD b/xfce/thunar/PRE_BUILD
index 8acb7d2..2cd1574 100755
--- a/xfce/thunar/PRE_BUILD
+++ b/xfce/thunar/PRE_BUILD
@@ -8,4 +8,8 @@ sed -i "s:doc/Thunar:doc/$SPELL:g" \
for lang in C es eu fr ja pl ru zh_TW; do
sed -i "s:doc/Thunar:doc/$SPELL:g" \
docs/manual/$lang/{images/,}Makefile.{am,in}
-done
+done &&
+
+
+# See http://bugzilla.xfce.org/show_bug.cgi?id=2983
+patch -p0 < $SCRIPT_DIRECTORY/thunar-zombie.patch
diff --git a/xfce/thunar/thunar-zombie.patch b/xfce/thunar/thunar-zombie.patch
new file mode 100644
index 0000000..4353c74
--- /dev/null
+++ b/xfce/thunar/thunar-zombie.patch
@@ -0,0 +1,31 @@
+Index: thunar-vfs/thunar-vfs-exec.c
+===================================================================
+--- thunar-vfs/thunar-vfs-exec.c (revision 26428)
++++ thunar-vfs/thunar-vfs-exec.c (working copy)
+@@ -324,8 +324,10 @@
+ if (startup_data->watch_id != 0)
+ g_source_remove (startup_data->watch_id);
+
+- /* close the PID */
+- g_spawn_close_pid (startup_data->pid);
++ /* make sure we don't leave zombies (see bug #2983 for details) */
++ g_child_watch_add_full (G_PRIORITY_LOW, startup_data->pid,
++ (GChildWatchFunc) g_spawn_close_pid,
++ NULL, NULL);
+
+ /* release the startup data */
+ _thunar_vfs_slice_free (TvsnStartupData, startup_data);
+@@ -513,7 +515,13 @@
+ startup_data->pid = pid;
+ }
+ }
++ else if (G_LIKELY (succeed))
++ {
++ /* make sure we don't leave zombies (see bug #2983 for details) */
++ g_child_watch_add_full (G_PRIORITY_LOW, pid, (GChildWatchFunc)
g_spawn_close_pid, NULL, NULL);
+
++ }
++
+ /* release the sn display */
+ if (G_LIKELY (sn_display != NULL))
+ sn_display_unref (sn_display);



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (155502e3d92a24b3c5309756657be8c053d7dc11), George Sherwood, 11/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page