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

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

5 files changed, 182 insertions, 1 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/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!"
+}