Version bump for gnome-3.4, adds support for lists in --forms.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

6 files changed, 195 insertions, 9 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index fcbc85519487..539ba703b938 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/zenity
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.207 2012/05/08 01:05:04 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.208 2012/05/20 01:10:07 tetromino Exp $
+
+*zenity-3.4.0 (20 May 2012)
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +zenity-3.4.0.ebuild, +files/zenity-3.4.0-list-check.patch,
+  +files/zenity-3.4.0-list-default-column.patch,
+  +files/zenity-3.4.0-list-segfault.patch:
+  Version bump for gnome-3.4, adds support for lists in --forms.
 
   08 May 2012; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   webkit is now global wrt #285743
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 398b013a35e2..5c4f75df882f 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -2,20 +2,25 @@
 Hash: SHA1
 
 AUX zenity-2.32.1-libnotify-0.7.patch 746 RMD160 cd2eed097c232a5c4c84da574a8a2aac2785ca9d SHA1 9212bdff8f0684128dcad89765a5d7ba179402c5 SHA256 98bf6ca77f0fef14a5f0b8788595710b7eb88db121103a72c4a38bb912038431
+AUX zenity-3.4.0-list-check.patch 1457 RMD160 5be94216a58a6e5b2f4aecabde45de1c1a8dd062 SHA1 99ae8c3e6342e83d4f84bbcbb38a8c1cd28352f9 SHA256 b3086633059c588a6a8b7b04aaf7cbb7477a8e2cbd2aa88ed80a11e323bbbce9
+AUX zenity-3.4.0-list-default-column.patch 1082 RMD160 c0c86b762bc6bab0783d06961af2a110ea33f691 SHA1 f451d5865a2708444f6c2388cde75d48495f78fa SHA256 7c5c89c6714385bdab9cbebdefc95e52a0dca471671ef45b2c95c4e593a9b86b
+AUX zenity-3.4.0-list-segfault.patch 1302 RMD160 12b43fa3c8894298c8276f8fbe120f578541f3af SHA1 0f88094ca0258556370f5795e4702388d1f01bb2 SHA256 453dd359547f0a223319f478561c1762b0d9d6941f0b55ea30dea11193cff3f6
 DIST zenity-2.32.1.tar.bz2 3128666 RMD160 30b19230d9e1ed478cfd17d2a6942863bcda6763 SHA1 5e75e9200768ecf9eb7f1e6edac7a395ddb47947 SHA256 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac
 DIST zenity-3.2.0.tar.xz 3153352 RMD160 6cc820a29df453df3ba58f0f02f2b2a660554a62 SHA1 112dadd2ca8a4f063a8451fcc222085754fcf4d1 SHA256 e6a778db3655957770653745a2ecaef08a41a71f4a0a92cb7c5dc8ce0e9902d8
+DIST zenity-3.4.0.tar.xz 3621304 RMD160 79c5f762c821d136d0e327dc68c1a23aea582ade SHA1 9ef8a81469e54e2b2cf40fd57c88e962c481fd42 SHA256 5cf068597c649b5adee60c5948abdf383dbfb16a6c6d57c2ec42ced136730baf
 EBUILD zenity-2.32.1.ebuild 1296 RMD160 9b58dd33205fc39e3554da4fefc006d2b6fcd323 SHA1 95f45c09d110ffa8049ca8ae942a573fdc5ffb34 SHA256 d25166a27416913c1dca7e5544ffc2e328cd2303616738fb05616c2c51bf2e27
 EBUILD zenity-3.2.0.ebuild 1313 RMD160 8f7cd23cf0539540bb0e3f928105b5604b1a2cf8 SHA1 2a41f745910fba68a5984c9f8cb38e1cd7f66892 SHA256 530419399d0e9a5ca3f797690a5a9f8e3aedf4a37a26742bd34b48be8cfbc3e0
