pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/xpaint
Module Name: pkgsrc
Committed By: vins
Date: Mon Dec 8 21:05:42 UTC 2025
Modified Files:
pkgsrc/graphics/xpaint: Makefile PLIST distinfo
Added Files:
pkgsrc/graphics/xpaint/patches: patch-Makefile.am patch-dynPenOp.c
patch-misc.h patch-vxp2ps_vxp2ps.c patch-vxp2ps_vxp2tex.c
Removed Files:
pkgsrc/graphics/xpaint/patches: patch-configure
patch-xpaintrw_Makefile.in
Log Message:
graphics/xpaint: apply some fixes
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/graphics/xpaint/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/xpaint/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/xpaint/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/xpaint/patches/patch-Makefile.am \
pkgsrc/graphics/xpaint/patches/patch-dynPenOp.c \
pkgsrc/graphics/xpaint/patches/patch-misc.h \
pkgsrc/graphics/xpaint/patches/patch-vxp2ps_vxp2ps.c \
pkgsrc/graphics/xpaint/patches/patch-vxp2ps_vxp2tex.c
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/xpaint/patches/patch-configure \
pkgsrc/graphics/xpaint/patches/patch-xpaintrw_Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/xpaint/Makefile
diff -u pkgsrc/graphics/xpaint/Makefile:1.89 pkgsrc/graphics/xpaint/Makefile:1.90
--- pkgsrc/graphics/xpaint/Makefile:1.89 Mon Nov 17 11:01:00 2025
+++ pkgsrc/graphics/xpaint/Makefile Mon Dec 8 21:05:41 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2025/11/17 11:01:00 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2025/12/08 21:05:41 vins Exp $
DISTNAME= xpaint-3.1.4
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
EXTRACT_SUFX= .tar.bz2
@@ -11,40 +11,46 @@ HOMEPAGE= https://sf-xpaint.sourceforge.
COMMENT= Simple paint program
LICENSE= gnu-gpl-v3
-MAKE_JOBS_SAFE= no
-
GNU_CONFIGURE= yes
-USE_LANGUAGES= c
USE_LIBTOOL= yes
USE_TOOLS+= autoconf automake autoreconf
-USE_TOOLS+= bash gmake gunzip
+USE_TOOLS+= bash gmake gunzip pkg-config
REPLACE_BASH= share/bin/imgmerge share/bin/xpaint_ocr
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Linux"
-BUILDLINK_TRANSFORM+= rm:-ldl
-.endif
+BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
SUBST_CLASSES+= ln
SUBST_STAGE.ln= pre-configure
SUBST_MESSAGE.ln= Linking to libXaw3dXft include directory.
-SUBST_FILES.ln= Makefile.in
+SUBST_FILES.ln= Makefile.am
SUBST_SED.ln= -e 's|/usr/include/X11/Xaw3dxft|${WRKDIR}/.buildlink/include/X11/Xaw3dxft|'
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_MESSAGE.paths= Replacing hard-coded paths.
+SUBST_FILES.paths= configure.ac Makefile.am xpaintrw/Makefile.am
+SUBST_SED.paths= -e 's|/usr/bin/libtool|libtool --tag=CC|'
+SUBST_SED.paths+= -e 's|/etc/X11/app-defaults|${PREFIX}/lib/X11/app-defaults|'
+SUBST_SED.paths+= -e 's|freetype2/config/ftheader.h|freetype2/freetype/config/ftheader.h|'
+
+pre-configure:
+ set -e; cd ${WRKSRC} && autoreconf -fiv
+
pre-install:
for file in ${WRKSRC}/bitmaps/toolicons/*.xpm.gz ; do \
${GUNZIP_CMD} $$file ; \
done
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/netpbm/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXaw3dXft/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/xpaint/PLIST
diff -u pkgsrc/graphics/xpaint/PLIST:1.8 pkgsrc/graphics/xpaint/PLIST:1.9
--- pkgsrc/graphics/xpaint/PLIST:1.8 Sun Jan 22 17:41:52 2023
+++ pkgsrc/graphics/xpaint/PLIST Mon Dec 8 21:05:41 2025
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.8 2023/01/22 17:41:52 vins Exp $
+@comment $NetBSD: PLIST,v 1.9 2025/12/08 21:05:41 vins Exp $
bin/imgmerge
bin/vxp2dkw
bin/vxp2ps
bin/vxp2tex
bin/xpaint
bin/xpaint_generate_toolicons
+lib/X11/app-defaults/XPaint
+lib/X11/app-defaults/XPaint.big
+lib/X11/app-defaults/XPaint.medium
+lib/X11/app-defaults/XPaint.small
+lib/X11/app-defaults/XPaint_es
+lib/X11/app-defaults/XPaint_fr
lib/libxpaintrw.la
man/man1/imgmerge.1
man/man1/xpaint.1
Index: pkgsrc/graphics/xpaint/distinfo
diff -u pkgsrc/graphics/xpaint/distinfo:1.29 pkgsrc/graphics/xpaint/distinfo:1.30
--- pkgsrc/graphics/xpaint/distinfo:1.29 Sun Jan 22 17:41:52 2023
+++ pkgsrc/graphics/xpaint/distinfo Mon Dec 8 21:05:41 2025
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.29 2023/01/22 17:41:52 vins Exp $
+$NetBSD: distinfo,v 1.30 2025/12/08 21:05:41 vins Exp $
BLAKE2s (xpaint-3.1.4.tar.bz2) = 70c36e6d8c61aa215cc291d08fb4de9515d719dff276b8abeb2f6187d75e9b06
SHA512 (xpaint-3.1.4.tar.bz2) = ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
Size (xpaint-3.1.4.tar.bz2) = 1630009 bytes
-SHA1 (patch-configure) = bc83048e71d8c8e6f95643720d1480fcce4cbc07
+SHA1 (patch-Makefile.am) = 7cb1373eb79a8fe9ff823351cd1c65261acc9166
+SHA1 (patch-dynPenOp.c) = 847dd5da0f393a2c414dd8799f84c77e5d15e063
SHA1 (patch-fileBrowser.c) = c4e9d3ee66b5bfadac4e138c4dd7dd471dc946df
SHA1 (patch-main.c) = 5d764c282b2e8798e3690ff99bea7117a83df4a8
+SHA1 (patch-misc.h) = a4a3b037880062a2bd5310cbbe045ceabeeaa7b4
SHA1 (patch-util_Makefile) = b885c20eaaff01f9a6ee15796f041d5a753c371a
SHA1 (patch-vxp2ps_Makefile) = 30ef714b8541c551fd520956bda7aab7e90a6d77
-SHA1 (patch-xpaintrw_Makefile.in) = 743442e3acb114698a773c04502787c265a30982
+SHA1 (patch-vxp2ps_vxp2ps.c) = cbf9205b87ba71dba1ed3720704e95247ffbd1c0
+SHA1 (patch-vxp2ps_vxp2tex.c) = 7a6fbe40723e417261e31b3cafbfef73820e14a1
SHA1 (patch-xpaintrw_rwTable.c) = 784fd7c3831dc9b17efe60ab3ae439c7601b6894
Added files:
Index: pkgsrc/graphics/xpaint/patches/patch-Makefile.am
diff -u /dev/null pkgsrc/graphics/xpaint/patches/patch-Makefile.am:1.1
--- /dev/null Mon Dec 8 21:05:42 2025
+++ pkgsrc/graphics/xpaint/patches/patch-Makefile.am Mon Dec 8 21:05:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.am,v 1.1 2025/12/08 21:05:41 vins Exp $
+
+Fix race condition.
+
+--- Makefile.am.orig 2021-01-07 14:18:14.000000000 +0000
++++ Makefile.am
+@@ -100,7 +100,7 @@ DefaultRC.txt.h: substads DefaultRC
+ messages.h: preproc
+ ./preproc > messages.h
+
+-XPaint.ad: app-defaults
++XPaint.ad: substads app-defaults
+ $(CC) $(CFLAGS) substads.c -o substads
+ cd app-defaults ; \
+ ../substads -appdefs \
Index: pkgsrc/graphics/xpaint/patches/patch-dynPenOp.c
diff -u /dev/null pkgsrc/graphics/xpaint/patches/patch-dynPenOp.c:1.1
--- /dev/null Mon Dec 8 21:05:42 2025
+++ pkgsrc/graphics/xpaint/patches/patch-dynPenOp.c Mon Dec 8 21:05:41 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-dynPenOp.c,v 1.1 2025/12/08 21:05:41 vins Exp $
+
+dynFinish is declared as double, but always used as int.
+
+--- dynPenOp.c.orig 2021-01-16 11:57:53.000000000 +0000
++++ dynPenOp.c
+@@ -35,7 +35,8 @@
+
+ #define XTIMEOUT 20
+
+-double dynWidth = 10, dynMass = 600, dynDrag = 15, dynFinish = 0;
++double dynWidth = 10, dynMass = 600, dynDrag = 15;
++int dynFinish = 0;
+
+ typedef struct {
+ double startx, starty;
Index: pkgsrc/graphics/xpaint/patches/patch-misc.h
diff -u /dev/null pkgsrc/graphics/xpaint/patches/patch-misc.h:1.1
--- /dev/null Mon Dec 8 21:05:42 2025
+++ pkgsrc/graphics/xpaint/patches/patch-misc.h Mon Dec 8 21:05:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-misc.h,v 1.1 2025/12/08 21:05:41 vins Exp $
+
+Otherwise HelpTextOutput() is undeclared.
+
+--- misc.h.orig 2025-12-08 20:47:27.811755189 +0000
++++ misc.h
+@@ -104,7 +104,7 @@ extern XColor *DoGrabColor(Widget w);
+ /* help.c */
+ extern char *matchGet(char *line, char *pat);
+ extern void HelpDialog(Widget parent, String name);
+-#if defined( _STDIO_H ) || defined( __VMS )
++#if defined( HAVE_STDIO_H ) || defined( __VMS )
+ extern void HelpTextOutput(FILE* fd, String name);
+ #endif
+ extern void HelpInit(Widget top);
Index: pkgsrc/graphics/xpaint/patches/patch-vxp2ps_vxp2ps.c
diff -u /dev/null pkgsrc/graphics/xpaint/patches/patch-vxp2ps_vxp2ps.c:1.1
--- /dev/null Mon Dec 8 21:05:42 2025
+++ pkgsrc/graphics/xpaint/patches/patch-vxp2ps_vxp2ps.c Mon Dec 8 21:05:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-vxp2ps_vxp2ps.c,v 1.1 2025/12/08 21:05:41 vins Exp $
+
+Fix error: too many arguments to function 'ps_init'.
+
+--- vxp2ps/vxp2ps.c.orig 2021-02-10 14:00:01.000000000 +0000
++++ vxp2ps/vxp2ps.c
+@@ -144,7 +144,7 @@ void pgm_print()
+ }
+ #endif
+
+-void ps_init()
++void ps_init(FILE* fo)
+ {
+ fprintf(fo, "%%!PS-Adobe-2.0\n");
+ fprintf(fo, "%%%%Creator: vxp2ps\n");
Index: pkgsrc/graphics/xpaint/patches/patch-vxp2ps_vxp2tex.c
diff -u /dev/null pkgsrc/graphics/xpaint/patches/patch-vxp2ps_vxp2tex.c:1.1
--- /dev/null Mon Dec 8 21:05:42 2025
+++ pkgsrc/graphics/xpaint/patches/patch-vxp2ps_vxp2tex.c Mon Dec 8 21:05:41 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-vxp2ps_vxp2tex.c,v 1.1 2025/12/08 21:05:41 vins Exp $
+
+Fix error: too many arguments to function 'ps_init'.
+
+--- vxp2ps/vxp2tex.c.orig 2021-02-08 22:25:49.000000000 +0000
++++ vxp2ps/vxp2tex.c
+@@ -29,7 +29,7 @@ unsigned int tcolor, color1 = 0, color2
+ #define DRAWOP 0x3000300
+ #define FILLOP 0x2492000
+
+-void ps_init()
++void ps_init(FILE* fo)
+ {
+ fprintf(fo, "%%!PS-Adobe-2.0\n");
+ fprintf(fo, "%%%%Creator: vxp2tex\n");
Home |
Main Index |
Thread Index |
Old Index