kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pixmap: Make the program start, pkglint fixes 

pixmap segfaulted on startup, fix implicit
function declarations in build to make it start.
Also fix warning about casting pointer to an int
of different size.
Add comments to some patches.
Set LICENSE.
This commit is contained in:
nros 2024-01-02 20:41:47 +00:00
parent 36e1b405ae
commit 531a985dcf
7 changed files with 181 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/pixmap/Makefile
View File

@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.35 2013/01/19 21:04:43 riastradh Exp $
# $NetBSD: Makefile,v 1.36 2024/01/02 20:41:47 nros Exp $
DISTNAME= pixmap2.6
PKGNAME= pixmap-2.6.4
PKGREVISION= 8
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/pixmap/}
LICENSE= x11
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= pixmap_2.6.patch1.gz \

9
graphics/pixmap/distinfo
View File

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.10 2021/10/26 10:46:41 nia Exp $
$NetBSD: distinfo,v 1.11 2024/01/02 20:41:47 nros Exp $
BLAKE2s (pixmap2.6.tar.gz) = 191d681fd102a90f99369f8def34fc0dbfa5394a180db7eb25076f9dd2bf6a3f
SHA512 (pixmap2.6.tar.gz) = 2943c8f9fdab8fcb979711bbace95595fcccd4b498041016ba7b82fa20ad9fbbba68c7359b3bfe4eb05555b4913ff0316752640f40efe0ace31ff4b401bb008f
@ -15,6 +15,9 @@ Size (pixmap_2.6.patch3.gz) = 10208 bytes
BLAKE2s (pixmap_2.6.patch4.gz) = 6912c8375886d917106c8b662a6eee40cb39ce44a4cf3d0f59567a96e8f65188
SHA512 (pixmap_2.6.patch4.gz) = f30cfe7018a1a16db9f5c2b6c692b082c3ab83a4f79262cfbff2580734a420db4137242e64a83dfabc2dcacfbdea00cd353f3ca4174f23907ff983b3778ff0f5
Size (pixmap_2.6.patch4.gz) = 1269 bytes
SHA1 (patch-aa) = b51ced9659d8360f96d9434d670ad66016e81988
SHA1 (patch-Dialog.c) = a59038561837ff2377277821bcf841c965bab924
SHA1 (patch-PixEdit.c) = 96b9bddb9d4d597176f09527e12f9d6c5de0b748
SHA1 (patch-Pixmap.c) = 7a30b060fb82c617c11e574088898cdec61473a7
SHA1 (patch-aa) = e0912b53bc09dcea4d233aa3a2c63997a53d5c50
SHA1 (patch-ab) = d7da0a7998bbac1e25763eea5a64afb79d98d1e6
SHA1 (patch-ac) = c42f312a041693f2ab94ad7efbbaba7c91cf2c30
SHA1 (patch-ac) = 5872ddb3275e2939152df87596e4bbf0b2ff5e35

104
graphics/pixmap/patches/patch-Dialog.c Normal file
View File

@ -0,0 +1,104 @@
$NetBSD: patch-Dialog.c,v 1.1 2024/01/02 20:41:47 nros Exp $
Fix warning: cast to pointer from integer of different size.
--- Dialog.c.orig 2023-12-26 10:10:12.632499452 +0000
+++ Dialog.c
@@ -82,13 +82,15 @@
extern void unsetKillfromWM();
extern XtAppContext pixmap_context;
+static int okayyes = Okay | Yes;
static int selected;
static void SetSelected(w, client_data, call_data)
Widget w;
XtPointer client_data, call_data;
{
- selected = (int)client_data;
+ int *selectedP = (int*)client_data;
+ selected = *selectedP;
}
#ifdef USE_ATHENA
@@ -156,7 +158,7 @@ Dialog CreateDialog(top_widget, name, op
XtAddCallback(XmSelectionBoxGetChild(popup->dialog_widget,
XmDIALOG_OK_BUTTON),
XmNactivateCallback, SetSelected,
- (XtPointer)dialog_buttons[i].flag);
+ (XtPointer)&dialog_buttons[i].flag);
XmStringFree(xmstr);
break;
case No:
@@ -175,7 +177,7 @@ Dialog CreateDialog(top_widget, name, op
XtAddCallback(XmSelectionBoxGetChild(popup->dialog_widget,
XmDIALOG_APPLY_BUTTON),
XmNactivateCallback, SetSelected,
- (XtPointer)dialog_buttons[i].flag);
+ (XtPointer)&dialog_buttons[i].flag);
XmStringFree(xmstr);
break;
case Cancel:
@@ -195,7 +197,7 @@ Dialog CreateDialog(top_widget, name, op
XtAddCallback(XmSelectionBoxGetChild(popup->dialog_widget,
XmDIALOG_CANCEL_BUTTON),
XmNactivateCallback, SetSelected,
- (XtPointer)dialog_buttons[i].flag);
+ (XtPointer)&dialog_buttons[i].flag);
XmStringFree(xmstr);
break;
}
@@ -211,7 +213,7 @@ Dialog CreateDialog(top_widget, name, op
if (options & dialog_buttons[i].flag)
XawDialogAddButton(popup->dialog_widget,
dialog_buttons[i].name, SetSelected,
- (XtPointer)dialog_buttons[i].flag);
+ (XtPointer)&dialog_buttons[i].flag);
#endif /* USE_ATHENA */
popup->options = options;
@@ -263,7 +265,7 @@ int PopupDialog(popup, message, suggesti
XmDIALOG_TEXT),
XmNactivateCallback);
XtAddCallback(XmSelectionBoxGetChild(popup->dialog_widget,XmDIALOG_TEXT),
- XmNactivateCallback, SetSelected, (XtPointer)(Okay | Yes));
+ XmNactivateCallback, SetSelected, (XtPointer)&okayyes);
}
else XtUnmanageChild(XmSelectionBoxGetChild(popup->dialog_widget,
XmDIALOG_TEXT));
@@ -386,7 +388,7 @@ Dialog CreateFDialog(top_widget, name, o
popup->dialog_widget,
XmDIALOG_OK_BUTTON),
XmNactivateCallback, SetSelected,
- (XtPointer)dialog_buttons[i].flag);
+ (XtPointer)&dialog_buttons[i].flag);
break;
case No:
XtSetArg(wargs[0], XmNlabelString,
@@ -407,7 +409,7 @@ Dialog CreateFDialog(top_widget, name, o
popup->dialog_widget,
XmDIALOG_HELP_BUTTON),
XmNactivateCallback, SetSelected,
- (XtPointer)dialog_buttons[i].flag);
+ (XtPointer)&dialog_buttons[i].flag);
break;
case Cancel:
case Retry:
@@ -429,7 +431,7 @@ Dialog CreateFDialog(top_widget, name, o
popup->dialog_widget,
XmDIALOG_CANCEL_BUTTON),
XmNactivateCallback, SetSelected,
- (XtPointer)dialog_buttons[i].flag);
+ (XtPointer)&dialog_buttons[i].flag);
break;
}
#endif /* USE_ATHENA */
@@ -478,7 +480,7 @@ int PopupFDialog(popup, message, suggest
XmNactivateCallback);
XtAddCallback(XmFileSelectionBoxGetChild(popup->dialog_widget,
XmDIALOG_TEXT),
- XmNactivateCallback, SetSelected, (XtPointer)(Okay | Yes));
+ XmNactivateCallback, SetSelected, (XtPointer)&okayyes);
}
else XtUnmanageChild(XmFileSelectionBoxGetChild(popup->dialog_widget,
XmDIALOG_TEXT));

