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

- update zenity to 2.30.0

Browse Source 
* the --nocancel stuff still hasn't been integrated into this release..
This commit is contained in:
jasper 2010-04-20 18:20:14 +00:00
parent b6a56837e1
commit e4f55395d1
6 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/gnome/zenity/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.33 2010/03/22 22:40:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.34 2010/04/20 18:20:14 jasper Exp $
COMMENT= dialogs for GNOME
GNOME_PROJECT= zenity
GNOME_VERSION= 2.28.0
PKGNAME= ${DISTNAME}p0
GNOME_VERSION= 2.30.0
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -17,7 +16,7 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 expat
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
WANTLIB += pthread pthread-stubs xcb z
WANTLIB += pthread pthread-stubs xcb xcb-render xcb-render-util z
MODULES= devel/gettext \
x11/gnome

10
x11/gnome/zenity/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/zenity-2.28.0.tar.bz2) = JixHauu/Z6cEPNgMagOt0w==
RMD160 (gnome/zenity-2.28.0.tar.bz2) = nIQc6pkVVDFJE86a3WRoa0EukZI=
SHA1 (gnome/zenity-2.28.0.tar.bz2) = WueIrbFTa/c+Ju0f3o9N0qT0ExA=
SHA256 (gnome/zenity-2.28.0.tar.bz2) = N0eiPORrDuaOYmHWaa5GHw9GDZxq0Z4ErL1Rjd/MjGM=
SIZE (gnome/zenity-2.28.0.tar.bz2) = 3095956
MD5 (gnome/zenity-2.30.0.tar.bz2) = FbovJ9Xhp5yZbl5T4W9DgA==
RMD160 (gnome/zenity-2.30.0.tar.bz2) = ql5IKmafwxfl4KVh+FWszcLGoXM=
SHA1 (gnome/zenity-2.30.0.tar.bz2) = pVsMfiUc34Nd0DtUWqfJb37wI4Q=
SHA256 (gnome/zenity-2.30.0.tar.bz2) = 1Cqb5vd+sBj7jFlnCU24ZgQnHzQt0VtuYQEzjYL5I/8=
SIZE (gnome/zenity-2.30.0.tar.bz2) = 3095111

