CVS commit: pkgsrc/devel/kdiff3

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Apr 11 10:49:14 UTC 2026

Modified Files:
        pkgsrc/devel/kdiff3: Makefile distinfo
Added Files:
        pkgsrc/devel/kdiff3/patches: patch-src_diff.cpp
            patch-src_gnudiff__io.cpp

Log Message:
kdiff3: fix ctype(3) usage

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/devel/kdiff3/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/kdiff3/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/kdiff3/patches/patch-src_diff.cpp \
    pkgsrc/devel/kdiff3/patches/patch-src_gnudiff__io.cpp

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

Modified files:

Index: pkgsrc/devel/kdiff3/Makefile
diff -u pkgsrc/devel/kdiff3/Makefile:1.127 pkgsrc/devel/kdiff3/Makefile:1.128
--- pkgsrc/devel/kdiff3/Makefile:1.127  Thu Mar 26 20:11:59 2026
+++ pkgsrc/devel/kdiff3/Makefile        Sat Apr 11 10:49:14 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.127 2026/03/26 20:11:59 gutteridge Exp $
+# $NetBSD: Makefile,v 1.128 2026/04/11 10:49:14 wiz Exp $
 
 DISTNAME=      kdiff3-1.12.4
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_KDE:=kdiff3/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/kdiff3/distinfo
diff -u pkgsrc/devel/kdiff3/distinfo:1.31 pkgsrc/devel/kdiff3/distinfo:1.32
--- pkgsrc/devel/kdiff3/distinfo:1.31   Thu Mar 26 20:11:59 2026
+++ pkgsrc/devel/kdiff3/distinfo        Sat Apr 11 10:49:14 2026
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.31 2026/03/26 20:11:59 gutteridge Exp $
+$NetBSD: distinfo,v 1.32 2026/04/11 10:49:14 wiz Exp $
 
 BLAKE2s (kdiff3-1.12.4.tar.xz) = ebcb2e8bb77b66086b706f39a84ce4b7b9c0ade0e986bb40c369af64c9c89772
 SHA512 (kdiff3-1.12.4.tar.xz) = 6ce32d11f218a712583ae7b07654958d88d3b0721052dfba0599d3130287442c64bdb411f0f1e6857d8ef5b07f89956eb9b0c484fb192402cdaec4a858ec3046
 Size (kdiff3-1.12.4.tar.xz) = 1224576 bytes
+SHA1 (patch-src_diff.cpp) = c599523be7d8f99d379b8b856b683b2315621d79
+SHA1 (patch-src_gnudiff__io.cpp) = d47950e6c64ac8fabd050128eb14d47d4a4b1ea7

Added files:

Index: pkgsrc/devel/kdiff3/patches/patch-src_diff.cpp
diff -u /dev/null pkgsrc/devel/kdiff3/patches/patch-src_diff.cpp:1.1
--- /dev/null   Sat Apr 11 10:49:14 2026
+++ pkgsrc/devel/kdiff3/patches/patch-src_diff.cpp      Sat Apr 11 10:49:14 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_diff.cpp,v 1.1 2026/04/11 10:49:14 wiz Exp $
+
+Fix ctype(3) usage.
+https://invent.kde.org/sdk/kdiff3/-/merge_requests/74
+
+--- src/diff.cpp.orig  2026-04-11 10:33:22.920577327 +0000
++++ src/diff.cpp
+@@ -107,10 +107,10 @@ bool LineData::equal(const LineData& l1, const LineDat
+         for(; ; p1.next(), p2.next())
+         {
+             // Advance to the next non-whitespace character or EOL.
+-            while (p1.hasPeek() && isspace(p1.tryPeek()->toLatin1())) {
++            while (p1.hasPeek() && isspace((unsigned char)p1.tryPeek()->toLatin1())) {
+                 p1.next();
+             }
+-            while (p2.hasPeek() && isspace(p2.tryPeek()->toLatin1())) {
++            while (p2.hasPeek() && isspace((unsigned char)p2.tryPeek()->toLatin1())) {
+                 p2.next();
+             }
+ 
Index: pkgsrc/devel/kdiff3/patches/patch-src_gnudiff__io.cpp
diff -u /dev/null pkgsrc/devel/kdiff3/patches/patch-src_gnudiff__io.cpp:1.1
--- /dev/null   Sat Apr 11 10:49:14 2026
+++ pkgsrc/devel/kdiff3/patches/patch-src_gnudiff__io.cpp       Sat Apr 11 10:49:14 2026
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_gnudiff__io.cpp,v 1.1 2026/04/11 10:49:14 wiz Exp $
+
+Fix ctype(3) usage.
+https://invent.kde.org/sdk/kdiff3/-/merge_requests/74
+
+--- src/gnudiff_io.cpp.orig    2026-04-11 10:33:40.821215358 +0000
++++ src/gnudiff_io.cpp
+@@ -87,14 +87,14 @@ bool GnuDiff::lines_differ(const QChar *s1, size_t len
+         else
+         {
+             while(t1 != s1end &&
+-                  ((bIgnoreWhiteSpace && isspace(t1->unicode())) ||
++                  ((bIgnoreWhiteSpace && isspace((unsigned char)t1->unicode())) ||
+                    (bIgnoreNumbers && (t1->isDigit() || *t1 == '-' || *t1 == '.'))))
+             {
+                 ++t1;
+             }
+ 
+             while(t2 != s2end &&
+-                  ((bIgnoreWhiteSpace && isspace(t2->unicode())) ||
++                  ((bIgnoreWhiteSpace && isspace((unsigned char)t2->unicode())) ||
+                    (bIgnoreNumbers && (t2->isDigit() || *t2 == '-' || *t2 == '.'))))
+             {
+                 ++t2;
+@@ -161,7 +161,7 @@ void GnuDiff::find_and_hash_each_line(file_data *curre
+                 case IGNORE_ALL_SPACE:
+                     while(p < bufend && !Utils::isEndOfLine(c = *p))
+                     {
+-                        if(!(isspace(c.unicode()) || (bIgnoreNumbers && (c.isDigit() || c == '-' || c == '.'))))
++                        if(!(isspace((unsigned char)c.unicode()) || (bIgnoreNumbers && (c.isDigit() || c == '-' || c == '.'))))
+                             h = HASH(h, c.toLower().unicode());
+                         ++p;
+                     }
+@@ -181,7 +181,7 @@ void GnuDiff::find_and_hash_each_line(file_data *curre
+                 case IGNORE_ALL_SPACE:
+                     while(p < bufend && !Utils::isEndOfLine(c = *p))
+                     {
+-                        if(!(isspace(c.unicode()) || (bIgnoreNumbers && (c.isDigit() || c == '-' || c == '.'))))
++                        if(!(isspace((unsigned char)c.unicode()) || (bIgnoreNumbers && (c.isDigit() || c == '-' || c == '.'))))
+                             h = HASH(h, c.unicode());
+                         ++p;
+                     }