47
graphics/pixmap/patches/patch-PixEdit.c Normal file
View File

@ -0,0 +1,47 @@
$NetBSD: patch-PixEdit.c,v 1.1 2024/01/02 20:41:47 nros Exp $
Fix implicit function declaration of:
atoi
getenv
exit
XmCreateTextField
XmCreatePanedWindow
XmCreatePushButton
XmCreateScrollBar
XmCreateScrolledText
XmCreateScrolledWindow
XmCreateScrolledWindowSetAreas
XmTextFieldGetString
XmTextGetString
XmTextSetString
--- PixEdit.c.orig 2024-01-02 10:28:23.893459197 +0000
+++ PixEdit.c
@@ -59,6 +59,7 @@ static char rcsid[] = "$Id: PixEdit.c,v
#include <stdio.h>
+#include <stdlib.h>
#include <X11/Intrinsic.h>
#include <X11/Xos.h>
#include <X11/Xfuncs.h>
@@ -68,6 +69,8 @@ static char rcsid[] = "$Id: PixEdit.c,v
#ifndef USE_ATHENA
#include <Xm/Xm.h>
#include <Xm/RowColumn.h>
+#include <Xm/PanedW.h>
+#include <Xm/PushB.h>
#include <Xm/PushBG.h>
#include <Xm/SeparatoG.h>
#include <Xm/ToggleBG.h>
@@ -75,6 +78,10 @@ static char rcsid[] = "$Id: PixEdit.c,v
#include <Xm/Form.h>
#include <Xm/Label.h>
#include <Xm/LabelG.h>
+#include <Xm/ScrollBar.h>
+#include <Xm/ScrolledW.h>
+#include <Xm/Text.h>
+#include <Xm/TextF.h>
#ifndef NO_EDITRES
#include <X11/Xmu/Editres.h>
#endif /* NO_EDITRES */

14
graphics/pixmap/patches/patch-Pixmap.c Normal file
View File

@ -0,0 +1,14 @@
$NetBSD: patch-Pixmap.c,v 1.1 2024/01/02 20:41:47 nros Exp $
Fix implicit funvtion declaration of exit
--- Pixmap.c.orig 2024-01-02 09:18:23.243143182 +0000
+++ Pixmap.c
@@ -67,6 +67,7 @@ static char rcsid[] = "$Id: Pixmap.c,v 1
#include "PixmapP.h"
#include <stdio.h>
+#include <stdlib.h>
#include <math.h>
#define XtStrlen(s) ((s) ? strlen(s) : 0)

4
graphics/pixmap/patches/patch-aa
View File

@ -1,4 +1,6 @@
$NetBSD: patch-aa,v 1.3 2008/11/30 08:43:16 obache Exp $
$NetBSD: patch-aa,v 1.4 2024/01/02 20:41:47 nros Exp $
Use pkgsrc xpm.h
--- Pixmap.h.orig 2008-11-30 06:21:45.000000000 +0000
+++ Pixmap.h

6
graphics/pixmap/patches/patch-ac
View File

@ -1,4 +1,8 @@
$NetBSD: patch-ac,v 1.6 2008/11/30 08:43:16 obache Exp $
$NetBSD: patch-ac,v 1.7 2024/01/02 20:41:47 nros Exp $
Use Motif to build pixmap.
Use rgb.txt from x11/rgb.
Use pkgsrc libXpm.
--- Imakefile.orig 1994-05-13 11:04:38.000000000 +0000
+++ Imakefile