18
x11/gnome/zenity/patches/patch-src_option_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_option_c,v 1.1 2010/03/22 22:40:36 ajacoutot Exp $
$OpenBSD: patch-src_option_c,v 1.2 2010/04/20 18:20:15 jasper Exp $
Implement --nocancel
ETA GNOME 2.30, see:
ETA was GNOME 2.30, see:
http://bugzilla-attachments.gnome.org/attachment.cgi?id=152711
--- src/option.c.orig Mon Sep 21 16:11:11 2009
+++ src/option.c Mon Feb 8 15:29:25 2010
@@ -85,6 +85,7 @@ static int zenity_progress_percentage;
--- src/option.c.orig Sun Mar 28 22:55:43 2010
+++ src/option.c Tue Apr 20 20:10:02 2010
@@ -86,6 +86,7 @@ static int zenity_progress_percentage;
static gboolean zenity_progress_pulsate;
static gboolean zenity_progress_auto_close;
static gboolean zenity_progress_auto_kill;
@ -14,7 +14,7 @@ ETA GNOME 2.30, see:
/* Question Dialog Options */
static gboolean zenity_question_active;
@@ -597,6 +598,16 @@ static GOptionEntry progress_options[] = {
@@ -607,6 +608,16 @@ static GOptionEntry progress_options[] = {
N_("Kill parent process if cancel button is pressed"),
NULL
},
@ -31,7 +31,7 @@ ETA GNOME 2.30, see:
{
NULL
}
@@ -1039,7 +1050,7 @@ zenity_progress_pre_callback (GOptionContext *context,
@@ -1050,7 +1061,7 @@ zenity_progress_pre_callback (GOptionContext *context,
zenity_progress_pulsate = FALSE;
zenity_progress_auto_close = FALSE;
zenity_progress_auto_kill = FALSE;
@ -40,7 +40,7 @@ ETA GNOME 2.30, see:
return TRUE;
}
@@ -1354,6 +1365,7 @@ zenity_progress_post_callback (GOptionContext *context
@@ -1370,6 +1381,7 @@ zenity_progress_post_callback (GOptionContext *context
results->progress_data->autoclose = zenity_progress_auto_close;
results->progress_data->autokill = zenity_progress_auto_kill;
results->progress_data->percentage = zenity_progress_percentage;
@ -48,7 +48,7 @@ ETA GNOME 2.30, see:
} else {
if (zenity_progress_pulsate)
zenity_option_error (zenity_option_get_name (progress_options, &zenity_progress_pulsate),
@@ -1370,6 +1382,9 @@ zenity_progress_post_callback (GOptionContext *context
@@ -1386,6 +1398,9 @@ zenity_progress_post_callback (GOptionContext *context
if (zenity_progress_auto_kill)
zenity_option_error (zenity_option_get_name (progress_options, &zenity_progress_auto_kill),
ERROR_SUPPORT);

16
x11/gnome/zenity/patches/patch-src_progress_c
View File

@ -1,21 +1,21 @@
$OpenBSD: patch-src_progress_c,v 1.1 2010/03/22 22:40:36 ajacoutot Exp $
$OpenBSD: patch-src_progress_c,v 1.2 2010/04/20 18:20:15 jasper Exp $
Implement --nocancel
ETA GNOME 2.30, see:
ETA was GNOME 2.30, see:
http://bugzilla-attachments.gnome.org/attachment.cgi?id=152711
--- src/progress.c.orig Mon Sep 21 16:11:11 2009
+++ src/progress.c Mon Feb 8 15:29:28 2010
@@ -37,6 +37,8 @@ static ZenityData *zen_data;
static GIOChannel *channel;
--- src/progress.c.orig Sun Mar 28 22:55:43 2010
+++ src/progress.c Tue Apr 20 20:10:02 2010
@@ -38,6 +38,8 @@ static GIOChannel *channel;
static gint pulsate_timeout = -1;
static gboolean autokill;
+static gboolean no_cancel;
+static gboolean auto_close;
gint zenity_progress_timeout (gpointer data);
gint zenity_progress_pulsate_timeout (gpointer data);
@@ -179,6 +181,7 @@ zenity_progress (ZenityData *data, ZenityProgressData
@@ -227,6 +229,7 @@ zenity_progress (ZenityData *data, ZenityProgressData
GtkWidget *dialog;
GObject *text;
GObject *progress_bar;
@ -23,7 +23,7 @@ ETA GNOME 2.30, see:
zen_data = data;
builder = zenity_util_load_ui_file ("zenity_progress_dialog", NULL);
@@ -216,6 +219,20 @@ zenity_progress (ZenityData *data, ZenityProgressData
@@ -264,6 +267,20 @@ zenity_progress (ZenityData *data, ZenityProgressData
progress_data->percentage/100.0);
autokill = progress_data->autokill;

4
x11/gnome/zenity/patches/patch-src_zenity_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_zenity_h,v 1.1 2010/03/22 22:40:36 ajacoutot Exp $
$OpenBSD: patch-src_zenity_h,v 1.2 2010/04/20 18:20:15 jasper Exp $
Implement --nocancel
ETA GNOME 2.30, see:
ETA was GNOME 2.30, see:
http://bugzilla-attachments.gnome.org/attachment.cgi?id=152711
--- src/zenity.h.orig Mon Sep 21 16:11:11 2009

6
x11/gnome/zenity/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2009/10/11 12:44:23 jasper Exp $
@comment $OpenBSD: PLIST,v 1.16 2010/04/20 18:20:15 jasper Exp $
bin/gdialog
@bin bin/zenity
@man man/man1/zenity.1
@ -231,6 +231,7 @@ share/gnome/help/zenity/uk/zenity.xml
share/locale/am/LC_MESSAGES/zenity.mo
share/locale/ar/LC_MESSAGES/zenity.mo
share/locale/as/LC_MESSAGES/zenity.mo
share/locale/ast/LC_MESSAGES/zenity.mo
share/locale/az/LC_MESSAGES/zenity.mo
share/locale/be/LC_MESSAGES/zenity.mo
share/locale/be@latin/LC_MESSAGES/zenity.mo
@ -246,6 +247,7 @@ share/locale/da/LC_MESSAGES/zenity.mo
share/locale/de/LC_MESSAGES/zenity.mo
share/locale/dz/LC_MESSAGES/zenity.mo
share/locale/el/LC_MESSAGES/zenity.mo
share/locale/en@shaw/LC_MESSAGES/zenity.mo
share/locale/en_CA/LC_MESSAGES/zenity.mo
share/locale/en_GB/LC_MESSAGES/zenity.mo
share/locale/es/LC_MESSAGES/zenity.mo
@ -289,8 +291,6 @@ share/locale/oc/LC_MESSAGES/zenity.mo
share/locale/or/LC_MESSAGES/zenity.mo
share/locale/pa/LC_MESSAGES/zenity.mo
share/locale/pl/LC_MESSAGES/zenity.mo
share/locale/ps/
share/locale/ps/LC_MESSAGES/
share/locale/ps/LC_MESSAGES/zenity.mo
share/locale/pt/LC_MESSAGES/zenity.mo
share/locale/pt_BR/LC_MESSAGES/zenity.mo