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

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

3 files changed, 114 insertions, 0 deletions

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
+