Apply some upstream bugfixes that also fix bug #501722 reported by Jazek. Drop old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 136 insertions, 5 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index e896d14579d0..52fc5bd11a8e 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/zenity
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.214 2013/12/24 12:41:09 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.215 2014/02/19 06:21:19 pacho Exp $
+
+*zenity-3.8.0-r2 (19 Feb 2014)
+
+  19 Feb 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/zenity-3.8.0-broken-autoclose.patch,
+  +files/zenity-3.8.0-listbox-expand.patch, +zenity-3.8.0-r2.ebuild,
+  -zenity-3.8.0-r1.ebuild:
+  Apply some upstream bugfixes that also fix bug #501722 reported by Jazek. Drop
+  old.
 
 *zenity-3.8.0-r1 (24 Dec 2013)
 
diff --git a/gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch b/gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch
new file mode 100644
index 000000000000..0b4f1c77d400
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch
@@ -0,0 +1,95 @@
+From c89ce9c3812fdc3a2637fd76b42a07385ad50684 Mon Sep 17 00:00:00 2001
+From: Arx Cruz <arxcruz@gnome.org>
+Date: Tue, 04 Jun 2013 19:27:48 +0000
+Subject: Bug #653468. Fixed by Kurt Miller <kurt@intricatesoftware.com>.
+
+Fix the broken auto-close option in progress and list dialogs.
+---
+diff --git a/src/progress.c b/src/progress.c
+index c382d74..055699c 100644
+--- a/src/progress.c
++++ b/src/progress.c
+@@ -81,12 +81,13 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
+   static GObject *progress_bar;
+   static GObject *progress_label;
+   float percentage = 0.0;
++  GIOStatus status = G_IO_STATUS_NORMAL;
+   
+   progress_data = (ZenityProgressData *) data;
+   progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
+   progress_label = gtk_builder_get_object (builder, "zenity_progress_text");
+ 
+-  if ((condition == G_IO_IN) || (condition == G_IO_IN + G_IO_HUP)) {
++  if ((condition & G_IO_IN) != 0) {
+     GString *string;
+     GError *error = NULL;
+ 
+@@ -95,8 +96,6 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
+     while (channel->is_readable != TRUE)
+       ;
+     do {
+-      gint status;
+-
+       do {
+         status = g_io_channel_read_line_string (channel, string, NULL, &error);
+ 
+@@ -175,11 +174,11 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
+         }
+       }
+ 
+-    } while (g_io_channel_get_buffer_condition (channel) == G_IO_IN);
++    } while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) == G_IO_IN && status != G_IO_STATUS_EOF);
+     g_string_free (string, TRUE);
+   }
+ 
+-  if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
++  if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
+     /* We assume that we are done, so stop the pulsating and de-sensitize the buttons */
+     GtkWidget *button;
+ 
+diff --git a/src/tree.c b/src/tree.c
+index 031765e..4634ba1 100644
+--- a/src/tree.c
++++ b/src/tree.c
+@@ -139,6 +139,7 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+   static gboolean editable;
+   static gboolean toggles;
+   static gboolean first_time = TRUE;
++  GIOStatus status = G_IO_STATUS_NORMAL;
+ 
+   tree_view = GTK_TREE_VIEW (data);
+   n_columns = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "n_columns"));
+@@ -152,7 +153,7 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+     gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+   }
+ 
+-  if ((condition == G_IO_IN) || (condition == G_IO_IN + G_IO_HUP)) {
++  if ((condition & G_IO_IN) == G_IO_IN) {
+     GString *string;
+     GError *error = NULL;
+ 
+@@ -161,8 +162,6 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+     while ((g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE) != G_IO_FLAG_IS_READABLE)
+       ;
+     do {
+-      gint status;
+-
+       do {
+         if (g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE)
+           status = g_io_channel_read_line_string (channel, string, NULL, &error);
+@@ -221,11 +220,11 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+ 
+       column_count++;
+ 
+-    } while (g_io_channel_get_buffer_condition (channel) == G_IO_IN); 
++    } while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) == G_IO_IN && status != G_IO_STATUS_EOF); 
+     g_string_free (string, TRUE);
+   }
+ 
+-  if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
++  if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
+     g_io_channel_shutdown (channel, TRUE, NULL);
+     return FALSE;
+   }
+--
+cgit v0.9.2
diff --git a/gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch b/gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch
new file mode 100644
index 000000000000..41e90fedd59f
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch
@@ -0,0 +1,20 @@
+From 80bc8ce643979fec201c4ebd5cd6405b6310357f Mon Sep 17 00:00:00 2001
+From: Arx Cruz <arxcruz@gnome.org>
+Date: Thu, 10 Oct 2013 19:52:38 +0000
+Subject: But #702535 - List box doesn't expand to fill window
+
+---
+diff --git a/src/zenity.ui b/src/zenity.ui
+index ee89093..7c0ab1f 100644
+--- a/src/zenity.ui
++++ b/src/zenity.ui
+@@ -1021,6 +1021,7 @@
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="shadow_type">in</property>
++                <property name="expand">True</property>
+                 <child>
+                   <object class="GtkTreeView" id="zenity_tree_view">
+                     <property name="visible">True</property>
+--
+cgit v0.9.2
diff --git a/gnome-extra/zenity/zenity-3.8.0-r1.ebuild b/gnome-extra/zenity/zenity-3.8.0-r2.ebuild
index 98cfb4be8427..3926e57b54ed 100644
--- a/gnome-extra/zenity/zenity-3.8.0-r1.ebuild
+++ b/gnome-extra/zenity/zenity-3.8.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.8.0-r1.ebuild,v 1.1 2013/12/24 12:41:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.8.0-r2.ebuild,v 1.1 2014/02/19 06:21:19 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -8,7 +8,7 @@ GCONF_DEBUG="yes"
 inherit eutils gnome2
 
 DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/action/show/Projects/Zenity"
+HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
@@ -36,6 +36,13 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Fix double clicking an item or hitting enter after selecting an item (from 'master')
 	epatch "${FILESDIR}/${PN}-3.8.0-double-click.patch"
+
+	# Fix the broken auto-close option in progress and list dialogs (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.0-broken-autoclose.patch"
+
+	# List box doesn't expand to fill window (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.0-listbox-expand.patch"
+
 	gnome2_src_prepare
 }