summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjoerg <joerg>2013-12-15 19:49:36 +0000
committerjoerg <joerg>2013-12-15 19:49:36 +0000
commit1466395d246de118fe001d9db73d70cf6744e393 (patch)
tree92433c45a589795c1b6f895118cb5a7de3d52307 /textproc
parentac4020fe697e4ac9b7922905bad0a4cb82db4237 (diff)
downloadpkgsrc-1466395d246de118fe001d9db73d70cf6744e393.tar.gz
g_message is a function in GTK now, so use a different name.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/ebview/distinfo3
-rw-r--r--textproc/ebview/patches/patch-src_dialog.c49
2 files changed, 51 insertions, 1 deletions
diff --git a/textproc/ebview/distinfo b/textproc/ebview/distinfo
index 5e64d6bec9e..6de1b6d7e38 100644
--- a/textproc/ebview/distinfo
+++ b/textproc/ebview/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2012/06/25 11:47:22 joerg Exp $
+$NetBSD: distinfo,v 1.4 2013/12/15 19:49:36 joerg Exp $
SHA1 (ebview-0.3.6.tar.gz) = 47b63fb2f265c83cc5bf7aeb92f96d0e1cc7f9af
RMD160 (ebview-0.3.6.tar.gz) = c32de00be68c13794f2c1d9c08edc34fc5dcb613
@@ -8,4 +8,5 @@ SHA1 (patch-ab) = ffedc7cc8b931f63f5a661314ef3703f88498434
SHA1 (patch-ac) = 642df47bfd8bd421ec3788e6054397c2a52f49ab
SHA1 (patch-ad) = d8c111b61ac1100caf6963c26e485c42616702f8
SHA1 (patch-ae) = 71043b455d7c0ea4ef237d3ab7c1c2d6f8e91f92
+SHA1 (patch-src_dialog.c) = 03d6a3c74d68b6fd67e0d8fac507b3f91e39a7f2
SHA1 (patch-src_jcode.h) = d2e581467808f6f1d0feb4bc8af2b0c5f64bf104
diff --git a/textproc/ebview/patches/patch-src_dialog.c b/textproc/ebview/patches/patch-src_dialog.c
new file mode 100644
index 00000000000..6fe008cca28
--- /dev/null
+++ b/textproc/ebview/patches/patch-src_dialog.c
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_dialog.c,v 1.1 2013/12/15 19:49:36 joerg Exp $
+
+--- src/dialog.c.orig 2013-12-15 15:25:57.000000000 +0000
++++ src/dialog.c
+@@ -25,7 +25,7 @@
+ #include "statusbar.h"
+
+ gboolean active=FALSE;
+-static gchar g_message[1024];
++static gchar my_message[1024];
+
+ void center_dialog(GtkWidget *window, GtkWidget *dialog){
+ gint window_x, window_y;
+@@ -69,7 +69,7 @@ gboolean idle_warning(gpointer data){
+ GTK_DIALOG_DESTROY_WITH_PARENT /* | GTK_DIALOG_NO_SEPARATOR */,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_OK,
+- g_message);
++ my_message);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+ active = FALSE;
+@@ -98,7 +98,7 @@ gboolean idle_error(gpointer data){
+ GTK_DIALOG_DESTROY_WITH_PARENT /* | GTK_DIALOG_NO_SEPARATOR */,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+- g_message);
++ my_message);
+
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+@@ -114,7 +114,7 @@ void popup_warning(char *message){
+ LOG(LOG_DEBUG, "IN : popup_warning");
+
+ g_idle_add(idle_warning, (gpointer)message);
+- strcpy(g_message, message);
++ strcpy(my_message, message);
+
+ LOG(LOG_DEBUG, "OUT : popup_warning");
+ }
+@@ -123,7 +123,7 @@ void popup_error(char *message){
+
+ LOG(LOG_DEBUG, "IN : popup_error");
+
+- strcpy(g_message, message);
++ strcpy(my_message, message);
+
+ g_idle_add(idle_error, (gpointer)message);
+