CVS commit: pkgsrc/fonts/fontforge

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct  6 19:49:26 UTC 2025

Modified Files:
        pkgsrc/fonts/fontforge: Makefile distinfo
        pkgsrc/fonts/fontforge/patches: patch-fontforge_splinefont.h
Added Files:
        pkgsrc/fonts/fontforge/patches: patch-fontforge_macenc.c

Log Message:
fontforge: use correct type for iconv(3) arguments

Fixes build with gcc 14.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 pkgsrc/fonts/fontforge/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/fonts/fontforge/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/fonts/fontforge/patches/patch-fontforge_macenc.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/fontforge/Makefile
diff -u pkgsrc/fonts/fontforge/Makefile:1.157 pkgsrc/fonts/fontforge/Makefile:1.158
--- pkgsrc/fonts/fontforge/Makefile:1.157       Sat Aug 30 22:45:03 2025
+++ pkgsrc/fonts/fontforge/Makefile     Mon Oct  6 19:49:25 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.157 2025/08/30 22:45:03 wiz Exp $
+# $NetBSD: Makefile,v 1.158 2025/10/06 19:49:25 wiz Exp $
 
 DISTNAME=      fontforge-20230101
-PKGREVISION=   18
+PKGREVISION=   19
 CATEGORIES=    fonts editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fontforge/}
 GITHUB_PROJECT=        fontforge

Index: pkgsrc/fonts/fontforge/distinfo
diff -u pkgsrc/fonts/fontforge/distinfo:1.79 pkgsrc/fonts/fontforge/distinfo:1.80
--- pkgsrc/fonts/fontforge/distinfo:1.79        Sat Mar  9 20:31:48 2024
+++ pkgsrc/fonts/fontforge/distinfo     Mon Oct  6 19:49:25 2025
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.79 2024/03/09 20:31:48 wiz Exp $
+$NetBSD: distinfo,v 1.80 2025/10/06 19:49:25 wiz Exp $
 
 BLAKE2s (fontforge-20230101.tar.xz) = aca0cb8014deafb2620ca3a19c494817a6c67ab24deb8da9c4bcbb099ee64d6c
 SHA512 (fontforge-20230101.tar.xz) = 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418
 Size (fontforge-20230101.tar.xz) = 13761728 bytes
+SHA1 (patch-fontforge_macenc.c) = 9d6472a9024bfb468569113bee93908e93d9c14b
 SHA1 (patch-fontforge_splinefont.c) = c8f7095f45a4f990ae37631b46583dec35a8eb5d
-SHA1 (patch-fontforge_splinefont.h) = be7739b6145b3c622913efa9f2d679860c35cccb
+SHA1 (patch-fontforge_splinefont.h) = 452fe9cfddd8795f9e0f43a6ecd4c58616b68bc4
 SHA1 (patch-po_fr.po) = 4ab7a4636eac4580153c2594dea59a9a928cedbb
 SHA1 (patch-po_it.po) = 90a860516cf84790af8f08088f7b0d88f32cd895

Index: pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h
diff -u pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h:1.3 pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h:1.4
--- pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h:1.3     Mon Sep  2 14:45:37 2019
+++ pkgsrc/fonts/fontforge/patches/patch-fontforge_splinefont.h Mon Oct  6 19:49:25 2025
@@ -1,10 +1,23 @@
-$NetBSD: patch-fontforge_splinefont.h,v 1.3 2019/09/02 14:45:37 nia Exp $
+$NetBSD: patch-fontforge_splinefont.h,v 1.4 2025/10/06 19:49:25 wiz Exp $
 
-NetBSD does not implement uselocale().
+Chunk 1: Use proper type for iconv(3) arguments.
 
---- fontforge/splinefont.h.orig        2019-07-22 10:10:01.551001000 +0000
+Others: NetBSD does not implement uselocale().
+
+--- fontforge/splinefont.h.orig        2023-01-01 05:25:39.000000000 +0000
 +++ fontforge/splinefont.h
-@@ -2625,17 +2625,33 @@ extern bool isSplinePointPartOfGuide( Sp
+@@ -999,8 +999,8 @@ typedef struct enc {
+     int iso_2022_escape_len;
+     int low_page, high_page;
+     char *iconv_name; /* For compatibility to old versions we might use a different name from that used by iconv. */
+-    iconv_t *tounicode;
+-    iconv_t *fromunicode;
++    iconv_t tounicode;
++    iconv_t fromunicode;
+     int (*tounicode_func)(int);
+     int (*fromunicode_func)(int);
+     unsigned int is_temporary: 1;     /* freed when the map gets freed */
+@@ -2630,17 +2630,33 @@ extern bool isSplinePointPartOfGuide( Sp
  
  extern void debug_printHint( StemInfo *h, char* msg );
  

Added files:

Index: pkgsrc/fonts/fontforge/patches/patch-fontforge_macenc.c
diff -u /dev/null pkgsrc/fonts/fontforge/patches/patch-fontforge_macenc.c:1.1
--- /dev/null   Mon Oct  6 19:49:26 2025
+++ pkgsrc/fonts/fontforge/patches/patch-fontforge_macenc.c     Mon Oct  6 19:49:25 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-fontforge_macenc.c,v 1.1 2025/10/06 19:49:25 wiz Exp $
+
+/scratch/fonts/fontforge/work/fontforge-20230101/fontforge/macenc.c: In function 'MacStrToUtf8':
+/scratch/fonts/fontforge/work/fontforge-20230101/fontforge/macenc.c:1141:16: error: assignment to 'struct __tag_iconv_t **' from incompatible pointer type 'iconv_t' {aka 'struct __tag_iconv_t *'} 
[-Wincompatible-pointer-types]
+ 1141 |         toutf8 = iconv_open("UTF-8",enc->iconv_name!=NULL?enc->iconv_name:enc->enc_name);
+      |                ^
+/scratch/fonts/fontforge/work/fontforge-20230101/fontforge/macenc.c:1142:20: warning: comparison of distinct pointer types lacks a cast [-Wcompare-distinct-pointer-types]
+ 1142 |         if ( toutf8==(iconv_t) -1 || toutf8==NULL )
+      |                    ^~
+/scratch/fonts/fontforge/work/fontforge-20230101/fontforge/macenc.c:1148:15: error: passing argument 1 of 'iconv' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1148 |         iconv(toutf8,&in,&inlen,&out,&outlen);
+      |               ^~~~~~
+      |               |
+      |               struct __tag_iconv_t **
+
+--- fontforge/macenc.c.orig    2025-10-06 19:47:44.459616789 +0000
++++ fontforge/macenc.c
+@@ -1132,7 +1132,7 @@ return( NULL );
+                                           macenc==sm_korean ? "EUC-KR" :
+                                           macenc==sm_tradchinese ? "Big5" :
+                                             "EUC-CN" );
+-      iconv_t *toutf8;
++      iconv_t toutf8;
+       ICONV_CONST char *in;
+       char *out;
+       size_t inlen, outlen;