diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/01_dont_quit_zenity_when_stdin_ends.patch | 8 | ||||
| -rw-r--r-- | debian/patches/02_fix_segfault_in_listview.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 6 insertions, 34 deletions
diff --git a/debian/changelog b/debian/changelog index 445575ba..fb3ebc40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ zenity (3.8.0-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.9.4. No further changes. + * Refresh 01_dont_quit_zenity_when_stdin_ends.patch. + * Remove 02_fix_segfault_in_listview.patch, merged upstream. -- Michael Biebl <biebl@debian.org> Sat, 25 May 2013 23:50:05 +0200 diff --git a/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch b/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch index fd8c4225..1a754d1b 100644 --- a/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch +++ b/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch @@ -12,11 +12,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=525596 src/notification.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) -Index: zenity-3.2.0/src/notification.c +Index: zenity-3.8.0/src/notification.c =================================================================== ---- zenity-3.2.0.orig/src/notification.c 2011-09-27 00:42:16.000000000 +0200 -+++ zenity-3.2.0/src/notification.c 2011-09-28 15:39:04.809489648 +0200 -@@ -167,8 +167,6 @@ +--- zenity-3.8.0.orig/src/notification.c 2013-05-25 23:51:03.085727542 +0200 ++++ zenity-3.8.0/src/notification.c 2013-05-25 23:51:03.077727349 +0200 +@@ -291,8 +291,6 @@ if ((condition & G_IO_HUP) != 0) { g_io_channel_shutdown (channel, TRUE, NULL); diff --git a/debian/patches/02_fix_segfault_in_listview.patch b/debian/patches/02_fix_segfault_in_listview.patch deleted file mode 100644 index 662a6290..00000000 --- a/debian/patches/02_fix_segfault_in_listview.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/tree.c b/src/tree.c -index ad4a6d1..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 (channel->is_readable != TRUE) -+ while ((g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE) != 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 (); diff --git a/debian/patches/series b/debian/patches/series index 4e5e3421..777963c8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01_dont_quit_zenity_when_stdin_ends.patch -02_fix_segfault_in_listview.patch |