[pkgsrc/trunk]: pkgsrc/misc/xrolodex PR 52248 Michael L. Riechers: xrolodex d...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b50f4a855af6
branches:  trunk
changeset: 379320:b50f4a855af6
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Apr 29 03:56:08 2018 +0000

description:
PR 52248 Michael L. Riechers: xrolodex dumps core on 64-bit machines
While here, fix some pkglint.

diffstat:

 misc/xrolodex/PLIST                  |   4 ++--
 misc/xrolodex/distinfo               |   6 ++++--
 misc/xrolodex/patches/patch-aa       |   4 +++-
 misc/xrolodex/patches/patch-editor.c |  24 ++++++++++++++++++++++++
 misc/xrolodex/patches/patch-xrolo.h  |  14 ++++++++++++++
 5 files changed, 47 insertions(+), 5 deletions(-)

diffs (82 lines):

diff -r a5aad8835958 -r b50f4a855af6 misc/xrolodex/PLIST
--- a/misc/xrolodex/PLIST       Sun Apr 29 03:41:42 2018 +0000
+++ b/misc/xrolodex/PLIST       Sun Apr 29 03:56:08 2018 +0000
@@ -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 -r a5aad8835958 -r b50f4a855af6 misc/xrolodex/distinfo
--- a/misc/xrolodex/distinfo    Sun Apr 29 03:41:42 2018 +0000
+++ b/misc/xrolodex/distinfo    Sun Apr 29 03:56:08 2018 +0000
@@ -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 -r a5aad8835958 -r b50f4a855af6 misc/xrolodex/patches/patch-aa
--- a/misc/xrolodex/patches/patch-aa    Sun Apr 29 03:41:42 2018 +0000
+++ b/misc/xrolodex/patches/patch-aa    Sun Apr 29 03:56:08 2018 +0000
@@ -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 -r a5aad8835958 -r b50f4a855af6 misc/xrolodex/patches/patch-editor.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/xrolodex/patches/patch-editor.c      Sun Apr 29 03:56:08 2018 +0000
@@ -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 -r a5aad8835958 -r b50f4a855af6 misc/xrolodex/patches/patch-xrolo.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/xrolodex/patches/patch-xrolo.h       Sun Apr 29 03:56:08 2018 +0000
@@ -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"