CVS commit: pkgsrc/fonts/fontconfig

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/fonts/fontconfig
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Fri, 20 Jan 2023 13:10:09 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 20 13:10:09 UTC 2023

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile PLIST builtin.mk distinfo
        pkgsrc/fonts/fontconfig/patches: patch-aa patch-ac patch-configure
            patch-src_fccharset.c patch-src_fcstat.c
Removed Files:
        pkgsrc/fonts/fontconfig/files: uuid.h
        pkgsrc/fonts/fontconfig/patches: patch-src_fcatomic.h
            patch-src_fcfreetype.c

Log Message:
fontconfig: update to 2.14.1.

Changes not found.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/fonts/fontconfig/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/fonts/fontconfig/builtin.mk
cvs rdiff -u -r1.72 -r1.73 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/fonts/fontconfig/files/uuid.h
cvs rdiff -u -r1.18 -r1.19 pkgsrc/fonts/fontconfig/patches/patch-aa
cvs rdiff -u -r1.13 -r1.14 pkgsrc/fonts/fontconfig/patches/patch-ac
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/fontconfig/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/fonts/fontconfig/patches/patch-src_fcatomic.h
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c
cvs rdiff -u -r1.2 -r0 pkgsrc/fonts/fontconfig/patches/patch-src_fcfreetype.c
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.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.124 pkgsrc/fonts/fontconfig/Makefile:1.125
--- pkgsrc/fonts/fontconfig/Makefile:1.124      Thu Apr  7 12:39:06 2022
+++ pkgsrc/fonts/fontconfig/Makefile    Fri Jan 20 13:10:08 2023
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.124 2022/04/07 12:39:06 wiz Exp $
+# $NetBSD: Makefile,v 1.125 2023/01/20 13:10:08 wiz Exp $
 
-DISTNAME=      fontconfig-2.13.1
-PKGREVISION=   6
+DISTNAME=      fontconfig-2.14.1
 CATEGORIES=    fonts
 MASTER_SITES=  https://www.fontconfig.org/release/
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.fontconfig.org/
 COMMENT=       Library for configuring and customizing font access
-#LICENSE=      x11? AND modified-bsd # (for uuid.h)
+#LICENSE=      x11?
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=101280
 TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
@@ -87,17 +86,10 @@ BUILD_DEFS+=        VARBASE
 
 TEST_TARGET=   check
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == yes
 CONFIGURE_ENV+=        CC_FOR_BUILD=${NATIVE_CC:Q}
 .endif
 
-.if ${OPSYS} != "Darwin"
-CFLAGS+=       -I${WRKDIR}
-post-extract:
-       mkdir -p ${WRKDIR}/uuid
-       cp ${FILESDIR}/uuid.h ${WRKDIR}/uuid/.
-.endif
-
 pre-configure:
        -cd ${BUILDLINK_X11_DIR:Q} && ${FIND} . -path "*fontconfig*" -type l -delete
 
@@ -105,6 +97,7 @@ post-install:
        ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
        ${INSTALL_DATA} ${FILESDIR}/70-no-bitmap-webfonts.conf ${DESTDIR}${TMPLDIR}
 
+.include "../../lang/python/tool.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/fonts/fontconfig/PLIST
diff -u pkgsrc/fonts/fontconfig/PLIST:1.32 pkgsrc/fonts/fontconfig/PLIST:1.33
--- pkgsrc/fonts/fontconfig/PLIST:1.32  Mon Oct  5 09:36:34 2020
+++ pkgsrc/fonts/fontconfig/PLIST       Fri Jan 20 13:10:08 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2020/10/05 09:36:34 nia Exp $
+@comment $NetBSD: PLIST,v 1.33 2023/01/20 13:10:08 wiz Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-conflist
@@ -76,6 +76,7 @@ man/man3/FcConfigGetCacheDirs.3
 man/man3/FcConfigGetConfigDirs.3
 man/man3/FcConfigGetConfigFiles.3
 man/man3/FcConfigGetCurrent.3
+man/man3/FcConfigGetFilename.3
 man/man3/FcConfigGetFontDirs.3
 man/man3/FcConfigGetFonts.3
 man/man3/FcConfigGetRescanInterval.3
