diff options
| author | rtr <rtr@pkgsrc.org> | 2003-10-06 12:33:03 +0000 |
|---|---|---|
| committer | rtr <rtr@pkgsrc.org> | 2003-10-06 12:33:03 +0000 |
| commit | 37cec2c730317d63ca904444f719583d4dc3c8ee (patch) | |
| tree | 76eb5a1a12a2dd12372ce0601bb059e84da69ca2 /archivers | |
| parent | 21f15bdc919cc91eee58da477f600eb40c9bb7fb (diff) | |
| download | pkgsrc-37cec2c730317d63ca904444f719583d4dc3c8ee.tar.gz | |
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 (limited to 'archivers')
| -rw-r--r-- | archivers/cxunzip/distinfo | 4 | ||||
| -rw-r--r-- | archivers/cxunzip/patches/patch-ab | 11 | ||||
| -rw-r--r-- | archivers/cxunzip/patches/patch-ac | 48 |
3 files changed, 62 insertions, 1 deletions
diff --git a/archivers/cxunzip/distinfo b/archivers/cxunzip/distinfo index ca984811f02..2bd7c68f81c 100644 --- a/archivers/cxunzip/distinfo +++ b/archivers/cxunzip/distinfo @@ -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 --git a/archivers/cxunzip/patches/patch-ab b/archivers/cxunzip/patches/patch-ab new file mode 100644 index 00000000000..d1aa6d2ec30 --- /dev/null +++ b/archivers/cxunzip/patches/patch-ab @@ -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 --git a/archivers/cxunzip/patches/patch-ac b/archivers/cxunzip/patches/patch-ac new file mode 100644 index 00000000000..6c5193025ec --- /dev/null +++ b/archivers/cxunzip/patches/patch-ac @@ -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[] = { |