CVS commit: pkgsrc/converters/utf8proc

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Oct  5 10:47:21 UTC 2025

Modified Files:
        pkgsrc/converters/utf8proc: Makefile distinfo
Added Files:
        pkgsrc/converters/utf8proc/patches: patch-utf8proc.c

Log Message:
Make converters/utf8proc build on QNX


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/converters/utf8proc/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/converters/utf8proc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/converters/utf8proc/patches/patch-utf8proc.c

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

Modified files:

Index: pkgsrc/converters/utf8proc/Makefile
diff -u pkgsrc/converters/utf8proc/Makefile:1.20 pkgsrc/converters/utf8proc/Makefile:1.21
--- pkgsrc/converters/utf8proc/Makefile:1.20    Tue Mar  4 09:37:36 2025
+++ pkgsrc/converters/utf8proc/Makefile Sun Oct  5 10:47:21 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2025/03/04 09:37:36 nia Exp $
+# $NetBSD: Makefile,v 1.21 2025/10/05 10:47:21 js Exp $
 
 DISTNAME=      utf8proc-2.10.0
 CATEGORIES=    converters
@@ -10,7 +10,6 @@ HOMEPAGE=     https://julialang.org/utf8proc
 COMMENT=       C library for processing Unicode data
 LICENSE=       mit AND unicode-v3
 
-FORCE_C_STD=           c99
 USE_LIBTOOL=           yes
 
 INSTALLATION_DIRS=     include lib lib/pkgconfig
@@ -18,9 +17,9 @@ INSTALLATION_DIRS=    include lib lib/pkgco
 PKGCONFIG_OVERRIDE=    libutf8proc.pc.in
 
 # Use ABI version from CMakeLists.txt to stay compatible with cmake builds
-MAJOR= 3
-MINOR= 1
-PATCH= 0
+major= 3
+minor= 1
+patch= 0
 
 do-configure:
        cd ${WRKSRC} && ${SED}                                          \
@@ -37,7 +36,7 @@ do-build:
        cd ${WRKSRC} && ${LIBTOOL} --tag=CC --mode=link                 \
                ${CC} ${LDFLAGS} -o libutf8proc.la utf8proc.lo          \
                        -rpath ${PREFIX}/lib                            \
-                       -version-number ${MAJOR}:${MINOR}:${PATCH}
+                       -version-number ${major}:${minor}:${patch}
 
 do-install:
        cd ${WRKSRC} && ${LIBTOOL} --mode=install                       \

Index: pkgsrc/converters/utf8proc/distinfo
diff -u pkgsrc/converters/utf8proc/distinfo:1.15 pkgsrc/converters/utf8proc/distinfo:1.16
--- pkgsrc/converters/utf8proc/distinfo:1.15    Thu Jan  2 13:55:52 2025
+++ pkgsrc/converters/utf8proc/distinfo Sun Oct  5 10:47:21 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.15 2025/01/02 13:55:52 micha Exp $
+$NetBSD: distinfo,v 1.16 2025/10/05 10:47:21 js Exp $
 
 BLAKE2s (utf8proc-2.10.0.tar.gz) = 72fddb4b9c796aa23142aa868ac94ff42f5de2dcfaea6e8419e8d0802beec6b2
 SHA512 (utf8proc-2.10.0.tar.gz) = 92a771606bcbecbb86c8d101931bc042dc7035938a665a7a449c2d8a7d3255df9df9c77c5cab0fc9dcaecb04be970149f60bfff463fc813e96727b7035ca9bb4
 Size (utf8proc-2.10.0.tar.gz) = 199045 bytes
+SHA1 (patch-utf8proc.c) = 2a78be2c9c829b9c1071775dd195ad92a6f3604f

Added files:

Index: pkgsrc/converters/utf8proc/patches/patch-utf8proc.c
diff -u /dev/null pkgsrc/converters/utf8proc/patches/patch-utf8proc.c:1.1
--- /dev/null   Sun Oct  5 10:47:22 2025
+++ pkgsrc/converters/utf8proc/patches/patch-utf8proc.c Sun Oct  5 10:47:21 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-utf8proc.c,v 1.1 2025/10/05 10:47:21 js Exp $
+
+--- utf8proc.c.orig    2024-12-31 20:17:14.000000000 +0000
++++ utf8proc.c
+@@ -689,7 +689,8 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8
+           utf8proc_int32_t max_second = utf8proc_combinations_second[idx + len - 1];
+           if (current_char <= max_second) {
+             // TODO: binary search? arithmetic search?
+-            for (int off = 0; off < len; ++off) {
++            int off;
++            for (off = 0; off < len; ++off) {
+               utf8proc_int32_t second = utf8proc_combinations_second[idx + off];
+               if (current_char < second) {
+                 /* not found */