diff options
author | dholland <dholland@pkgsrc.org> | 2018-04-29 03:56:08 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2018-04-29 03:56:08 +0000 |
commit | 1f157950ea4c5d22ced3ceca7ae7af4f29d8ce5a (patch) | |
tree | 664a733455d88dc336cf5f9d02028a18d39512d8 /misc | |
parent | ea1c18d4cef6ec1aba3dbaa17f90eb94908d029d (diff) | |
download | pkgsrc-1f157950ea4c5d22ced3ceca7ae7af4f29d8ce5a.tar.gz |
PR 52248 Michael L. Riechers: xrolodex dumps core on 64-bit machines
While here, fix some pkglint.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/xrolodex/PLIST | 4 | ||||
-rw-r--r-- | misc/xrolodex/distinfo | 6 | ||||
-rw-r--r-- | misc/xrolodex/patches/patch-aa | 4 | ||||
-rw-r--r-- | misc/xrolodex/patches/patch-editor.c | 24 | ||||
-rw-r--r-- | misc/xrolodex/patches/patch-xrolo.h | 14 |
5 files changed, 47 insertions, 5 deletions
diff --git a/misc/xrolodex/PLIST b/misc/xrolodex/PLIST index 3310a7b3be2..7a7fae455bc 100644 --- a/misc/xrolodex/PLIST +++ b/misc/xrolodex/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2003/03/04 04:15:24 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.4 2018/04/29 03:56:08 dholland Exp $ bin/xrolodex -${IMAKE_MAN_DIR}/xrolodex.${IMAKE_MANNEWSUFFIX} +${IMAKE_MAN_DIR}/xrolodex.${IMAKE_MAN_SUFFIX} lib/X11/app-defaults/XRolodex diff --git a/misc/xrolodex/distinfo b/misc/xrolodex/distinfo index 68971b8b67d..609f6a6e83c 100644 --- a/misc/xrolodex/distinfo +++ b/misc/xrolodex/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.5 2015/11/03 23:49:55 agc Exp $ +$NetBSD: distinfo,v 1.6 2018/04/29 03:56:08 dholland Exp $ SHA1 (xrolodex.1.5.motif.tar.Z) = fe263c22afc7d5375de00689c7e7c157f49a628a RMD160 (xrolodex.1.5.motif.tar.Z) = 73ac6a1c832cfdea12f5224c858ed758ec3ed97e SHA512 (xrolodex.1.5.motif.tar.Z) = e59001b1c7b0440f3476310f443b1fb374dcdf19b10a6ccab6adb98fdafba6833dc2c9c07a9bc0653bd344fa4975f4cb2d5992c42bdcc8d77a19f12725cf19a3 Size (xrolodex.1.5.motif.tar.Z) = 126075 bytes -SHA1 (patch-aa) = 5beaf958ad6af7a3c25ee21104e86bbd6079acd5 +SHA1 (patch-aa) = a719e7a6c9415f1b51d19aae64d6b633eb7b014c +SHA1 (patch-editor.c) = 529fa624b5991aa8df447a47e8f2b2c28b41fad8 +SHA1 (patch-xrolo.h) = 0cb7ce6f8eac804fa34b84539a233394161a3d3f diff --git a/misc/xrolodex/patches/patch-aa b/misc/xrolodex/patches/patch-aa index bf9d98b0292..0abc8ab9951 100644 --- a/misc/xrolodex/patches/patch-aa +++ b/misc/xrolodex/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2007/07/28 00:47:48 joerg Exp $ +$NetBSD: patch-aa,v 1.2 2018/04/29 03:56:08 dholland Exp $ + +Use standard headers. --- streamdbP.h.orig 2007-07-28 00:28:43.000000000 +0000 +++ streamdbP.h diff --git a/misc/xrolodex/patches/patch-editor.c b/misc/xrolodex/patches/patch-editor.c new file mode 100644 index 00000000000..a4de2537e4d --- /dev/null +++ b/misc/xrolodex/patches/patch-editor.c @@ -0,0 +1,24 @@ +$NetBSD: patch-editor.c,v 1.1 2018/04/29 03:56:08 dholland Exp $ + +Fix LP64 issue. + +--- editor.c~ 1996-01-30 23:36:29.000000000 +0000 ++++ editor.c +@@ -801,7 +801,7 @@ XmAnyCallbackStruct *call_data; + { + Editor eObject = (Editor) client_data; + long item_id; +- int data_id; ++ long data_id; + char *buffer = ""; /* null string */ + XmString clip_label = XmStringCreateSimple(eObject->app_name); + +@@ -1007,7 +1007,7 @@ Time time_stamp; + { + char *selection; + long item_id; +- int data_id; ++ long data_id; + Display *dpy = XtDisplay(eObject->edit); + Window win = XtWindow(eObject->edit); + XmString clip_label = XmStringCreateSimple(eObject->app_name); diff --git a/misc/xrolodex/patches/patch-xrolo.h b/misc/xrolodex/patches/patch-xrolo.h new file mode 100644 index 00000000000..54631ccbd11 --- /dev/null +++ b/misc/xrolodex/patches/patch-xrolo.h @@ -0,0 +1,14 @@ +$NetBSD: patch-xrolo.h,v 1.1 2018/04/29 03:56:08 dholland Exp $ + +Use correct includes, fixing LP64 issues (see PR 52248) + +--- xrolo.h~ 1996-01-30 23:36:29.000000000 +0000 ++++ xrolo.h +@@ -36,6 +36,7 @@ See these modules for more details. + #include <Xm/RowColumn.h> + #include <Xm/Separator.h> + #include <Xm/Protocols.h> ++#include <Xm/FileSB.h> + + #include "ctrlpanel.h" + #include "listshell.h" |