cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert a commit that fixed a corner case, to fix --auto-close support

Browse Source
This commit is contained in:
jasper 2011-06-27 08:10:09 +00:00
parent 18c9c511fd
commit 521e1e18ec
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome3/x11/gnome/zenity/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2011/05/17 14:11:30 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.3 2011/06/27 08:10:09 jasper Exp $
COMMENT= dialogs for GNOME COMMENT= dialogs for GNOME
GNOME_PROJECT= zenity GNOME_PROJECT= zenity
GNOME_VERSION= 3.0.0 GNOME_VERSION= 3.0.0
REVISION= 1 REVISION= 2
# LGPLv2 # LGPLv2
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes

20
x11/gnome3/x11/gnome/zenity/patches/patch-src_progress_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_progress_c,v 1.1 2011/06/27 08:10:09 jasper Exp $
Revert this commit as it breaks --auto-close:
From ef3a33a142620fee850351d14f4a1c191fc6e273 Mon Sep 17 00:00:00 2001
From: Arx Cruz <arxcruz@src.gnome.org>
Date: Mon, 03 Jan 2011 00:57:42 +0000
Subject: Fix for bug 540560.
--- src/progress.c.orig Tue Apr 5 00:34:20 2011
+++ src/progress.c Mon Jun 27 10:03:32 2011
@@ -183,7 +183,7 @@ zenity_progress_handle_stdin (GIOChannel *channel,
g_string_free (string, TRUE);
}
- if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
+ if (condition != G_IO_IN) {
/* We assume that we are done, so stop the pulsating and de-sensitize the buttons */
GtkWidget *button;

20
x11/gnome3/x11/gnome/zenity/patches/patch-src_tree_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_tree_c,v 1.1 2011/06/27 08:10:09 jasper Exp $
Revert this commit as it breaks --auto-close:
From ef3a33a142620fee850351d14f4a1c191fc6e273 Mon Sep 17 00:00:00 2001
From: Arx Cruz <arxcruz@src.gnome.org>
Date: Mon, 03 Jan 2011 00:57:42 +0000
Subject: Fix for bug 540560.
--- src/tree.c.orig Tue Apr 5 00:34:20 2011
+++ src/tree.c Mon Jun 27 10:03:32 2011
@@ -180,7 +180,7 @@ zenity_tree_handle_stdin (GIOChannel *channel,
g_string_free (string, TRUE);
}
- if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
+ if (condition != G_IO_IN) {
g_io_channel_shutdown (channel, TRUE, NULL);
return FALSE;
}