@@ -203,6 +204,7 @@ man/man3/FcRangeCreateInteger.3
 man/man3/FcRangeDestroy.3
 man/man3/FcRangeGetDouble.3
 man/man3/FcStrBasename.3
+man/man3/FcStrBuildFilename.3
 man/man3/FcStrCmp.3
 man/man3/FcStrCmpIgnoreCase.3
 man/man3/FcStrCopy.3
@@ -295,6 +297,7 @@ share/doc/fontconfig/fontconfig-devel/fc
 share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigdirs.html
 share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html
 share/doc/fontconfig/fontconfig-devel/fcconfiggetcurrent.html
+share/doc/fontconfig/fontconfig-devel/fcconfiggetfilename.html
 share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html
 share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html
 share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html
@@ -422,6 +425,7 @@ share/doc/fontconfig/fontconfig-devel/fc
 share/doc/fontconfig/fontconfig-devel/fcrangedestroy.html
 share/doc/fontconfig/fontconfig-devel/fcrangegetdouble.html
 share/doc/fontconfig/fontconfig-devel/fcstrbasename.html
+share/doc/fontconfig/fontconfig-devel/fcstrbuildfilename.html
 share/doc/fontconfig/fontconfig-devel/fcstrcmp.html
 share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html
 share/doc/fontconfig/fontconfig-devel/fcstrcopy.html
@@ -467,11 +471,14 @@ share/doc/fontconfig/fontconfig-user.pdf
 share/doc/fontconfig/fontconfig-user.txt
 share/examples/fontconfig/conf.d/README
 share/examples/fontconfig/fonts.conf
+share/fontconfig/conf.avail/05-reset-dirs-sample.conf
+share/fontconfig/conf.avail/09-autohint-if-no-hinting.conf
 share/fontconfig/conf.avail/10-autohint.conf
 share/fontconfig/conf.avail/10-hinting-full.conf
 share/fontconfig/conf.avail/10-hinting-medium.conf
 share/fontconfig/conf.avail/10-hinting-none.conf
 share/fontconfig/conf.avail/10-hinting-slight.conf
+share/fontconfig/conf.avail/10-no-antialias.conf
 share/fontconfig/conf.avail/10-no-sub-pixel.conf
 share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
 share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
@@ -479,6 +486,7 @@ share/fontconfig/conf.avail/10-sub-pixel
 share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
 share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
 share/fontconfig/conf.avail/10-unhinted.conf
+share/fontconfig/conf.avail/10-yes-antialias.conf
 share/fontconfig/conf.avail/11-lcdfilter-default.conf
 share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
 share/fontconfig/conf.avail/11-lcdfilter-light.conf
@@ -486,9 +494,11 @@ share/fontconfig/conf.avail/20-unhint-sm
 share/fontconfig/conf.avail/25-unhint-nonlatin.conf
 share/fontconfig/conf.avail/30-metric-aliases.conf
 share/fontconfig/conf.avail/30-pkgsrc-aliases.conf
+share/fontconfig/conf.avail/35-lang-normalize.conf
 share/fontconfig/conf.avail/40-nonlatin.conf
 share/fontconfig/conf.avail/45-generic.conf
 share/fontconfig/conf.avail/45-latin.conf
+share/fontconfig/conf.avail/48-spacing.conf
 share/fontconfig/conf.avail/49-sansserif.conf
 share/fontconfig/conf.avail/50-user.conf
 share/fontconfig/conf.avail/51-local.conf
@@ -505,6 +515,8 @@ share/fontconfig/conf.avail/80-delicious
 share/fontconfig/conf.avail/90-synthetic.conf
 share/gettext/its/fontconfig.its
 share/gettext/its/fontconfig.loc
+share/locale/ka/LC_MESSAGES/fontconfig-conf.mo
+share/locale/ka/LC_MESSAGES/fontconfig.mo
 share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
 share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
 share/xml/fontconfig/fonts.dtd

