From 65395f567116a9f1eb835a0bced40753246e9667 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 29 Mar 2012 11:44:21 +0000
Subject: [PATCH] Resurrect the threading hacks, it seems rthreads doesn't help
 here.

---
 x11/gnome/zenity/Makefile                     |  3 ++-
 x11/gnome/zenity/patches/patch-src_progress_c | 16 ++++++++++++++++
 x11/gnome/zenity/patches/patch-src_tree_c     | 16 ++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 x11/gnome/zenity/patches/patch-src_progress_c
 create mode 100644 x11/gnome/zenity/patches/patch-src_tree_c

diff --git a/x11/gnome/zenity/Makefile b/x11/gnome/zenity/Makefile
index a5b8f70c110..b0e85775a91 100644
--- a/x11/gnome/zenity/Makefile
+++ b/x11/gnome/zenity/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.52 2012/03/29 06:45:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2012/03/29 11:44:21 ajacoutot Exp $
 
 COMMENT=		dialogs for GNOME
 
 GNOME_PROJECT=		zenity
 GNOME_VERSION=		3.4.0
+REVISION=		0
 
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/gnome/zenity/patches/patch-src_progress_c b/x11/gnome/zenity/patches/patch-src_progress_c
new file mode 100644
index 00000000000..c3fdacbc234
--- /dev/null
+++ b/x11/gnome/zenity/patches/patch-src_progress_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_progress_c,v 1.7 2012/03/29 11:44:21 ajacoutot Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=653468
+--auto-close broken by fix for #540560
+
+--- src/progress.c.orig	Tue Aug 16 15:52:42 2011
++++ src/progress.c	Thu Mar 29 13:42:33 2012
+@@ -183,7 +183,7 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
+     g_string_free (string, TRUE);
+   }
+ 
+-  if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
++  if (condition != G_IO_IN) {
+     /* We assume that we are done, so stop the pulsating and de-sensitize the buttons */
+     GtkWidget *button;
+ 
diff --git a/x11/gnome/zenity/patches/patch-src_tree_c b/x11/gnome/zenity/patches/patch-src_tree_c
new file mode 100644
index 00000000000..661ec2c0661
--- /dev/null
+++ b/x11/gnome/zenity/patches/patch-src_tree_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_tree_c,v 1.4 2012/03/29 11:44:21 ajacoutot Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=653468
+--auto-close broken by fix for #540560
+
+--- src/tree.c.orig	Fri Mar 23 14:46:09 2012
++++ src/tree.c	Thu Mar 29 13:42:37 2012
+@@ -187,7 +187,7 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+     g_string_free (string, TRUE);
+   }
+ 
+-  if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
++  if (condition != G_IO_IN) {
+     g_io_channel_shutdown (channel, TRUE, NULL);
+     return FALSE;
+   }