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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 143 insertions, 10 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/Manifest b/gnome-extra/zenity/Manifest
index 3c0d6b51f041..0f90416bb6db 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX zenity-2.32.1-libnotify-0.7.patch 746 SHA256 98bf6ca77f0fef14a5f0b8788595710b7eb88db121103a72c4a38bb912038431 SHA512 ccef1dfde468c98a1836cc5ae0584166c605ca6a99c5df794d92c590b38fec489cb7e35c9b8826c624686796a5e2a97ddc28760f5909c8f42c6834d3357185ad WHIRLPOOL fa74b1a555d6060e6b6ace10c472289373a0f7cf132bae608877711c2a6b6036976f1cf33a4b067979299bc875ad56513ea9a07e595dddb25cb438907955011d
+AUX zenity-3.8.0-broken-autoclose.patch 3463 SHA256 1925f3c814b5eefc187e33b10f0c67207202112b4a10ece6c2d2f2409f2db16d SHA512 3bf996c1aa36ff0586072b8c71376c920b12922fb0666152be723266278badb7ac28505b820d936dff2eb579f1b57e06bb376d25fcd435451a7df4716edf9a74 WHIRLPOOL 766c71c7bffe1bd2028be60bb2576a519cae48cada7ade7052a3a3d32fa22c1cc804738e2bbf9130835cc9b9aaff959b6ba17c6bd74950c40a5f1d783d92f32f
 AUX zenity-3.8.0-double-click.patch 1008 SHA256 a020d4360f1ca64057b542776a94dcb3f4ce5760cd32b7a772a9530ad3c516e3 SHA512 f7f8ec8e4ad797a454f18610920f87c1ead639bd58f63b1c594862a583c72233cf769a3ef6226ad228f8e45b7e61e3f2de5ad4b70eef45f7fd2472a6d0153e86 WHIRLPOOL 3dd3bf0904b05467bc20ce9ba24a478b55803b5cd3cd486d701e25f2b577690c888504ef9d9ce93dc3c2b1a63808c79a7bb4b7b9a4c6cb978c6a2467e393e4a0
+AUX zenity-3.8.0-listbox-expand.patch 753 SHA256 80bf3608a7ebb68edd0e4a72bb57836d4b638efa5ac88cc6fb536a873e2916be SHA512 e53c1286690f6886f6b87d5d77891f371b8751f09c889445c6dde7a4288f1c189d5a19183421678cd610f8b1953c994432e91bf22534043e05d654074542bef5 WHIRLPOOL cf232010e002b09e6eddec1fb4c8ac3062ed1a5b73461940de3221f4b94d487c008cab94050da60967562b1721e197dd730b007fcf4f04ba3cfb057010eea0cd
 DIST zenity-2.32.1.tar.bz2 3128666 SHA256 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac SHA512 5cab5be6e22da46b6fa78bddd3c40e2413df64f8267452a332efc093e0e865c621cd68897c11c1af9a33afceb8cf84e08b03e17d4d0b3abfed95cbafe199c94e WHIRLPOOL eb3db6f89f5eaa9b316a22d46a4af03991255c16d28b10f7fe56f553f913642b3fe30661d2714bbb3921c9f5e1adede56b6b225313fe26211bdf6030a6167858
 DIST zenity-3.8.0.tar.xz 3651076 SHA256 94fbf0b71592f26dce0e2c49b82b4401139c8434084ad24c2c6a61ace1e6563f SHA512 3e7c72a19f3f48c9da1578abfbdd3cd5973dbea6ead9fdf035b34405be2da9ea1be6f8ace271948144a9a7b6e34cac1dfc3e554f19438431ffb1e82f08ddc02d WHIRLPOOL cc5a731cce52bb4f2783d41b7f9319efe306552a3ada48fa91b4ead15407f3ad079b618c8ff508ca4666922de4bcc81b5824d77497615e03ddd61412bbb2fa90
 EBUILD zenity-2.32.1.ebuild 1296 SHA256 d25166a27416913c1dca7e5544ffc2e328cd2303616738fb05616c2c51bf2e27 SHA512 acaa93899a5e92e943609976a78ea8a648d7d75614e9f99760bd9c022259d4c99b9b77a58ebdabada364e822a6924882daefadd4e786df2f9d9cf9ea20baa85e WHIRLPOOL 62ab0b84f6a3d57a473bb4d170b7b39da0443c4b20b1627336184983625c124f081cf9a2a770018d1c4f76da80825e2e90648e5c8626b0f10220457f37f28829