Index: pkgsrc/fonts/fontconfig/builtin.mk
diff -u pkgsrc/fonts/fontconfig/builtin.mk:1.13 pkgsrc/fonts/fontconfig/builtin.mk:1.14
--- pkgsrc/fonts/fontconfig/builtin.mk:1.13     Sat Nov  2 22:24:40 2019
+++ pkgsrc/fonts/fontconfig/builtin.mk  Fri Jan 20 13:10:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2019/11/02 22:24:40 rillig Exp $
+# $NetBSD: builtin.mk,v 1.14 2023/01/20 13:10:08 wiz Exp $
 
 BUILTIN_PKG:=  fontconfig
 
@@ -26,7 +26,7 @@ MAKEVARS+=            IS_BUILTIN.fontconfig
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.fontconfig) && \
-    !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS]) && \
+    ${IS_BUILTIN.fontconfig:tl} == yes && \
     empty(H_FONTCONFIG:M__nonexistent__)
 BUILTIN_VERSION.fontconfig!=                                           \
        ${AWK} '/\#define[      ]*FC_MAJOR/ { M = $$3 }                 \
@@ -49,10 +49,10 @@ USE_BUILTIN.fontconfig=     no
 .  else
 USE_BUILTIN.fontconfig=        ${IS_BUILTIN.fontconfig}
 .    if defined(BUILTIN_PKG.fontconfig) && \
-        !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS])
+        ${IS_BUILTIN.fontconfig:tl} == yes
 USE_BUILTIN.fontconfig=        yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.fontconfig}
-.        if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
+.        if ${USE_BUILTIN.fontconfig:tl} == yes
 USE_BUILTIN.fontconfig!=                                               \
        if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fontconfig:Q}; then \
                ${ECHO} yes;                                            \
@@ -74,9 +74,9 @@ MAKEVARS+=            USE_BUILTIN.fontconfig
 .include "../../mk/x11.builtin.mk"
 
 CHECK_BUILTIN.fontconfig?=     no
-.if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO])
+.if ${CHECK_BUILTIN.fontconfig:tl} == no
 
-.  if !empty(USE_BUILTIN.fontconfig:M[nN][oO])
+.  if ${USE_BUILTIN.fontconfig:tl} == no
 BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.1nb2
 BUILDLINK_API_DEPENDS.freetype2+=      freetype2>=2.1.3
 .  endif

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.72 pkgsrc/fonts/fontconfig/distinfo:1.73
--- pkgsrc/fonts/fontconfig/distinfo:1.72       Thu Apr  7 12:38:51 2022
+++ pkgsrc/fonts/fontconfig/distinfo    Fri Jan 20 13:10:08 2023
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.72 2022/04/07 12:38:51 wiz Exp $
+$NetBSD: distinfo,v 1.73 2023/01/20 13:10:08 wiz Exp $
 
-BLAKE2s (fontconfig-2.13.1.tar.bz2) = f6d0899147f7699688153bdd9fab753a65046bb667aac02775c01c82fe40a05a
-SHA512 (fontconfig-2.13.1.tar.bz2) = f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
-Size (fontconfig-2.13.1.tar.bz2) = 1723639 bytes
-SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
-SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
+BLAKE2s (fontconfig-2.14.1.tar.xz) = cbd7fd124850f111838dd96cfeb89a703c635dfb508449e75ad7bab1ef95a55d
+SHA512 (fontconfig-2.14.1.tar.xz) = ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db
+Size (fontconfig-2.14.1.tar.xz) = 1447044 bytes
+SHA1 (patch-aa) = 8fec573ffd4bcc976681cae51a4ead1647e521e8
+SHA1 (patch-ac) = 47b98e6766d2a842bc69d209622dfe83d9b5d06e
 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
-SHA1 (patch-configure) = a4b18983ad7d2cff658b733dab5a09b25019842e
+SHA1 (patch-configure) = 1fb33ba5c2cdac74eb3d30792cf762bd061bd8d2
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
-SHA1 (patch-src_fcatomic.h) = 7c9b7be6d2c95b81a481a829b10b8607e4919c35
-SHA1 (patch-src_fccharset.c) = b98c0bf7fd0f4f54ebfebe08403d0d774b636aaf
-SHA1 (patch-src_fcfreetype.c) = 42542ae666b292af700313ee103d0f295cf69e4e
+SHA1 (patch-src_fccharset.c) = a292088633030a67627cc73db501c504bc4ffd94
 SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
 SHA1 (patch-src_fcint.h) = 0f8accec35b75ad4cd4c558f9680d1f82548a308
-SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9
+SHA1 (patch-src_fcstat.c) = 8ce2fc08d8c227181b8efed3cf7cdd11ea7837a5
 SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09

Index: pkgsrc/fonts/fontconfig/patches/patch-aa
diff -u pkgsrc/fonts/fontconfig/patches/patch-aa:1.18 pkgsrc/fonts/fontconfig/patches/patch-aa:1.19
--- pkgsrc/fonts/fontconfig/patches/patch-aa:1.18       Thu Oct 17 07:27:33 2013
+++ pkgsrc/fonts/fontconfig/patches/patch-aa    Fri Jan 20 13:10:09 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2013/10/17 07:27:33 wiz Exp $
+$NetBSD: patch-aa,v 1.19 2023/01/20 13:10:09 wiz Exp $
 
---- Makefile.in.orig   2013-10-11 04:28:46.000000000 +0000
+--- Makefile.in.orig   2022-10-21 07:33:38.000000000 +0000
 +++ Makefile.in
-@@ -380,6 +380,7 @@ datadir = @datadir@
+@@ -428,6 +428,7 @@ datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
@@ -10,15 +10,15 @@ $NetBSD: patch-aa,v 1.18 2013/10/17 07:2
  exec_prefix = @exec_prefix@
  fc_cachedir = @fc_cachedir@
  host = @host@
-@@ -439,6 +440,7 @@ xml_DATA = fonts.dtd
- @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false
+@@ -510,6 +511,7 @@ xml_DATA = fonts.dtd
+ @ENABLE_CACHE_BUILD_TRUE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)"
  FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR))
  DISTCHECK_CONFIGURE_FLAGS = 
 +RUN_FC_CACHE_TEST = false
  all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -997,17 +999,13 @@ fonts.conf: fonts.conf.in Makefile
+@@ -1083,17 +1085,13 @@ fonts.conf: fonts.conf.in Makefile
        mv $@.tmp $@
  
  install-data-local: fonts.conf

Index: pkgsrc/fonts/fontconfig/patches/patch-ac
diff -u pkgsrc/fonts/fontconfig/patches/patch-ac:1.13 pkgsrc/fonts/fontconfig/patches/patch-ac:1.14
--- pkgsrc/fonts/fontconfig/patches/patch-ac:1.13       Thu Oct 17 07:27:33 2013
+++ pkgsrc/fonts/fontconfig/patches/patch-ac    Fri Jan 20 13:10:09 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.13 2013/10/17 07:27:33 wiz Exp $
+$NetBSD: patch-ac,v 1.14 2023/01/20 13:10:09 wiz Exp $
 
---- conf.d/Makefile.in.orig    2013-10-11 04:28:47.000000000 +0000
+--- conf.d/Makefile.in.orig    2022-10-21 07:33:38.000000000 +0000
 +++ conf.d/Makefile.in
-@@ -345,7 +345,7 @@ CONF_LINKS = \
+@@ -411,7 +411,7 @@ CONF_LINKS = \
  
  EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
  CLEANFILES = $(DOC_FILES)
@@ -11,8 +11,8 @@ $NetBSD: patch-ac,v 1.13 2013/10/17 07:2
  config_DATA = $(DOC_FILES)
  templatedir = $(TEMPLATEDIR)
  template_DATA = \
-@@ -628,6 +628,7 @@ README: $(srcdir)/README.in
-       sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
+@@ -713,6 +713,7 @@ README: $(srcdir)/README.in
+       cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) $(top_builddir)/conf.d/35-lang-normalize.conf
  
  install-data-hook:
 +xinstall-data-hook:

