- update zenity to 2.32.0
- remove unneeded patches as it's part of upstream releases now ok aja@
This commit is contained in:
jasper
parent
a03e6c54a7
commit
a8d28637b9
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.37 2010/07/25 08:15:33 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.38 2010/09/30 07:47:13 jasper Exp $
|
||||
|
||||
COMMENT= dialogs for GNOME
|
||||
|
||||
GNOME_PROJECT= zenity
|
||||
GNOME_VERSION= 2.30.0
|
||||
REVISION= 1
|
||||
GNOME_VERSION= 2.32.0
|
||||
|
||||
# LGPLv2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
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
|
||||
MD5 (gnome/zenity-2.32.0.tar.bz2) = OrelCBHiDpdQ3Esy/WPDew==
|
||||
RMD160 (gnome/zenity-2.32.0.tar.bz2) = fPnOLXIfYHd7ZhXNJiGZVrh+DR0=
|
||||
SHA1 (gnome/zenity-2.32.0.tar.bz2) = LUY+ttnPVkPlVCnXs5wTK+ImxjQ=
|
||||
SHA256 (gnome/zenity-2.32.0.tar.bz2) = kXUWdqAZQuxEV4YiXlzMHEug7TDTO4sXfhzbAUtOOu8=
|
||||
SIZE (gnome/zenity-2.32.0.tar.bz2) = 3112533
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
$OpenBSD: patch-src_option_c,v 1.3 2010/05/03 08:49:08 jasper Exp $
|
||||
|
||||
Implement --no-cancel
|
||||
ETA was GNOME 2.30, see:
|
||||
http://bugzilla-attachments.gnome.org/attachment.cgi?id=152711
|
||||
|
||||
--- 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;
|
||||
+static gboolean zenity_progress_no_cancel;
|
||||
|
||||
/* Question Dialog Options */
|
||||
static gboolean zenity_question_active;
|
||||
@@ -607,6 +608,16 @@ static GOptionEntry progress_options[] = {
|
||||
N_("Kill parent process if cancel button is pressed"),
|
||||
NULL
|
||||
},
|
||||
+ {
|
||||
+ "no-cancel",
|
||||
+ '\0',
|
||||
+ 0,
|
||||
+ G_OPTION_ARG_NONE,
|
||||
+ &zenity_progress_no_cancel,
|
||||
+ /* xgettext: no-c-format */
|
||||
+ N_("Hide cancel button"),
|
||||
+ NULL
|
||||
+ },
|
||||
{
|
||||
NULL
|
||||
}
|
||||
@@ -1050,7 +1061,7 @@ zenity_progress_pre_callback (GOptionContext *context,
|
||||
zenity_progress_pulsate = FALSE;
|
||||
zenity_progress_auto_close = FALSE;
|
||||
zenity_progress_auto_kill = FALSE;
|
||||
-
|
||||
+ zenity_progress_no_cancel = FALSE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
+ results->progress_data->no_cancel = zenity_progress_no_cancel;
|
||||
} else {
|
||||
if (zenity_progress_pulsate)
|
||||
zenity_option_error (zenity_option_get_name (progress_options, &zenity_progress_pulsate),
|
||||
@@ -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);
|
||||
+ if (zenity_progress_no_cancel)
|
||||
+ zenity_option_error (zenity_option_get_name (progress_options, &zenity_progress_no_cancel),
|
||||
+ ERROR_SUPPORT);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
@ -1,46 +0,0 @@
|
||||
$OpenBSD: patch-src_progress_c,v 1.3 2010/05/03 08:49:08 jasper Exp $
|
||||
|
||||
Implement --no-cancel
|
||||
ETA was GNOME 2.30, see:
|
||||
http://bugzilla-attachments.gnome.org/attachment.cgi?id=152711
|
||||
|
||||
--- 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);
|
||||
@@ -227,6 +229,7 @@ zenity_progress (ZenityData *data, ZenityProgressData
|
||||
GtkWidget *dialog;
|
||||
GObject *text;
|
||||
GObject *progress_bar;
|
||||
+ GObject *cancel_button,*ok_button;
|
||||
|
||||
zen_data = data;
|
||||
builder = zenity_util_load_ui_file ("zenity_progress_dialog", NULL);
|
||||
@@ -264,6 +267,20 @@ zenity_progress (ZenityData *data, ZenityProgressData
|
||||
progress_data->percentage/100.0);
|
||||
|
||||
autokill = progress_data->autokill;
|
||||
+
|
||||
+ auto_close = progress_data->autoclose;
|
||||
+ ok_button = gtk_builder_get_object (builder, "zenity_progress_ok_button");
|
||||
+
|
||||
+ no_cancel = progress_data->no_cancel;
|
||||
+ cancel_button = gtk_builder_get_object (builder, "zenity_progress_cancel_button");
|
||||
+
|
||||
+ if (no_cancel) {
|
||||
+ gtk_widget_hide (GTK_WIDGET(cancel_button));
|
||||
+ gtk_window_set_deletable (GTK_WINDOW (dialog), FALSE);
|
||||
+ }
|
||||
+
|
||||
+ if (no_cancel && auto_close)
|
||||
+ gtk_widget_hide(GTK_WIDGET(ok_button));
|
||||
|
||||
zenity_util_show_dialog (dialog);
|
||||
zenity_progress_read_info (progress_data);
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-src_zenity_h,v 1.3 2010/05/03 08:49:08 jasper Exp $
|
||||
|
||||
Implement --no-cancel
|
||||
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
|
||||
+++ src/zenity.h Mon Feb 8 15:29:32 2010
|
||||
@@ -98,6 +98,7 @@ typedef struct {
|
||||
gboolean autoclose;
|
||||
gboolean autokill;
|
||||
gdouble percentage;
|
||||
+ gboolean no_cancel;
|
||||
} ZenityProgressData;
|
||||
|
||||
typedef struct {
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.16 2010/04/20 18:20:15 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.17 2010/09/30 07:47:14 jasper Exp $
|
||||
bin/gdialog
|
||||
@bin bin/zenity
|
||||
@man man/man1/zenity.1
|
||||
@ -228,6 +228,20 @@ share/gnome/help/zenity/uk/figures/zenity-question-screenshot.png
|
||||
share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png
|
||||
share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png
|
||||
share/gnome/help/zenity/uk/zenity.xml
|
||||
share/gnome/help/zenity/zh_CN/
|
||||
share/gnome/help/zenity/zh_CN/figures/
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-calendar-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-entry-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-error-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-fileselection-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-information-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-list-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-notification-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-progress-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-question-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-text-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/figures/zenity-warning-screenshot.png
|
||||
share/gnome/help/zenity/zh_CN/zenity.xml
|
||||
share/locale/am/LC_MESSAGES/zenity.mo
|
||||
share/locale/ar/LC_MESSAGES/zenity.mo
|
||||
share/locale/as/LC_MESSAGES/zenity.mo
|
||||
@ -332,6 +346,7 @@ share/omf/zenity/zenity-pt_BR.omf
|
||||
share/omf/zenity/zenity-ru.omf
|
||||
share/omf/zenity/zenity-sv.omf
|
||||
share/omf/zenity/zenity-uk.omf
|
||||
share/omf/zenity/zenity-zh_CN.omf
|
||||
share/zenity/
|
||||
share/zenity/clothes/
|
||||
share/zenity/clothes/gnome-tshirt.png
|
||||
|
||||
Loading…
Reference in New Issue
Block a user