pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/fonts/xmbdfed
Module Name: pkgsrc
Committed By: vins
Date: Sat Sep 9 14:56:28 UTC 2023
Modified Files:
pkgsrc/fonts/xmbdfed: Makefile PLIST distinfo
Added Files:
pkgsrc/fonts/xmbdfed: MESSAGE
pkgsrc/fonts/xmbdfed/files: xmbdfed.desktop xmbdfed.png
pkgsrc/fonts/xmbdfed/patches: patch-FGrid.c patch-Makefile patch-bdf.c
patch-bdfgname.c patch-color.c patch-fntin.c patch-setup.c
patch-xmbdfed.c patch-xmbdfed.h
Removed Files:
pkgsrc/fonts/xmbdfed/patches: patch-aa patch-ab patch-ac
Log Message:
fonts/xmbdfed: update to xmbdfed-4.7
# Changes (local)
* Host tarball (retrieved from archive.org) on NetBSD's FTP server.
* Move HOMEPAGE (unreachable) to last archived snapshot at archive.org.
* Add missing LICENSE.
* Link against FreeType2 (instead of freetype-lib), as well as libXpm.
* Enable support for Hanzi Bitmap Font (HBF) File Format.
* Fix a number of compiler warnings.
* Remove patches/patch-ab (fixed upstream).
* Rename remaining patches to match target files.
* Install official pixmap, alongide a .desktop application file.
* Add MESSAGE (stripped from installation instructions).
* Lint package.
# Changes (upstream)
Version: 4.7
Date : 23 February 2004
==========================
1. Completely revamped the PSF font import/export system to make it
actually useable.
2. Changed to use FreeType 2. FreeType 1 no longer supported.
3. Changed to use a fallback of the 75dpi New Century Schoolbook for RH
distributions that don't come with the 100dpi.
4. Fixed a problem with the OpenType hinting flag not being updated after
being changed.
5. Changed all TrueType references to OpenType to reflect the move to
FreeType 2.
6. Renamed some of the files that referred to TrueType (bdfttf.c and ttfin.c
renamed to bdfotf.c and otfin.c).
7. Removed an unecessary copy when padding character cell glyphs.
8. Some minor documentation improvements.
9. Fixed several serious problems loading Windows FON/FNT fonts.
10. Added comments about conversion to imported FON/FNT fonts.
11. Added comments about conversion to imported OTF fonts.
12. Fixed a previously unnoticed problem with font comment strings not being
NULL terminated properly.
Version: 4.6
Date : 29 January 2004
==========================
1. Fixed a problem with FON/FNT fonts that have the names at the very end of
the file.
2. Released as Linux binary only.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/xmbdfed/MESSAGE
cvs rdiff -u -r1.21 -r1.22 pkgsrc/fonts/xmbdfed/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/fonts/xmbdfed/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/xmbdfed/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/xmbdfed/files/xmbdfed.desktop \
pkgsrc/fonts/xmbdfed/files/xmbdfed.png
cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/xmbdfed/patches/patch-FGrid.c \
pkgsrc/fonts/xmbdfed/patches/patch-Makefile \
pkgsrc/fonts/xmbdfed/patches/patch-bdf.c \
pkgsrc/fonts/xmbdfed/patches/patch-bdfgname.c \
pkgsrc/fonts/xmbdfed/patches/patch-color.c \
pkgsrc/fonts/xmbdfed/patches/patch-fntin.c \
pkgsrc/fonts/xmbdfed/patches/patch-setup.c \
pkgsrc/fonts/xmbdfed/patches/patch-xmbdfed.c \
pkgsrc/fonts/xmbdfed/patches/patch-xmbdfed.h
cvs rdiff -u -r1.4 -r0 pkgsrc/fonts/xmbdfed/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/fonts/xmbdfed/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/fonts/xmbdfed/patches/patch-ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/fonts/xmbdfed/Makefile
diff -u pkgsrc/fonts/xmbdfed/Makefile:1.21 pkgsrc/fonts/xmbdfed/Makefile:1.22
--- pkgsrc/fonts/xmbdfed/Makefile:1.21 Wed Sep 6 10:40:28 2017
+++ pkgsrc/fonts/xmbdfed/Makefile Sat Sep 9 14:56:28 2023
@@ -1,22 +1,40 @@
-# $NetBSD: Makefile,v 1.21 2017/09/06 10:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2023/09/09 14:56:28 vins Exp $
-DISTNAME= xmbdfed-4.5
-PKGREVISION= 5
+DISTNAME= xmbdfed-4.7
CATEGORIES= fonts graphics x11
-MASTER_SITES= # ftp://crl.nmsu.edu/CLR/multiling/General/
+MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/vins/dists/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE= http://crl.nmsu.edu/~mleisher/xmbdfed.html
+HOMEPAGE= https://web.archive.org/web/20090227090450/http://crl.nmsu.edu/~mleisher/xmbdfed.html
COMMENT= Motif-based BDF font editor with lots of features
+LICENSE= mit AND public-domain
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+USE_TOOLS+= gzip
+
+MAKE_ENV+= GZIP=${GUNZIP_CMD:Q}
+
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/${PKGBASE}
+INSTALLATION_DIRS+= share/pixmaps share/applications
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xmbdfed ${DESTDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/xmbdfed.man \
+ ${INSTALL_PROGRAM} ${WRKSRC}/xmbdfed \
+ ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/xmbdfed.man \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xmbdfed.1
+ ${INSTALL_DATA} ${WRKSRC}/xmbdfedrc \
+ ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
+
+post-install:
+ ${INSTALL_DATA} ${FILESDIR}/xmbdfed.desktop \
+ ${DESTDIR}${PREFIX}/share/applications
+ ${INSTALL_DATA} ${FILESDIR}/xmbdfed.png \
+ ${DESTDIR}${PREFIX}/share/pixmaps
-.include "../../graphics/freetype-lib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
.include "../../mk/motif.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/fonts/xmbdfed/PLIST
diff -u pkgsrc/fonts/xmbdfed/PLIST:1.1.1.1 pkgsrc/fonts/xmbdfed/PLIST:1.2
--- pkgsrc/fonts/xmbdfed/PLIST:1.1.1.1 Tue Oct 15 12:29:19 2002
+++ pkgsrc/fonts/xmbdfed/PLIST Sat Sep 9 14:56:28 2023
@@ -1,3 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/15 12:29:19 kei Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/09/09 14:56:28 vins Exp $
bin/xmbdfed
man/man1/xmbdfed.1
+share/applications/xmbdfed.desktop
+share/examples/xmbdfed/xmbdfedrc
+share/pixmaps/xmbdfed.png
Index: pkgsrc/fonts/xmbdfed/distinfo
diff -u pkgsrc/fonts/xmbdfed/distinfo:1.11 pkgsrc/fonts/xmbdfed/distinfo:1.12
--- pkgsrc/fonts/xmbdfed/distinfo:1.11 Tue Oct 26 10:28:40 2021
+++ pkgsrc/fonts/xmbdfed/distinfo Sat Sep 9 14:56:28 2023
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:28:40 nia Exp $
+$NetBSD: distinfo,v 1.12 2023/09/09 14:56:28 vins Exp $
-BLAKE2s (xmbdfed-4.5.tar.gz) = fd0e481ef0ea8f206e9b2edeab01270da7e3b636d712ec4b1eb5139fa2a39fb2
-SHA512 (xmbdfed-4.5.tar.gz) = 6d4ff1e7947c087bc654760d730ca56ec476fd8eefed6ed17f6c099968f3484ccc7bde1343bafe6332717494dfd5ab39d2d20dea636741ddcffce0b6e6b5962b
-Size (xmbdfed-4.5.tar.gz) = 282055 bytes
-SHA1 (patch-aa) = 55740a6f3bf01bf149bc953078a0cf75eea4dc11
-SHA1 (patch-ab) = 2ddd129850dfc53e46ba0df8d62239ffb5fac0eb
-SHA1 (patch-ac) = c62140d171ea96418d48ee4b236cde8bb87b545d
+BLAKE2s (xmbdfed-4.7.tar.bz2) = 220aa04d36486a1f59f3c73a8b71d1196cdc3d40acc35a6e2c1d4884f7a98886
+SHA512 (xmbdfed-4.7.tar.bz2) = 82dd996be82e51c1d3a0bdaeb9b293d9f367babb52d20f26a2c7a24d960cf40d45fd151f628c18b7f3154f0d1bd4add1d431a0fd809ce6bdc4a711d7c88e9d23
+Size (xmbdfed-4.7.tar.bz2) = 208877 bytes
+SHA1 (patch-FGrid.c) = 296402658c9eb5d34e2466ced450ec5c3f9616bc
+SHA1 (patch-Makefile) = 6e1ef52cf8cbd4a3ebf144b29ff569f980242d1a
+SHA1 (patch-bdf.c) = 2c8a807780bb96bdbf19f65f8223b586c3bbfe38
+SHA1 (patch-bdfgname.c) = adc637ccec8ad771cce9ab770eb0c8d97ef3ac84
+SHA1 (patch-color.c) = 0802994e424fb2425d5b92ae7d10673b0a667540
+SHA1 (patch-fntin.c) = ea58e41bd5b1e2a2ec5e87521a7bb22d51c55772
+SHA1 (patch-setup.c) = dcd87bdcbd390dc90255740061ae0a193b70b609
+SHA1 (patch-xmbdfed.c) = 968d705648ec92fa4e2c176189a0052557cbd17c
+SHA1 (patch-xmbdfed.h) = c7545f370fce890533fee9daadcdc11d50846b8e
Added files:
Index: pkgsrc/fonts/xmbdfed/MESSAGE
diff -u /dev/null pkgsrc/fonts/xmbdfed/MESSAGE:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/MESSAGE Sat Sep 9 14:56:28 2023
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+A sample configuration can be found at ${PREFIX}/share/examples/${PKGBASE}
+You should copy it to ~/.xmbdfedrc (mode = 644)
+
+Sometimes the binaries are unable to find the KeySyms needed for Motif.
+This will cause a large number of warning messages. In that event, you
+should set the XKEYSYMDB environment variable to point to the XKeysymDB
+file in your X11 installation. For example:
+
+ $ export XKEYSYMDB=${X11BASE}/lib/X11/XKeysymDB
+
+===========================================================================
Index: pkgsrc/fonts/xmbdfed/files/xmbdfed.desktop
diff -u /dev/null pkgsrc/fonts/xmbdfed/files/xmbdfed.desktop:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/files/xmbdfed.desktop Sat Sep 9 14:56:28 2023
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Exec=xmbdfed
+Icon=xmbdfed
+Terminal=false
+Name=XmBDFEditor
+GenericName=Bitmap Font Editor
+Comment=Bitmap Font Editor
+Type=Application
+Categories=Graphics;
+StartupNotify=true
+X-Desktop-File-Install-Version=0.10
Index: pkgsrc/fonts/xmbdfed/files/xmbdfed.png
Binary files are different
Index: pkgsrc/fonts/xmbdfed/patches/patch-FGrid.c
diff -u /dev/null pkgsrc/fonts/xmbdfed/patches/patch-FGrid.c:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/patches/patch-FGrid.c Sat Sep 9 14:56:28 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-FGrid.c,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+Callback values already assigned.
+
+--- FGrid.c.orig 2004-02-08 23:58:59.000000000 +0000
++++ FGrid.c
+@@ -4267,7 +4267,7 @@ Widget w;
+ pi->sel_start = pi->sel_end = cb.start;
+ Select(pi->sel_start, pi->selmap);
+
+- _XmuttFGridDrawCells(fw, pi->sel_start, pi->sel_end, True, True);
++ _XmuttFGridDrawCells(fw, cb.start, cb.end, True, True);
+
+ /*
+ * Call the modified callback.
Index: pkgsrc/fonts/xmbdfed/patches/patch-Makefile
diff -u /dev/null pkgsrc/fonts/xmbdfed/patches/patch-Makefile:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/patches/patch-Makefile Sat Sep 9 14:56:28 2023
@@ -0,0 +1,52 @@
+$NetBSD: patch-Makefile,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+Portability adjustments for pkgsrc.
+
+--- Makefile.orig 2004-02-17 15:24:06.000000000 +0000
++++ Makefile
+@@ -24,4 +24,4 @@
+ #
+-CC = gcc
+-CFLAGS = -g -Wall
++#CC = gcc
++#CFLAGS+ = -g -Wall
+
+@@ -48,5 +48,5 @@ OBJS = FGrid.o GEdit.o GEditTB.o GTest.o
+ #
+-#FTYPE_INCS = -I/usr/local/include
+-#FTYPE_LIBS = -L/usr/local/lib -lfreetype
+-#FTYPE_DEFS = -DHAVE_FREETYPE
++FTYPE_INCS = -I${X11BASE}/include/freetype
++FTYPE_LIBS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lfreetype
++FTYPE_DEFS = -DHAVE_FREETYPE
+
+@@ -56,5 +56,5 @@ OBJS = FGrid.o GEdit.o GEditTB.o GTest.o
+ #
+-#HBF_HDRS = hbf.h
+-#HBF_OBJS = hbf.o
+-#HBF_DEFS = -DHAVE_HBF
++HBF_HDRS = hbf.h
++HBF_OBJS = hbf.o
++HBF_DEFS = -DHAVE_HBF
+
+@@ -66,3 +66,3 @@ OBJS = FGrid.o GEdit.o GEditTB.o GTest.o
+ #
+-HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\""
++HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"${GZIP} -c\""
+
+@@ -73,2 +73,6 @@ DEFS = -DHAVE_XLIB $(FTYPE_DEFS) $(HBF_D
+
++INCS = -I${X11BASE}/include -I${PREFIX}/include ${FTYPE_INCS}
++LIBS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib \
++ -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE ${FTYPE_LIBS}
++
+ #
+@@ -84,5 +88,5 @@ DEFS = -DHAVE_XLIB $(FTYPE_DEFS) $(HBF_D
+ #
+-INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
+-LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
+- -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
++#INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
++#LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
++# -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
+
Index: pkgsrc/fonts/xmbdfed/patches/patch-bdf.c
diff -u /dev/null pkgsrc/fonts/xmbdfed/patches/patch-bdf.c:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/patches/patch-bdf.c Sat Sep 9 14:56:28 2023
@@ -0,0 +1,40 @@
+$NetBSD: patch-bdf.c,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+Prevent insecure fprintf() usage.
+
+--- bdf.c.orig 2004-02-23 14:08:07.000000000 +0000
++++ bdf.c
+@@ -3058,14 +3058,14 @@ void *data;
+ bpr = ((c->bbx.width * font->bpp) + 7) >> 3;
+ for (j = 0; bpr != 0 && j < c->bytes; j++) {
+ if (j && j % bpr == 0)
+- fprintf(out, eol);
++ fprintf(out, "%s", eol);
+ fprintf(out, "%02X", c->bitmap[j]);
+ }
+ /*
+ * Handle empty bitmaps like this.
+ */
+ if (c->bbx.height > 0)
+- fprintf(out, eol);
++ fprintf(out, "%s", eol);
+ fprintf(out, "ENDCHAR%s", eol);
+
+ /*
+@@ -3130,14 +3130,14 @@ void *data;
+ bpr = ((c->bbx.width * font->bpp) + 7) >> 3;
+ for (j = 0; bpr != 0 && j < c->bytes; j++) {
+ if (j && j % bpr == 0)
+- fprintf(out, eol);
++ fprintf(out, "%s", eol);
+ fprintf(out, "%02X", c->bitmap[j]);
+ }
+ /*
+ * Handle empty bitmaps like this.
+ */
+ if (c->bbx.height > 0)
+- fprintf(out, eol);
++ fprintf(out, "%s", eol);
+ fprintf(out, "ENDCHAR%s", eol);
+
+ /*
Index: pkgsrc/fonts/xmbdfed/patches/patch-bdfgname.c
diff -u /dev/null pkgsrc/fonts/xmbdfed/patches/patch-bdfgname.c:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/patches/patch-bdfgname.c Sat Sep 9 14:56:28 2023
@@ -0,0 +1,46 @@
+$NetBSD: patch-bdfgname.c,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+Prevent conflicting types for getline().
+
+--- bdfgname.c.orig 2004-01-29 17:15:37.000000000 +0000
++++ bdfgname.c
+@@ -47,9 +47,9 @@ static unsigned long adobe_names_used;
+
+ static int
+ #ifdef __STDC__
+-getline(FILE *in, char *buf, int limit)
++_bdf_getline(FILE *in, char *buf, int limit)
+ #else
+-getline(in, buf, limit)
++_bdf_getline(in, buf, limit)
+ FILE *in;
+ char *buf;
+ int limit;
+@@ -99,11 +99,11 @@ FILE *in;
+
+ while (!feof(in)) {
+ pos = ftell(in);
+- (void) getline(in, buf, 256);
++ (void) _bdf_getline(in, buf, 256);
+ while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+ buf[0] = 0;
+ pos = ftell(in);
+- (void) getline(in, buf, 256);
++ (void) _bdf_getline(in, buf, 256);
+ }
+
+ if (buf[0] == 0)
+@@ -170,11 +170,11 @@ FILE *in;
+
+ while (!feof(in)) {
+ pos = ftell(in);
+- (void) getline(in, buf, 256);
++ (void) _bdf_getline(in, buf, 256);
+ while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+ buf[0] = 0;
+ pos = ftell(in);
+- (void) getline(in, buf, 256);
++ (void) _bdf_getline(in, buf, 256);
+ }
+
+ c = _bdf_atol(buf, 0, 16);
Index: pkgsrc/fonts/xmbdfed/patches/patch-color.c
diff -u /dev/null pkgsrc/fonts/xmbdfed/patches/patch-color.c:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/patches/patch-color.c Sat Sep 9 14:56:28 2023
@@ -0,0 +1,35 @@
+$NetBSD: patch-color.c,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+Fix signedness mismatch warnings.
+
+--- color.c.orig 2004-01-29 17:15:37.000000000 +0000
++++ color.c
+@@ -28,6 +28,7 @@ static char rcsid[] = "$Id: color.c,v 1.
+ #endif
+
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <X11/IntrinsicP.h>
+@@ -233,7 +234,7 @@ XtPointer client_data, call_data;
+ */
+
+ cb = (XmScaleCallbackStruct *) call_data;
+- which = (int) client_data;
++ which = (intptr_t) client_data;
+
+ cmap = XDefaultColormap(XtDisplay(w),
+ XDefaultScreen(XtDisplay(w)));
+@@ -430,9 +431,9 @@ BuildColorDialog()
+ colors.slide[i] = XtCreateManagedWidget("", xmScaleWidgetClass, rc,
+ av, ac);
+ XtAddCallback(colors.slide[i], XmNvalueChangedCallback, AdjustColor,
+- (XtPointer) i);
++ (XtPointer) (intptr_t) i);
+ XtAddCallback(colors.slide[i], XmNdragCallback, AdjustColor,
+- (XtPointer) i);
++ (XtPointer) (intptr_t) i);
+ }
+ }
+
Index: pkgsrc/fonts/xmbdfed/patches/patch-fntin.c
diff -u /dev/null pkgsrc/fonts/xmbdfed/patches/patch-fntin.c:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/patches/patch-fntin.c Sat Sep 9 14:56:28 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-fntin.c,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+Fix signedness mismatch warnings.
+
+--- fntin.c.orig 2004-01-29 17:15:37.000000000 +0000
++++ fntin.c
+@@ -28,6 +28,7 @@ static char rcsid[] = "$Id: fntin.c,v 1.
+ #endif
+
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <Xm/Xm.h>
+@@ -64,7 +65,7 @@ Widget w;
+ XtPointer client_data, call_data;
+ #endif
+ {
+- select_action = (int) client_data;
++ select_action = (intptr_t) client_data;
+ }
+
+ static void
Index: pkgsrc/fonts/xmbdfed/patches/patch-setup.c
diff -u /dev/null pkgsrc/fonts/xmbdfed/patches/patch-setup.c:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/patches/patch-setup.c Sat Sep 9 14:56:28 2023
@@ -0,0 +1,79 @@
+$NetBSD: patch-setup.c,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+Fix signedness mismatch warnings.
+
+--- setup.c.orig 2004-02-12 15:29:17.000000000 +0000
++++ setup.c
+@@ -28,6 +28,7 @@ static char rcsid[] = "$Id: setup.c,v 1.
+ #endif
+
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <X11/IntrinsicP.h>
+@@ -371,7 +372,7 @@ XtPointer client_data, call_data;
+ int which;
+ XmToggleButtonCallbackStruct *cb;
+
+- which = (int) client_data;
++ which = (intptr_t) client_data;
+ cb = (XmToggleButtonCallbackStruct *) call_data;
+
+ if (which == 1) {
+@@ -395,7 +396,7 @@ Widget w;
+ XtPointer client_data, call_data;
+ #endif
+ {
+- setup.pixsize = (int) client_data;
++ setup.pixsize = (intptr_t) client_data;
+ XtSetSensitive(setup.update, True);
+ }
+
+@@ -408,8 +409,8 @@ Widget w;
+ XtPointer client_data, call_data;
+ #endif
+ {
+- if ((setup.bpp = (int) client_data) > 1) {
+- xmbdfedAllocateColors(top, (int) client_data);
++ if ((setup.bpp = (intptr_t) client_data) > 1) {
++ xmbdfedAllocateColors(top, (intptr_t) client_data);
+ XtSetSensitive(setup.colors, True);
+ } else
+ XtSetSensitive(setup.colors, False);
+@@ -425,7 +426,7 @@ Widget w;
+ XtPointer client_data, call_data;
+ #endif
+ {
+- setup.eol = (int) client_data;
++ setup.eol = (intptr_t) client_data;
+ XtSetSensitive(setup.update, True);
+ }
+
+@@ -443,7 +444,7 @@ XtPointer client_data, call_data;
+ char *path;
+ XmFileSelectionBoxCallbackStruct *cb;
+
+- adobe = (int) client_data;
++ adobe = (intptr_t) client_data;
+
+ cb = (XmFileSelectionBoxCallbackStruct *) call_data;
+ XmStringGetLtoR(cb->value, XmSTRING_DEFAULT_CHARSET, &path);
+@@ -498,7 +499,7 @@ XtPointer client_data, call_data;
+ XtCallbackList cl;
+ Arg av[1];
+
+- adobe = (int) client_data;
++ adobe = (intptr_t) client_data;
+
+ if (other.fsel == 0) {
+ other.fsel = XmCreateFileSelectionDialog(top,
+@@ -734,7 +735,7 @@ XtPointer client_data, call_data;
+ XtCreateManagedWidget(name, xmPushButtonWidgetClass, pdown,
+ 0, 0);
+ XtAddCallback(pb, XmNactivateCallback, SetPixelSize,
+- (XtPointer) i);
++ (XtPointer) (intptr_t) i);
+ if (i == xmbdfed_opts.pixel_size) {
+ XtSetArg(av[0], XmNmenuHistory, pb);
+ XtSetValues(opts, av, 1);
Index: pkgsrc/fonts/xmbdfed/patches/patch-xmbdfed.c
diff -u /dev/null pkgsrc/fonts/xmbdfed/patches/patch-xmbdfed.c:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/patches/patch-xmbdfed.c Sat Sep 9 14:56:28 2023
@@ -0,0 +1,67 @@
+$NetBSD: patch-xmbdfed.c,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+Fix signedness mismatch warnings.
+
+--- xmbdfed.c.orig 2004-02-08 23:59:00.000000000 +0000
++++ xmbdfed.c
+@@ -28,6 +28,7 @@ static char rcsid[] = "$Id: xmbdfed.c,v
+ #endif
+
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <X11/cursorfont.h>
+@@ -919,7 +920,7 @@ XtPointer client_data, call_data;
+ #endif
+ {
+ Widget fstext;
+- int flags = (int) client_data;
++ int flags = (intptr_t) client_data;
+ int pos1, pos2;
+ XmString s;
+ char *suff, *sp, *ep;
+@@ -5303,26 +5304,26 @@ _XmBDFEditorSetup()
+ * in the normal fashion.
+ */
+ cmdres[0].default_addr =
+- (XtPointer) xmbdfed_opts.font_opts.correct_metrics;
++ (XtPointer) (intptr_t) xmbdfed_opts.font_opts.correct_metrics;
+ cmdres[1].default_addr =
+- (XtPointer) xmbdfed_opts.font_opts.keep_unencoded;
++ (XtPointer) (intptr_t) xmbdfed_opts.font_opts.keep_unencoded;
+ cmdres[2].default_addr =
+- (XtPointer) xmbdfed_opts.font_opts.keep_comments;
++ (XtPointer) (intptr_t) xmbdfed_opts.font_opts.keep_comments;
+
+- cmdres[3].default_addr = (XtPointer) xmbdfed_opts.font_opts.pad_cells;
+- cmdres[4].default_addr = (XtPointer) xmbdfed_opts.font_opts.point_size;
+- cmdres[5].default_addr = (XtPointer) xmbdfed_opts.font_opts.resolution_x;
+- cmdres[6].default_addr = (XtPointer) xmbdfed_opts.font_opts.resolution_y;
+- cmdres[7].default_addr = (XtPointer) xmbdfed_opts.font_opts.font_spacing;
+- cmdres[8].default_addr = (XtPointer) xmbdfed_opts.font_opts.bits_per_pixel;
+- cmdres[9].default_addr = (XtPointer) xmbdfed_opts.font_opts.eol;
+- cmdres[10].default_addr = (XtPointer) xmbdfed_opts.resolution;
+- cmdres[11].default_addr = (XtPointer) xmbdfed_opts.no_blanks;
+- cmdres[12].default_addr = (XtPointer) xmbdfed_opts.really_exit;
+- cmdres[13].default_addr = (XtPointer) xmbdfed_opts.overwrite_mode;
+- cmdres[14].default_addr = (XtPointer) xmbdfed_opts.initial_glyph;
+- cmdres[15].default_addr = (XtPointer) xmbdfed_opts.progbar;
+- cmdres[16].default_addr = (XtPointer) xmbdfed_opts.code_base;
++ cmdres[3].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.font_opts.pad_cells;
++ cmdres[4].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.font_opts.point_size;
++ cmdres[5].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.font_opts.resolution_x;
++ cmdres[6].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.font_opts.resolution_y;
++ cmdres[7].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.font_opts.font_spacing;
++ cmdres[8].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.font_opts.bits_per_pixel;
++ cmdres[9].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.font_opts.eol;
++ cmdres[10].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.resolution;
++ cmdres[11].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.no_blanks;
++ cmdres[12].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.really_exit;
++ cmdres[13].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.overwrite_mode;
++ cmdres[14].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.initial_glyph;
++ cmdres[15].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.progbar;
++ cmdres[16].default_addr = (XtPointer) (intptr_t) xmbdfed_opts.code_base;
+ }
+
+ int
Index: pkgsrc/fonts/xmbdfed/patches/patch-xmbdfed.h
diff -u /dev/null pkgsrc/fonts/xmbdfed/patches/patch-xmbdfed.h:1.1
--- /dev/null Sat Sep 9 14:56:28 2023
+++ pkgsrc/fonts/xmbdfed/patches/patch-xmbdfed.h Sat Sep 9 14:56:28 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-xmbdfed.h,v 1.1 2023/09/09 14:56:28 vins Exp $
+
+Variable already declared as static.
+
+--- xmbdfed.h.orig 2001-11-09 14:01:52.000000000 -0800
++++ xmbdfed.h
+@@ -258,7 +258,6 @@ extern Widget top, questd, errd, saved,
+ extern XtAppContext app;
+ extern Boolean yes_no_answer;
+ extern Boolean yes_no_done;
+-extern unsigned long active_editor;
+ extern String app_name;
+ extern String app_class;
+ extern char title[];
Home |
Main Index |
Thread Index |
Old Index