Index: pkgsrc/fonts/fontconfig/patches/patch-configure
diff -u pkgsrc/fonts/fontconfig/patches/patch-configure:1.6 pkgsrc/fonts/fontconfig/patches/patch-configure:1.7
--- pkgsrc/fonts/fontconfig/patches/patch-configure:1.6 Tue Aug 18 08:19:17 2020
+++ pkgsrc/fonts/fontconfig/patches/patch-configure     Fri Jan 20 13:10:09 2023
@@ -1,26 +1,9 @@
-$NetBSD: patch-configure,v 1.6 2020/08/18 08:19:17 tnn Exp $
-
-Do not look for libuuid on Darwin, it is built-in.
-On other operating systems, pkgsrc fontconfig is patched to use
-bunled libuuid.
+$NetBSD: patch-configure,v 1.7 2023/01/20 13:10:09 wiz Exp $
 
 Patch "GNU" gettext support to not depend unnecessary on "GNU" gettext.
 
 --- configure.orig     2018-08-30 08:24:28.000000000 +0000
 +++ configure
-@@ -13304,8 +13304,12 @@ case "$host" in
-   *-*-mingw*)
-     os_win32=yes
-     ;;
-+  *-*-darwin*)
-+    os_darwin=yes
-+    ;;
-   *)
-     os_win32=no
-+    os_darwin=no
- esac
-  if test "$os_win32" = "yes"; then
-   OS_WIN32_TRUE=
 @@ -15236,8 +15240,7 @@ extern
  #ifdef __cplusplus
  "C"
@@ -41,33 +24,3 @@ Patch "GNU" gettext support to not depen
  #else
  #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
  #endif
-@@ -15900,6 +15902,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
- $as_echo "$as_me: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&2;}
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+              #if defined(_SCO_DS)
-+              /* bogus */
-+              #include <prot.h>
-+              #endif
- fi
- CXXFLAGS="$old_CXXFLAGS"
- CPPFLAGS="$old_CPPFLAGS"
-@@ -15928,6 +15934,9 @@ if test "_$ac_cv_header_stdint_t" = "_" 
- 
- inttype_headers=`echo  | sed -e 's/,/ /g'`
- 
-+                      #if defined(_SCO_DS)
-+                      #include <prot.h>
-+                      #endif
- ac_cv_stdint_result="(no helpful system typedefs seen)"
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
-@@ -17196,7 +17205,7 @@ CFLAGS="$fontconfig_save_cflags"
- #
- # Check for uuid
- #
--if test "$os_win32" != "yes"; then
-+if false; then
-       use_pkgconfig_for_uuid=yes
-       if test -n "${UUID_LIBS}"; then
-               save_UUID_LIBS=$UUID_LIBS

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c
diff -u pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c:1.3 pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c:1.4
--- pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c:1.3   Thu Apr  7 11:47:48 2022
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fccharset.c       Fri Jan 20 13:10:09 2023
@@ -1,8 +1,6 @@
-$NetBSD: patch-src_fccharset.c,v 1.3 2022/04/07 11:47:48 riastradh Exp $
+$NetBSD: patch-src_fccharset.c,v 1.4 2023/01/20 13:10:09 wiz Exp $
 
 - Fix build on SCO OpenServer 5.0.7/3.2.
-- Fix ctype(3) abuse.
-  https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/224
 
 --- src/fccharset.c.orig       2018-06-05 10:36:38.000000000 +0000
 +++ src/fccharset.c
@@ -15,20 +13,3 @@ $NetBSD: patch-src_fccharset.c,v 1.3 202
      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 == '-')
-       {

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c
diff -u pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c:1.5 pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c:1.6
--- pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c:1.5      Sun Jun 19 20:48:55 2016
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c  Fri Jan 20 13:10:09 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_fcstat.c,v 1.5 2016/06/19 20:48:55 wiz Exp $
+$NetBSD: patch-src_fcstat.c,v 1.6 2023/01/20 13:10:09 wiz Exp $
 
 The argument types to scandir(3) differ between different OSes.
-OpenBSD seems to be still different. I used the provided alphasort
-instead of rewriting the equivalent sorter function.
-statvfs and fstatvfs need another include file, at least on MirBSD.
+I used the provided alphasort instead of rewriting the equivalent
+sorter function.  statvfs and fstatvfs need another include file,
+at least on MirBSD.
 
 --- src/fcstat.c.orig  2016-04-06 03:22:55.000000000 +0000
 +++ src/fcstat.c

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index