CVS commit: pkgsrc/fonts/fontconfig

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Jul 23 14:47:04 UTC 2026

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile distinfo
        pkgsrc/fonts/fontconfig/patches: patch-ac
Removed Files:
        pkgsrc/fonts/fontconfig/patches: patch-src_fccompat.c

Log Message:
fonts/fontconfig: Update to 2.18.2

Changelog:
2.18.2:
fixed (9 changes)

    Fix FcNameUnparse regression. by @emilio (merge request)
    Use Special FC_CACHE_VERSION for snapshot (merge request)
    Add more conditional code for FcLocaleSetCurrent() (merge request)
    fc-cache: do not generate cache when target directory is in deny list (merge request)
    Add Nerd Fonts to the table (merge request)
    Add a hash table for fonts to generate expected genericfamily (merge request)
    Use genericfamily for the search of monospace against :spacing=100 (merge request)
    test: Fix a test case failure when BUILDDIR is under /tmp (merge request)
    test: Fix a regression for sysroot in test framework (merge request)

added (2 changes)

    conf.d: Add OpenMoji Color and OpenMoji Black (merge request)
    meson: Add tests-external-fonts option to disable network-dependent tests (merge request)


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/fonts/fontconfig/patches/patch-ac
cvs rdiff -u -r1.2 -r0 pkgsrc/fonts/fontconfig/patches/patch-src_fccompat.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.139 pkgsrc/fonts/fontconfig/Makefile:1.140
--- pkgsrc/fonts/fontconfig/Makefile:1.139      Wed Jul  1 08:07:23 2026
+++ pkgsrc/fonts/fontconfig/Makefile    Thu Jul 23 14:47:03 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.139 2026/07/01 08:07:23 wiz Exp $
+# $NetBSD: Makefile,v 1.140 2026/07/23 14:47:03 ryoon Exp $
 
-DISTNAME=      fontconfig-2.18.1
-PKGREVISION=   1
+DISTNAME=      fontconfig-2.18.2
 CATEGORIES=    fonts
 MASTER_SITES=  https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.79 pkgsrc/fonts/fontconfig/distinfo:1.80
--- pkgsrc/fonts/fontconfig/distinfo:1.79       Wed Jul  1 08:07:23 2026
+++ pkgsrc/fonts/fontconfig/distinfo    Thu Jul 23 14:47:03 2026
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.79 2026/07/01 08:07:23 wiz Exp $
+$NetBSD: distinfo,v 1.80 2026/07/23 14:47:03 ryoon Exp $
 
-BLAKE2s (fontconfig-2.18.1.tar.xz) = b396cd1d1a5bd037e3a6d6bb05917d76b26950fea8f2d47ed6aa35bda97ef81c
-SHA512 (fontconfig-2.18.1.tar.xz) = 5d637a030625fa5b55399a2711b4dd48949429caae4b80503655bc7bd12b9a58cc278b520660845c9e93dcac4631ad5c36bf97793ac1af1b8f3131e7bd22077c
-Size (fontconfig-2.18.1.tar.xz) = 1358564 bytes
+BLAKE2s (fontconfig-2.18.2.tar.xz) = efa9eaa26cd212aeb2454874eead41339dce8982bc11ea356e2ed38639d114a0
+SHA512 (fontconfig-2.18.2.tar.xz) = eba8f7fe5409159d6a9e0fd562dd3a7643da94b41fc0fdb2b742d5f4950ca2d6e636461352b2f148720653c83957373d28329ed20b50e7efd76ecfc60b2f3434
+Size (fontconfig-2.18.2.tar.xz) = 1347988 bytes
 SHA1 (patch-aa) = 8fec573ffd4bcc976681cae51a4ead1647e521e8
-SHA1 (patch-ac) = 869f7b831dde13626df5a25cf6ed74f5c64ffce4
+SHA1 (patch-ac) = 3c310eb904fe2159d9bc325531942939ff927e65
 SHA1 (patch-af) = 542245860fd4f5374a8935f41a757b2ae960633d
 SHA1 (patch-conf.d_meson.build) = d4cda841bc0be5ba04fe63207bc8c3845bbad520
 SHA1 (patch-configure) = 7926460361da8edda9c1189bf72e5b31993480b6
 SHA1 (patch-meson.build) = 12c848996a2e08aebcc89d155f36168666269dcc
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
 SHA1 (patch-src_fccharset.c) = a292088633030a67627cc73db501c504bc4ffd94
-SHA1 (patch-src_fccompat.c) = bd248797a0e1fb273d5b83ede0bba6cf1785bd3d
 SHA1 (patch-src_fcftint.h) = 28086bf5f6a1d397512699d7dc61b3716c971c89
 SHA1 (patch-src_fcint.h) = 2f7062dad03431fdf820f7bc61cdd767789d2caa
 SHA1 (patch-src_fcstat.c) = bbd650ce6f6a777393acb4fa33f211c2189e1f7d

Index: pkgsrc/fonts/fontconfig/patches/patch-ac
diff -u pkgsrc/fonts/fontconfig/patches/patch-ac:1.16 pkgsrc/fonts/fontconfig/patches/patch-ac:1.17
--- pkgsrc/fonts/fontconfig/patches/patch-ac:1.16       Sun Aug 10 13:58:35 2025
+++ pkgsrc/fonts/fontconfig/patches/patch-ac    Thu Jul 23 14:47:04 2026
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.16 2025/08/10 13:58:35 ryoon Exp $
+$NetBSD: patch-ac,v 1.17 2026/07/23 14:47:04 ryoon Exp $
 
---- conf.d/Makefile.in.orig    2025-07-02 04:53:19.334247000 +0000
+--- conf.d/Makefile.in.orig    2026-07-09 11:50:30.085991600 +0000
 +++ conf.d/Makefile.in
-@@ -404,7 +404,7 @@ CONF_LINKS = 10-hinting-$(PREFERRED_HINT
-       70-$(PREFERRED_BITMAP).conf
- EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
+@@ -408,7 +408,7 @@ CLEANFILES = $(DOC_FILES)
+       70-$(PREFERRED_BITMAP).conf $(am__append_1)
+ EXTRA_DIST = $(template_DATA) 05-macos.conf $(DOC_SOURCES)
  CLEANFILES = $(DOC_FILES)
 -configdir = $(CONFIGDIR)
 +configdir = $(prefix)/share/examples/fontconfig/conf.d
  config_DATA = $(DOC_FILES)
  templatedir = $(TEMPLATEDIR)
- template_DATA = \
-@@ -710,6 +710,7 @@ README: $(srcdir)/README.in
+ template_DATA = 05-reset-dirs-sample.conf \
+@@ -688,6 +688,7 @@ install-data-hook:
        cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) $(top_builddir)/conf.d/35-lang-normalize.conf
  
  install-data-hook: