CVS commit: pkgsrc/fonts/fontconfig

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Mon Apr  4 12:47:47 UTC 2022

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile distinfo
        pkgsrc/fonts/fontconfig/patches: patch-src_fccharset.c

Log Message:
fonts/fontconfig: Patch ctype(3) abuse.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c

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

Modified files:

Index: pkgsrc/fonts/fontconfig/Makefile
diff -u pkgsrc/fonts/fontconfig/Makefile:1.122 pkgsrc/fonts/fontconfig/Makefile:1.123
--- pkgsrc/fonts/fontconfig/Makefile:1.122      Sat Sep 11 23:34:44 2021
+++ pkgsrc/fonts/fontconfig/Makefile    Mon Apr  4 12:47:47 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.122 2021/09/11 23:34:44 tnn Exp $
+# $NetBSD: Makefile,v 1.123 2022/04/04 12:47:47 riastradh Exp $
 
 DISTNAME=      fontconfig-2.13.1
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    fonts
 MASTER_SITES=  https://www.fontconfig.org/release/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.70 pkgsrc/fonts/fontconfig/distinfo:1.71
--- pkgsrc/fonts/fontconfig/distinfo:1.70       Tue Oct 26 10:27:11 2021
+++ pkgsrc/fonts/fontconfig/distinfo    Mon Apr  4 12:47:47 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2021/10/26 10:27:11 nia Exp $
+$NetBSD: distinfo,v 1.71 2022/04/04 12:47:47 riastradh Exp $
 
 BLAKE2s (fontconfig-2.13.1.tar.bz2) = f6d0899147f7699688153bdd9fab753a65046bb667aac02775c01c82fe40a05a
 SHA512 (fontconfig-2.13.1.tar.bz2) = f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
@@ -9,7 +9,7 @@ SHA1 (patch-af) = d351265c894738284215f0
 SHA1 (patch-configure) = a4b18983ad7d2cff658b733dab5a09b25019842e
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
 SHA1 (patch-src_fcatomic.h) = 7c9b7be6d2c95b81a481a829b10b8607e4919c35
-SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
+SHA1 (patch-src_fccharset.c) = 6d68730b06ac5b7b12136eadc913d099e7cefd79
 SHA1 (patch-src_fcfreetype.c) = 42542ae666b292af700313ee103d0f295cf69e4e
 SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
 SHA1 (patch-src_fcint.h) = 0f8accec35b75ad4cd4c558f9680d1f82548a308

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c
diff -u pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c:1.1 pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c:1.2
--- pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c:1.1   Tue Jul 15 14:48:34 2014
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c       Mon Apr  4 12:47:47 2022
@@ -1,8 +1,11 @@
-$NetBSD: patch-src_fccharset.c,v 1.1 2014/07/15 14:48:34 ryoon Exp $
+$NetBSD: patch-src_fccharset.c,v 1.2 2022/04/04 12:47:47 riastradh Exp $
 
---- src/fccharset.c.orig       2014-01-20 08:14:20.000000000 +0000
+- Fix build on SCO OpenServer 5.0.7/3.2.
+- Fix ctype(3) abuse.
+
+--- src/fccharset.c.orig       2018-06-05 10:36:38.000000000 +0000
 +++ src/fccharset.c
-@@ -569,7 +569,7 @@ FcCharSetHasChar (const FcCharSet *fcs, 
+@@ -600,7 +600,7 @@ FcCharSetHasChar (const FcCharSet *fcs, 
  static FcChar32
  FcCharSetPopCount (FcChar32 c1)
  {
@@ -11,3 +14,20 @@ $NetBSD: patch-src_fccharset.c,v 1.1 201
      return __builtin_popcount (c1);
  #else
      /* hackmem 169 */
+@@ -838,14 +838,14 @@ FcNameParseRange (FcChar8 **string, FcCh
+       char *t;
+       long first, last;
+ 
+-      while (isspace(*s))
++      while (isspace((unsigned char)*s))
+           s++;
+       t = s;
+       errno = 0;
+       first = last = strtol (s, &s, 16);
+       if (errno)
+           return FcFalse;
+-      while (isspace(*s))
++      while (isspace((unsigned char)*s))
+           s++;
+       if (*s == '-')
+       {