-MISC ChangeLog 24138 RMD160 d38ec4fd311e2ed560a3e104f1b0b011d4e6559c SHA1 615ba9e7b8cc6451f8d35923c7ef7d7a6c048b2b SHA256 1479d8cb3a83564e13836335d0b6202561aaf1d6499fb529850a4f96ca1aa80b
+EBUILD zenity-3.4.0.ebuild 1616 RMD160 909b4a7754d3d774d05e1d9d670bf119db05435e SHA1 948de2e5c9af494d2bea93980b3ca34e88fc20c0 SHA256 e707faf410d70b2df6210029db2b34011ce185f5dda86ce87bdf0b229a2fb4bf
+MISC ChangeLog 24447 RMD160 8532da524db5f1531d3c5a262f7362f1629f8bce SHA1 3c14f329b26f2f7e0f67626143b45faee5b4fa5a SHA256 1f017828daff45091c4b50f714156fe049b911de153e4020085538102b0cb227
 MISC metadata.xml 302 RMD160 bde33bbd14d8085f9c4a63abf344904951e87f2f SHA1 421c8f95533baed57a7b116cce8b6b7a8121a4ff SHA256 b52e3b6c6080efd1fedb03fe6136d89d74f1e58896ae8d6f075622bf6806e200
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPqHE0AAoJEFpvPKfnPDWzFg4H/30+oVxq1GCGFFdDjX/K0pdG
-vRFAbL6gW0cm0cYgjCrlydPMFqsry04Sp3Y90R+RMmwMT2ht7lktSOF+FPzt8th2
-vTRSaUu40eP1LCcVelZjeCB6y2HhtZFeVJ8GP+DNJHSU/+Fx7bhPCVVtttL9ZBQi
-rJipTGlXtSr9WsPG5uCZUy5d0An0GUHY7MedbURuFgASjRiVobnDdsNPv5E1OumB
-4/YjH8C+N8Mek5ml81i6qf1xz0bPvYiNQ8KbVq9vtuK8XO+1REkO88utxq3IyREN
-Fm49CYhjACHRr+HNtTRRPtuzqgWq8bNoECHYkib9hGlIKO+YjLJXxPlDPYh22AU=
-=2nDP
+iQEcBAEBAgAGBQJPuER0AAoJEJ0WA1zPCt1hOd0H/A3/o+sswlcfZIMKxcXeHsO4
+8oX8gLU9JHpSWWTbry3bfL6p6/mA1h/2z0f5zIhU9uJOpXlqRLQxHd292IsLcgnf
+90T8cwuVYVXoaFnabTQxcZjkHFY4vhbS0BwIDralO6VYsZZdIvKFtO/UHbh5hBhm
+ScgG/oFALQEytbKxtGkFbGex3bRYbWwXMn/SS5z0SQjCmUrQjDVp1ivW+QlJV/s/
+8F4zvU8Mk8TUQzP6EV/K3McDZYyIfFIcjiTnt+EI0YLDNVJ2F6R2vCs5EQ303ssK
+px1cPzUQ8OU9fLR/VA2vRXvUOLFEJ+cbcF5vr3ujNr7W7J2ENr389RA3TbzR+X0=
+=wBRV
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/zenity/files/zenity-3.4.0-list-check.patch b/gnome-extra/zenity/files/zenity-3.4.0-list-check.patch
new file mode 100644
index 000000000000..bcd751717547
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.4.0-list-check.patch
@@ -0,0 +1,42 @@
+From 127c298ac43cbdf3b965002e7e9115571ca1d90d Mon Sep 17 00:00:00 2001
+From: Julian Taylor <jtaylor.debian@googlemail.com>
+Date: Tue, 8 May 2012 22:14:58 +0200
+Subject: [PATCH] mask the result of g_io_channel_get_flags for the wanted
+ flag
+
+---
+ src/tree.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/tree.c b/src/tree.c
+index 721817e..b347b15 100644
+--- a/src/tree.c
++++ b/src/tree.c
+@@ -120,13 +120,13 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+ 
+     string = g_string_new (NULL);
+ 
+-    while (g_io_channel_get_flags(channel) != G_IO_FLAG_IS_READABLE)
++    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)
++        if (g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE)
+           status = g_io_channel_read_line_string (channel, string, NULL, &error);
+         else
+           return FALSE;
+@@ -645,7 +645,7 @@ zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data)
+       zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
+       break;
+   }
+-  if (channel != NULL && g_io_channel_get_flags (channel) == G_IO_FLAG_IS_READABLE)
++  if (channel != NULL && g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE)
+     g_io_channel_shutdown (channel, TRUE, NULL);
+ 
+   gtk_main_quit ();
+-- 
+1.7.8.6
+
diff --git a/gnome-extra/zenity/files/zenity-3.4.0-list-default-column.patch b/gnome-extra/zenity/files/zenity-3.4.0-list-default-column.patch
new file mode 100644
index 000000000000..bcac9adb838d
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.4.0-list-default-column.patch
@@ -0,0 +1,31 @@
+From 68fc98278ffb871309b67080b8bdd5af2b2326a8 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 19 May 2012 20:53:27 -0400
+Subject: [PATCH] Do not crash in --forms --add-list without column values
+
+Be a bit more user friendly, and instead of crashing, add a default
+column name if the user forgot to use --column-values with a --forms list.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=676406
+---
+ src/option.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/option.c b/src/option.c
+index 7fdb7f1..334ec86 100644
+--- a/src/option.c
++++ b/src/option.c
+@@ -1918,7 +1918,9 @@ zenity_forms_post_callback (GOptionContext *context,
+         results->forms_data->column_values = g_slist_append (results->forms_data->column_values, values);
+         values = zenity_forms_list_values[++i];
+       }
+-    }
++    } else
++      results->forms_data->column_values = g_slist_append (NULL, "column");
++
+     if (zenity_forms_date_format)
+       results->forms_data->date_format = zenity_forms_date_format;
+     else
+-- 
+1.7.8.6
+
diff --git a/gnome-extra/zenity/files/zenity-3.4.0-list-segfault.patch b/gnome-extra/zenity/files/zenity-3.4.0-list-segfault.patch
new file mode 100644
index 000000000000..3feef3909b75
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.4.0-list-segfault.patch
@@ -0,0 +1,41 @@
+From 4a30be17b3adfd7b8383f5c23fae71e31933326b Mon Sep 17 00:00:00 2001
+From: Arx Cruz <arxcruz@gnome.org>
+Date: Tue, 17 Apr 2012 16:50:52 -0300
+Subject: [PATCH] Bug #673529 Fix segmentation fault in --list option
+
+---
+ src/tree.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/tree.c b/src/tree.c
+index ad4a6d1..721817e 100644
+--- a/src/tree.c
++++ b/src/tree.c
+@@ -120,13 +120,13 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+ 
+     string = g_string_new (NULL);
+ 
+-    while (channel->is_readable != TRUE)
++    while (g_io_channel_get_flags(channel) != G_IO_FLAG_IS_READABLE)
+       ;
+     do {
+       gint status;
+ 
+       do {
+-        if (channel->is_readable == TRUE)
++        if (g_io_channel_get_flags(channel) == G_IO_FLAG_IS_READABLE)
+           status = g_io_channel_read_line_string (channel, string, NULL, &error);
+         else
+           return FALSE;
+@@ -645,7 +645,7 @@ zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data)
+       zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
+       break;
+   }
+-  if (channel->is_readable == TRUE)
++  if (channel != NULL && g_io_channel_get_flags (channel) == G_IO_FLAG_IS_READABLE)
+     g_io_channel_shutdown (channel, TRUE, NULL);
+ 
+   gtk_main_quit ();
+-- 
+1.7.8.6
+
diff --git a/gnome-extra/zenity/zenity-3.4.0.ebuild b/gnome-extra/zenity/zenity-3.4.0.ebuild
new file mode 100644
index 000000000000..05eca82c1c7f
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.4.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.4.0.ebuild,v 1.1 2012/05/20 01:10:07 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
+HOMEPAGE="http://live.gnome.org/Zenity"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="libnotify +webkit"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.0.0:3
+	x11-libs/libX11
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.6.1 )
+	webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.14
+	virtual/pkgconfig
+	>=app-text/gnome-doc-utils-0.10.1"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2.12
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		$(use_enable libnotify)
+		$(use_enable webkit webkitgtk)
+		PERL=$(type -P false)"
+	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
+}
+
+src_prepare() {
+	# Fix crash with --forms --list, in next release
+	epatch "${FILESDIR}/${P}-list-segfault.patch"
+	epatch "${FILESDIR}/${P}-list-check.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=676406
+	epatch "${FILESDIR}/${PN}-3.4.0-list-default-column.patch"
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
+}