- update to zenity-3.6.0

This commit is contained in:
jasper 2012-09-27 08:00:06 +00:00
parent edafb70e82
commit bf0691a99a
5 changed files with 940 additions and 861 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.55 2012/09/19 12:53:11 jasper Exp $
# $OpenBSD: Makefile,v 1.56 2012/09/27 08:00:06 jasper Exp $
COMMENT= dialogs for GNOME
GNOME_PROJECT= zenity
GNOME_VERSION= 3.4.0
REVISION= 2
GNOME_VERSION= 3.6.0
HOMEPAGE= https://live.gnome.org/Zenity

View File

@ -1,2 +1,2 @@
SHA256 (gnome/zenity-3.4.0.tar.xz) = XPBoWXxkm1re5gxZSKvfOD2/sWpsbVfC7ELO0TZzC68=
SIZE (gnome/zenity-3.4.0.tar.xz) = 3621304
SHA256 (gnome/zenity-3.6.0.tar.xz) = XeTru2iIrUko+p7rzULb5bsoK+6d190hR12eqoVMdL4=
SIZE (gnome/zenity-3.6.0.tar.xz) = 3636432

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_progress_c,v 1.7 2012/03/29 11:44:21 ajacoutot Exp $
$OpenBSD: patch-src_progress_c,v 1.8 2012/09/27 08:00:06 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=653468
--auto-close broken by fix for #540560
--- src/progress.c.orig Tue Aug 16 15:52:42 2011
+++ src/progress.c Thu Mar 29 13:42:33 2012
@@ -183,7 +183,7 @@ zenity_progress_handle_stdin (GIOChannel *channel,
--- src/progress.c.orig Wed Sep 26 00:46:11 2012
+++ src/progress.c Wed Sep 26 09:22:29 2012
@@ -179,7 +179,7 @@ zenity_progress_handle_stdin (GIOChannel *channel,
g_string_free (string, TRUE);
}

View File

@ -1,32 +1,11 @@
$OpenBSD: patch-src_tree_c,v 1.5 2012/09/19 12:53:11 jasper Exp $
From 4a30be17b3adfd7b8383f5c23fae71e31933326b Mon Sep 17 00:00:00 2001
From: Arx Cruz <arxcruz@gnome.org>
Date: Tue, 17 Apr 2012 19:50:52 +0000
Subject: Bug #673529 Fix segmentation fault in --list option
$OpenBSD: patch-src_tree_c,v 1.6 2012/09/27 08:00:06 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=653468
--auto-close broken by fix for #540560
--- src/tree.c.orig Fri Mar 23 14:46:09 2012
+++ src/tree.c Wed Sep 19 14:43:33 2012
@@ -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;
@@ -187,7 +187,7 @@ zenity_tree_handle_stdin (GIOChannel *channel,
--- src/tree.c.orig Wed Sep 26 00:46:11 2012
+++ src/tree.c Wed Sep 26 09:22:29 2012
@@ -225,7 +225,7 @@ zenity_tree_handle_stdin (GIOChannel *channel,
g_string_free (string, TRUE);
}
@ -35,12 +14,3 @@ https://bugzilla.gnome.org/show_bug.cgi?id=653468
g_io_channel_shutdown (channel, TRUE, NULL);
return FALSE;
}
@@ -645,7 +645,7 @@ zenity_tree_dialog_response (GtkWidget *widget, int re
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 ();

File diff suppressed because it is too large Load Diff