-EBUILD zenity-3.8.0-r1.ebuild 1467 SHA256 2da7bc21b929d6662225a92a550f6e6b9f79c9d3aec9c880b65cd0cc58a0232f SHA512 bf0b361d1813b31fe62ebb6ed4857397b1cb335d396746484dd9d46c09fca12e201a0c161be78144a55182eeacff0085f20b0d5506281d0f69fc8a5b0fc5679e WHIRLPOOL 9ec0afe59ff0336177117b44d9e8490b13098c59f89a9c4fffc014bcbb09db42d97ebf7716f8e62bab6689ac078b479b52079130d29a31e4da8f4ac31bb8596e
+EBUILD zenity-3.8.0-r2.ebuild 1709 SHA256 8ca920f6dc4033c8874976dea9f7d67e99cbe598c7d2cb478bd4a0ce9dbb7cc8 SHA512 8b700968d2171ed1eeaa4d36f1db2b7699ed25adaf62f4d56e05165c5ee7db308e41287865bcdc3b68d823436d4c265f2a14f7b34d4540ad4ef5cba6108a4319 WHIRLPOOL 14d013a11a6aa5b7d83bad26a874598d0acdc54104297d48f6b8ca3bc451ebff82f63750a067e5019154dda8b7c3cc8bddb8754ea9c7a9007fe0d2f753d34724
 EBUILD zenity-3.8.0.ebuild 1250 SHA256 a22d3c64c2f53782c77d3c8a1f4785ee1d58d679b7439d6241e9314c0aa16cec SHA512 d2d8e711f6cc1b4927ca16ddb5f1f0db834b0da53212a4dadb0b38d8f526db77e864ad6d57aa6718fc12044ac36053c17d0a7cf559a90af6925a59a277c4038b WHIRLPOOL 80d76dc81809dbd781049f88e7d67e0339d8b4ed5f2a54a1bd6d474e1cc803a639cc167aafb88cef677d5a9fcd47dd4d12480d5a9ff2e4bb4eb8b72da4abd0b0
-MISC ChangeLog 25457 SHA256 de70965e94e3389149f241cd9b739c8e190e7e3ab7723c989044e5eccff372f1 SHA512 5a298da06f920e0a131760d8e3829729857bd85c4b8a033474e391812ac064c5d6904e508940d1eae88f37f21de64ccde7b4c63f68f7f1587d0142c9e96340ca WHIRLPOOL 266a5ed367a6ccc105f50e36c60820c568980bfe21177570b0cb01edda6141573c4c4555cfa4d50f6307b25200ad26662258392d970394a19d69ae1ed4d8452b
+MISC ChangeLog 25766 SHA256 04dc97a8f9da94e337c7143a07bf40ea642542d56b6fc29a7eef9a456ff5584d SHA512 f02edd108e4c2b8f41e219ae75c40db944bf193e4d09fa3b380893945f2992b8a2628195bbcdd99dea6a0f03f6f8a1c7c40f8a2982e238ba55a6718e78ea5349 WHIRLPOOL 25f52721a17ba0a6cfe8caeec770f35634d0ca016de7d002e2c5101c8ad60d3c773c49dc2b8b0c2146b9294fad2b64e0a32cbe210f519f5ebe127160556f156d
 MISC metadata.xml 302 SHA256 b52e3b6c6080efd1fedb03fe6136d89d74f1e58896ae8d6f075622bf6806e200 SHA512 d66d8a12c3ef2bc74a768e83d63f87c9da48e1773fbfbff60abbe5e01142daf1fd1fc500ad7ea51418e7574fa956e1c0eddebce5d59525bc725b8576f8da95c8 WHIRLPOOL 1721abff208b87e089940e5c87c0b0848adec4a5cb299e35777cd473370ee5f1cd6bdc3614e272fd084cc9b4922048f7a01d46a2ab64757e3b93ff9ea721e7a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK5gOYACgkQCaWpQKGI+9SjLQCfbOup6bnvsdlrCs6NgQCijHdO
-fUMAoIW/3phSParh6GteJoQSgMVOHgwZ
-=6++e
+iEYEAREIAAYFAlMETWAACgkQCaWpQKGI+9T/PQCdHMadJtY2OlHuWog4ETHkJ6be
+GzYAnRP+lw5My5jmU9Go2tpNBTZ2HE72
+=eWQ9
 -----END PGP SIGNATURE-----
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
 }