[pkgsrc/trunk]: pkgsrc/archivers/cxunzip patch-ab: pass fp expects signature ...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f31abb2876d
branches:  trunk
changeset: 462627:4f31abb2876d
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Mon Oct 06 12:33:03 2003 +0000

description:
patch-ab: pass fp expects signature with gpointer not App *.
patch-ac: remove bad casts and make static

Should resolve pr pkg/23073.
Patches approved by Johnny C. Lam.

diffstat:

 archivers/cxunzip/distinfo         |   4 ++-
 archivers/cxunzip/patches/patch-ab |  11 ++++++++
 archivers/cxunzip/patches/patch-ac |  48 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletions(-)

diffs (79 lines):

diff -r a5ea3c83127f -r 4f31abb2876d archivers/cxunzip/distinfo
--- a/archivers/cxunzip/distinfo        Mon Oct 06 11:35:31 2003 +0000
+++ b/archivers/cxunzip/distinfo        Mon Oct 06 12:33:03 2003 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/25 02:42:32 fredb Exp $
+$NetBSD: distinfo,v 1.2 2003/10/06 12:33:03 rtr Exp $
 
 SHA1 (cxunzip-0.96.tar.gz) = 5c639c344a8a3a05ab33419d1b1f66b99ac460a4
 Size (cxunzip-0.96.tar.gz) = 185785 bytes
 SHA1 (patch-aa) = 1738c34f3a0ca48f8651228b72e044b32872d6a1
+SHA1 (patch-ab) = 4850d910d93a17f7be0987a76eb209f777955f9d
+SHA1 (patch-ac) = 7b97e5faf824c5347ace88ff8bbddf6404390238
diff -r a5ea3c83127f -r 4f31abb2876d archivers/cxunzip/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/cxunzip/patches/patch-ab        Mon Oct 06 12:33:03 2003 +0000
@@ -0,0 +1,11 @@
+--- src/app.cc.orig    2003-10-06 21:17:24.000000000 +1000
++++ src/app.cc 2003-10-06 21:17:32.000000000 +1000
+@@ -215,7 +215,7 @@
+ 
+       dialog=gnome_request_dialog(FALSE,_("View file with program"),
+                                   program,1024,
+-                                  view_dialog_clicked_callback,app,
++                                  (void (*)(gchar*, gpointer))view_dialog_clicked_callback,app,
+                                   NULL);
+       g_free(program);
+       gtk_widget_show(dialog);
diff -r a5ea3c83127f -r 4f31abb2876d archivers/cxunzip/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/cxunzip/patches/patch-ac        Mon Oct 06 12:33:03 2003 +0000
@@ -0,0 +1,48 @@
+--- src/menu.hh.orig   2003-10-06 21:18:37.000000000 +1000
++++ src/menu.hh        2003-10-06 21:18:43.000000000 +1000
+@@ -38,34 +38,34 @@
+       GNOMEUIINFO_END
+ };
+ 
+-GnomeUIInfo actionsmenu[] = {
+-      (GnomeUIInfo){GNOME_APP_UI_ITEM,
++static GnomeUIInfo actionsmenu[] = {
++      {GNOME_APP_UI_ITEM,
+                     N_("_Uncompress..."),N_("Uncompress archive"),
+-                    uncompress_file_callback,NULL,NULL,
++                    (gpointer)uncompress_file_callback,NULL,NULL,
+                     GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_CONVERT,
+                     'U',GDK_CONTROL_MASK,NULL},
+-      (GnomeUIInfo){GNOME_APP_UI_ITEM,
++      {GNOME_APP_UI_ITEM,
+                     N_("_View..."),N_("View selected file from archive"),
+-                    view_callback,NULL,NULL,
++                    (gpointer)view_callback,NULL,NULL,
+                     GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_INDEX,
+                     'V',GDK_CONTROL_MASK,NULL},
+-      (GnomeUIInfo){GNOME_APP_UI_ITEM,
++      {GNOME_APP_UI_ITEM,
+                     N_("_Test..."),N_("Test archive"),
+-                    test_archive_callback,NULL,NULL,
++                    (gpointer)test_archive_callback,NULL,NULL,
+                     GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_SEARCH,
+                     'T',GDK_CONTROL_MASK,NULL},
+       GNOMEUIINFO_END
+ };
+ 
+-GnomeUIInfo helpmenu[] = {
+-      (GnomeUIInfo){GNOME_APP_UI_ITEM,
++static GnomeUIInfo helpmenu[] = {
++      {GNOME_APP_UI_ITEM,
+                     _("_About..."),NULL,
+-                    about_callback,NULL,NULL,
++                    (gpointer)about_callback,NULL,NULL,
+                     GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_ABOUT,
+                     0,(GdkModifierType)0,NULL},
+       /*  GNOMEUIINFO_SEPARATOR,
+           GNOMEUIINFO_HELP("cxunzip"), */
+-      GNOMEUIINFO_END,
++      GNOMEUIINFO_END
+ };
+ 
+ GnomeUIInfo mainmenu[] = {