CVS commit: pkgsrc/fonts/fontconfig

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/fonts/fontconfig
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Sun, 10 Aug 2025 13:58:35 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Aug 10 13:58:35 UTC 2025

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile PLIST distinfo
        pkgsrc/fonts/fontconfig/patches: patch-ac patch-af patch-configure
            patch-src_fcftint.h patch-src_fcint.h patch-src_fcstat.c
Added Files:
        pkgsrc/fonts/fontconfig/patches: patch-conf.d_meson.build
            patch-meson.build

Log Message:
fonts/fontconfig: Update to 2.17.1

* Use meson as build tool to avoid build failure in fccase.h handling.
* Disable doc generation completely. It requires docbook2man and docbook2html tool.
  They are not packaged yet.

Changelog:
2.17.1:
added (1 change)

    meson: Add 'noinstall' to default-hinting, default-sub-pixel-rendering, bitmap-conf build options (merge request)

fixed (1 change)

    Fix a heap buffer overflow (merge request)

2.17.0:

fixed (13 changes)

    Avoid conflict between dgettext macro and declaration in fcint.h (merge request)
    fix: Skip empty entries in XDG_DATA_DIRS parsing by @ComixHe (merge request)
    Fix padding with "und" in pattern elements (merge request)
    Fix a crash with broken cache (merge request)
    meson: Fix additional-fonts-dirs build option that not taking effect (merge request)
    Add default font paths for Android in configure script (merge request)
    Fix use-after-free in FcConfigGetPrgname (merge request)
    conf.d: Add a conf to guess a generic-family for substitution (merge request)
    Drop FcObjectFini() from FcFini() to fix memory leaks (merge request)
    conf.d/65-nonlatin.conf: Rename Lohit Oriya to Lohit Odia (merge request)
    Make sure that the debugging facilities are initialized at loading config phase (merge request)
    meson: don't force installation of a static library by @xry111 (merge request)
    meson: don't try to call run_command for gperf on --wrap-mode=forcefallback (merge request)

changed (10 changes)

    Do not fallback decoding with UTF-16BE if no iconv support (merge request)
    Trim trailing newline in string in cache (merge request)
    Parse foundry from OS/2 for table version 0 (merge request)
    Allow dotfiles to scan for caching (merge request)
    Increase a reference count for default FcConfig instance with FcInit() (merge request)
    Free the mutex object only when there are no references to the default FcConfig instance (merge request)
    Free the mutex object only when all cache objects isn't referenced (merge request)
    Drop the configuration path migration code (merge request)
    Drop FcDefaultFini() from FcFini() to fix memory leaks (merge request)
    [Fontations] Process and append font capabilities to Pattern (merge request)

added (6 changes)

    Add bitmap-conf build option to choose default bitmap conf (merge request)
    [Fontations] Enable fc-query indexing through Fontations (merge request)
    Add FcConfigPerferAppFont() to allow changing the order of application fonts (merge request)
    [Fontations] Pattern Bindings for CharSet and LangSet (merge request)
    Add FcPatternObjectGet* impl for CharSet and LangSet (merge request)
    [Fontations] Factor out fcpat.c - add Fontations dependencies (merge request)

performance (1 change)

    Improve performance of FcPtrListIterInitAtLast (merge request)

2.16.2:

changed (1 change)

    meson: Use Requires.private instead of Requires (merge request)

fixed (2 changes)

    meson: don't force build of a shared library by @kasper93 (merge request)
    meson: do not require libintl if nls feature is disabled (merge request)

added (1 change)

    [Fontations] Add internal PatternBuilder abstraction (merge request)

2.16.1:
Not available.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/fonts/fontconfig/PLIST
cvs rdiff -u -r1.76 -r1.77 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/fonts/fontconfig/patches/patch-ac
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/fontconfig/patches/patch-af
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/fonts/fontconfig/patches/patch-conf.d_meson.build \
    pkgsrc/fonts/fontconfig/patches/patch-meson.build
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/fontconfig/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/fontconfig/patches/patch-src_fcftint.h
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h
cvs rdiff -u -r1.7 -r1.8 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.132 pkgsrc/fonts/fontconfig/Makefile:1.133
--- pkgsrc/fonts/fontconfig/Makefile:1.132      Sat Dec 30 10:21:52 2023
+++ pkgsrc/fonts/fontconfig/Makefile    Sun Aug 10 13:58:34 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.132 2023/12/30 10:21:52 wiz Exp $
+# $NetBSD: Makefile,v 1.133 2025/08/10 13:58:34 ryoon Exp $
 
-DISTNAME=      fontconfig-2.15.0
+DISTNAME=      fontconfig-2.17.1
 CATEGORIES=    fonts
-MASTER_SITES=  https://www.fontconfig.org/release/
+MASTER_SITES=  https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,14 +14,11 @@ COMMENT=    Library for configuring and cus
 TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
 
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake pkg-config msgfmt
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-default-fonts=${PREFIX}/share/fonts/X11
-CONFIGURE_ARGS+=       --with-expat-includes=${BUILDLINK_PREFIX.expat}/include
-CONFIGURE_ARGS+=       --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
-CONFIGURE_ARGS+=       --with-baseconfigdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --with-cache-dir=${VARBASE}/cache/fontconfig
-CONFIGURE_ARGS+=       --enable-docs
+USE_TOOLS+=            pkg-config msgfmt
+MESON_ARGS+=           -Ddefault-fonts-dirs=${PREFIX}/share/fonts/X11
+MESON_ARGS+=           -Dbaseconfig-dir=${PKG_SYSCONFDIR}
+MESON_ARGS+=           -Dcache-dir=${VARBASE}/cache/fontconfig
+MESON_ARGS+=           -Ddoc=disabled # docbook2man and docbook2html are required.
 CONFIGURE_ENV+=                HASDOCBOOK=no
 
 PKGCONFIG_OVERRIDE=    fontconfig.pc.in
@@ -49,15 +46,11 @@ ADDFONTS:=  ${X11BASE}/lib/X11/fonts,${AD
 ADDFONTS:=     ${LOCALBASE}/share/fonts/X11,${ADDFONTS}
 .endif
 
-.if ${OPSYS} == "Darwin"
-ADDFONTS:=             ~/Library/Fonts,/Library/Fonts,/System/Library/Fonts,${ADDFONTS}
-CONFIGURE_ARGS+=       --with-arch=${MACHINE_ARCH}
-.endif
-CONFIGURE_ARGS+=       --with-add-fonts=${ADDFONTS}
-
 SUBST_CLASSES+=                prefix
-SUBST_STAGE.prefix=    post-build
-SUBST_FILES.prefix=    conf.d/README
+SUBST_STAGE.prefix=    pre-configure
+SUBST_FILES.prefix=    meson.build
+SUBST_FILES.prefix+=   conf.d/meson.build
+SUBST_FILES.prefix+=   conf.d/README.in
 SUBST_VARS.prefix=     PREFIX
 
 EGDIR=         ${PREFIX}/share/examples/fontconfig
@@ -103,17 +96,14 @@ BUILD_DEFS+=       VARBASE
 
 TEST_TARGET=   check
 
-.if ${USE_CROSS_COMPILE:U:tl} == yes
-CONFIGURE_ENV+=        CC_FOR_BUILD=${NATIVE_CC:Q}
-.endif
-
 pre-configure:
-       -cd ${BUILDLINK_X11_DIR:Q} && ${FIND} . -path "*fontconfig*" -type l -delete
+       cd ${BUILDLINK_X11_DIR} && ${FIND} . -path "*fontconfig*" -type l -delete
 
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
        ${INSTALL_DATA} ${FILESDIR}/70-no-bitmap-webfonts.conf ${DESTDIR}${TMPLDIR}
 
+.include "../../devel/meson/build.mk"
 .include "../../lang/python/tool.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/fonts/fontconfig/PLIST
diff -u pkgsrc/fonts/fontconfig/PLIST:1.35 pkgsrc/fonts/fontconfig/PLIST:1.36
--- pkgsrc/fonts/fontconfig/PLIST:1.35  Sat Dec 30 10:21:52 2023
+++ pkgsrc/fonts/fontconfig/PLIST       Sun Aug 10 13:58:34 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2023/12/30 10:21:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2025/08/10 13:58:34 ryoon Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-conflist
@@ -11,466 +11,10 @@ bin/fc-validate
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
 include/fontconfig/fontconfig.h
-lib/libfontconfig.la
+lib/libfontconfig.so
+lib/libfontconfig.so.1
+lib/libfontconfig.so.1.16.0
 lib/pkgconfig/fontconfig.pc
-man/man1/fc-cache.1
-man/man1/fc-cat.1
-man/man1/fc-conflist.1
-man/man1/fc-list.1
-man/man1/fc-match.1
-man/man1/fc-pattern.1
-man/man1/fc-query.1
-man/man1/fc-scan.1
-man/man1/fc-validate.1
-man/man3/FcAtomicCreate.3
-man/man3/FcAtomicDeleteNew.3
-man/man3/FcAtomicDestroy.3
-man/man3/FcAtomicLock.3
-man/man3/FcAtomicNewFile.3
-man/man3/FcAtomicOrigFile.3
-man/man3/FcAtomicReplaceOrig.3
-man/man3/FcAtomicUnlock.3
-man/man3/FcBlanksAdd.3
-man/man3/FcBlanksCreate.3
-man/man3/FcBlanksDestroy.3
-man/man3/FcBlanksIsMember.3
-man/man3/FcCacheCopySet.3
-man/man3/FcCacheCreateTagFile.3
-man/man3/FcCacheDir.3
-man/man3/FcCacheNumFont.3
-man/man3/FcCacheNumSubdir.3
-man/man3/FcCacheSubdir.3
-man/man3/FcCharSetAddChar.3
-man/man3/FcCharSetCopy.3
-man/man3/FcCharSetCount.3
-man/man3/FcCharSetCoverage.3
-man/man3/FcCharSetCreate.3
-man/man3/FcCharSetDelChar.3
-man/man3/FcCharSetDestroy.3
-man/man3/FcCharSetEqual.3
-man/man3/FcCharSetFirstPage.3
-man/man3/FcCharSetHasChar.3
-man/man3/FcCharSetIntersect.3
-man/man3/FcCharSetIntersectCount.3
-man/man3/FcCharSetIsSubset.3
-man/man3/FcCharSetMerge.3
-man/man3/FcCharSetNew.3
-man/man3/FcCharSetNextPage.3
-man/man3/FcCharSetSubtract.3
-man/man3/FcCharSetSubtractCount.3
-man/man3/FcCharSetUnion.3
-man/man3/FcConfigAppFontAddDir.3
-man/man3/FcConfigAppFontAddFile.3
-man/man3/FcConfigAppFontClear.3
-man/man3/FcConfigBuildFonts.3
-man/man3/FcConfigCreate.3
-man/man3/FcConfigDestroy.3
-man/man3/FcConfigEnableHome.3
-man/man3/FcConfigFileInfoIterGet.3
-man/man3/FcConfigFileInfoIterInit.3
-man/man3/FcConfigFileInfoIterNext.3
-man/man3/FcConfigFilename.3
-man/man3/FcConfigGetBlanks.3
-man/man3/FcConfigGetCache.3
-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
-man/man3/FcConfigGetSysRoot.3
-man/man3/FcConfigHome.3
-man/man3/FcConfigParseAndLoad.3
-man/man3/FcConfigParseAndLoadFromMemory.3
-man/man3/FcConfigReference.3
-man/man3/FcConfigSetCurrent.3
-man/man3/FcConfigSetRescanInterval.3
-man/man3/FcConfigSetSysRoot.3
-man/man3/FcConfigSubstitute.3
-man/man3/FcConfigSubstituteWithPat.3
-man/man3/FcConfigUptoDate.3
-man/man3/FcDefaultSubstitute.3
-man/man3/FcDirCacheClean.3
-man/man3/FcDirCacheCreateUUID.3
-man/man3/FcDirCacheDeleteUUID.3
-man/man3/FcDirCacheLoad.3
-man/man3/FcDirCacheLoadFile.3
-man/man3/FcDirCacheRead.3
-man/man3/FcDirCacheRescan.3
-man/man3/FcDirCacheUnlink.3
-man/man3/FcDirCacheUnload.3
-man/man3/FcDirCacheValid.3
-man/man3/FcDirSave.3
-man/man3/FcDirScan.3
-man/man3/FcFileIsDir.3
-man/man3/FcFileScan.3
-man/man3/FcFini.3
-man/man3/FcFontList.3
-man/man3/FcFontMatch.3
-man/man3/FcFontRenderPrepare.3
-man/man3/FcFontSetAdd.3
-man/man3/FcFontSetCreate.3
-man/man3/FcFontSetDestroy.3
-man/man3/FcFontSetList.3
-man/man3/FcFontSetMatch.3
-man/man3/FcFontSetPrint.3
-man/man3/FcFontSetSort.3
-man/man3/FcFontSetSortDestroy.3
-man/man3/FcFontSort.3
-man/man3/FcFreeTypeCharIndex.3
-man/man3/FcFreeTypeCharSet.3
-man/man3/FcFreeTypeCharSetAndSpacing.3
-man/man3/FcFreeTypeQuery.3
-man/man3/FcFreeTypeQueryAll.3
-man/man3/FcFreeTypeQueryFace.3
-man/man3/FcGetDefaultLangs.3
-man/man3/FcGetLangs.3
-man/man3/FcGetVersion.3
-man/man3/FcInit.3
-man/man3/FcInitBringUptoDate.3
-man/man3/FcInitLoadConfig.3
-man/man3/FcInitLoadConfigAndFonts.3
-man/man3/FcInitReinitialize.3
-man/man3/FcIsLower.3
-man/man3/FcIsUpper.3
-man/man3/FcLangGetCharSet.3
-man/man3/FcLangNormalize.3
-man/man3/FcLangSetAdd.3
-man/man3/FcLangSetCompare.3
-man/man3/FcLangSetContains.3
-man/man3/FcLangSetCopy.3
-man/man3/FcLangSetCreate.3
-man/man3/FcLangSetDel.3
-man/man3/FcLangSetDestroy.3
-man/man3/FcLangSetEqual.3
-man/man3/FcLangSetGetLangs.3
-man/man3/FcLangSetHasLang.3
-man/man3/FcLangSetHash.3
-man/man3/FcLangSetSubtract.3
-man/man3/FcLangSetUnion.3
-man/man3/FcMatrixCopy.3
-man/man3/FcMatrixEqual.3
-man/man3/FcMatrixInit.3
-man/man3/FcMatrixMultiply.3
-man/man3/FcMatrixRotate.3
-man/man3/FcMatrixScale.3
-man/man3/FcMatrixShear.3
-man/man3/FcNameConstant.3
-man/man3/FcNameGetConstant.3
-man/man3/FcNameGetConstantFor.3
-man/man3/FcNameGetObjectType.3
-man/man3/FcNameParse.3
-man/man3/FcNameRegisterConstants.3
-man/man3/FcNameRegisterObjectTypes.3
-man/man3/FcNameUnparse.3
-man/man3/FcNameUnregisterConstants.3
-man/man3/FcNameUnregisterObjectTypes.3
-man/man3/FcObjectSetAdd.3
-man/man3/FcObjectSetBuild.3
-man/man3/FcObjectSetCreate.3
-man/man3/FcObjectSetDestroy.3
-man/man3/FcPatternAdd-Type.3
-man/man3/FcPatternAdd.3
-man/man3/FcPatternAddWeak.3
-man/man3/FcPatternBuild.3
-man/man3/FcPatternCreate.3
-man/man3/FcPatternDel.3
-man/man3/FcPatternDestroy.3
-man/man3/FcPatternDuplicate.3
-man/man3/FcPatternEqual.3
-man/man3/FcPatternEqualSubset.3
-man/man3/FcPatternFilter.3
-man/man3/FcPatternFindIter.3
-man/man3/FcPatternFormat.3
-man/man3/FcPatternGet-Type.3
-man/man3/FcPatternGet.3
-man/man3/FcPatternGetWithBinding.3
-man/man3/FcPatternHash.3
-man/man3/FcPatternIterEqual.3
-man/man3/FcPatternIterGetObject.3
-man/man3/FcPatternIterGetValue.3
-man/man3/FcPatternIterIsValid.3
-man/man3/FcPatternIterNext.3
-man/man3/FcPatternIterStart.3
-man/man3/FcPatternIterValueCount.3
-man/man3/FcPatternObjectCount.3
-man/man3/FcPatternPrint.3
-man/man3/FcPatternReference.3
-man/man3/FcPatternRemove.3
-man/man3/FcRangeCopy.3
-man/man3/FcRangeCreateDouble.3
-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
-man/man3/FcStrCopyFilename.3
-man/man3/FcStrDirname.3
-man/man3/FcStrDowncase.3
-man/man3/FcStrFree.3
-man/man3/FcStrListCreate.3
-man/man3/FcStrListDone.3
-man/man3/FcStrListFirst.3
-man/man3/FcStrListNext.3
-man/man3/FcStrPlus.3
-man/man3/FcStrSetAdd.3
-man/man3/FcStrSetAddFilename.3
-man/man3/FcStrSetCreate.3
-man/man3/FcStrSetDel.3
-man/man3/FcStrSetDestroy.3
-man/man3/FcStrSetEqual.3
-man/man3/FcStrSetMember.3
-man/man3/FcStrStr.3
-man/man3/FcStrStrIgnoreCase.3
-man/man3/FcToLower.3
-man/man3/FcUcs4ToUtf8.3
-man/man3/FcUtf16Len.3
-man/man3/FcUtf16ToUcs4.3
-man/man3/FcUtf8Len.3
-man/man3/FcUtf8ToUcs4.3
-man/man3/FcValueDestroy.3
-man/man3/FcValueEqual.3
-man/man3/FcValuePrint.3
-man/man3/FcValueSave.3
-man/man3/FcWeightFromOpenType.3
-man/man3/FcWeightFromOpenTypeDouble.3
-man/man3/FcWeightToOpenType.3
-man/man3/FcWeightToOpenTypeDouble.3
-man/man5/fonts-conf.5
-share/doc/fontconfig/fontconfig-devel.pdf
-share/doc/fontconfig/fontconfig-devel.txt
-share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html
-share/doc/fontconfig/fontconfig-devel/fcatomicdeletenew.html
-share/doc/fontconfig/fontconfig-devel/fcatomicdestroy.html
-share/doc/fontconfig/fontconfig-devel/fcatomiclock.html
-share/doc/fontconfig/fontconfig-devel/fcatomicnewfile.html
-share/doc/fontconfig/fontconfig-devel/fcatomicorigfile.html
-share/doc/fontconfig/fontconfig-devel/fcatomicreplaceorig.html
-share/doc/fontconfig/fontconfig-devel/fcatomicunlock.html
-share/doc/fontconfig/fontconfig-devel/fcblanksadd.html
-share/doc/fontconfig/fontconfig-devel/fcblankscreate.html
-share/doc/fontconfig/fontconfig-devel/fcblanksdestroy.html
-share/doc/fontconfig/fontconfig-devel/fcblanksismember.html
-share/doc/fontconfig/fontconfig-devel/fccachecopyset.html
-share/doc/fontconfig/fontconfig-devel/fccachecreatetagfile.html
-share/doc/fontconfig/fontconfig-devel/fccachedir.html
-share/doc/fontconfig/fontconfig-devel/fccachenumfont.html
-share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html
-share/doc/fontconfig/fontconfig-devel/fccachesubdir.html
-share/doc/fontconfig/fontconfig-devel/fccharsetaddchar.html
-share/doc/fontconfig/fontconfig-devel/fccharsetcopy.html
-share/doc/fontconfig/fontconfig-devel/fccharsetcount.html
-share/doc/fontconfig/fontconfig-devel/fccharsetcoverage.html
-share/doc/fontconfig/fontconfig-devel/fccharsetcreate.html
-share/doc/fontconfig/fontconfig-devel/fccharsetdelchar.html
-share/doc/fontconfig/fontconfig-devel/fccharsetdestroy.html
-share/doc/fontconfig/fontconfig-devel/fccharsetequal.html
-share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html
-share/doc/fontconfig/fontconfig-devel/fccharsethaschar.html
-share/doc/fontconfig/fontconfig-devel/fccharsetintersect.html
-share/doc/fontconfig/fontconfig-devel/fccharsetintersectcount.html
-share/doc/fontconfig/fontconfig-devel/fccharsetissubset.html
-share/doc/fontconfig/fontconfig-devel/fccharsetmerge.html
-share/doc/fontconfig/fontconfig-devel/fccharsetnew.html
-share/doc/fontconfig/fontconfig-devel/fccharsetnextpage.html
-share/doc/fontconfig/fontconfig-devel/fccharsetsubtract.html
-share/doc/fontconfig/fontconfig-devel/fccharsetsubtractcount.html
-share/doc/fontconfig/fontconfig-devel/fccharsetunion.html
-share/doc/fontconfig/fontconfig-devel/fcconfigappfontadddir.html
-share/doc/fontconfig/fontconfig-devel/fcconfigappfontaddfile.html
-share/doc/fontconfig/fontconfig-devel/fcconfigappfontclear.html
-share/doc/fontconfig/fontconfig-devel/fcconfigbuildfonts.html
-share/doc/fontconfig/fontconfig-devel/fcconfigcreate.html
-share/doc/fontconfig/fontconfig-devel/fcconfigdestroy.html
-share/doc/fontconfig/fontconfig-devel/fcconfigenablehome.html
-share/doc/fontconfig/fontconfig-devel/fcconfigfileinfoiterget.html
-share/doc/fontconfig/fontconfig-devel/fcconfigfileinfoiterinit.html
-share/doc/fontconfig/fontconfig-devel/fcconfigfileinfoiternext.html
-share/doc/fontconfig/fontconfig-devel/fcconfigfilename.html
-share/doc/fontconfig/fontconfig-devel/fcconfiggetblanks.html
-share/doc/fontconfig/fontconfig-devel/fcconfiggetcache.html
-share/doc/fontconfig/fontconfig-devel/fcconfiggetcachedirs.html
-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
-share/doc/fontconfig/fontconfig-devel/fcconfiggetsysroot.html
-share/doc/fontconfig/fontconfig-devel/fcconfighome.html
-share/doc/fontconfig/fontconfig-devel/fcconfigparseandload.html
-share/doc/fontconfig/fontconfig-devel/fcconfigparseandloadfrommemory.html
-share/doc/fontconfig/fontconfig-devel/fcconfigreference.html
-share/doc/fontconfig/fontconfig-devel/fcconfigsetcurrent.html
-share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html
-share/doc/fontconfig/fontconfig-devel/fcconfigsetsysroot.html
-share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html
-share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html
-share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html
-share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html
-share/doc/fontconfig/fontconfig-devel/fcdircacheclean.html
-share/doc/fontconfig/fontconfig-devel/fcdircachecreateuuid.html
-share/doc/fontconfig/fontconfig-devel/fcdircachedeleteuuid.html
-share/doc/fontconfig/fontconfig-devel/fcdircacheload.html
-share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html
-share/doc/fontconfig/fontconfig-devel/fcdircacheread.html
-share/doc/fontconfig/fontconfig-devel/fcdircacherescan.html
-share/doc/fontconfig/fontconfig-devel/fcdircacheunlink.html
-share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html
-share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html
-share/doc/fontconfig/fontconfig-devel/fcdirsave.html
-share/doc/fontconfig/fontconfig-devel/fcdirscan.html
-share/doc/fontconfig/fontconfig-devel/fcfileisdir.html
-share/doc/fontconfig/fontconfig-devel/fcfilescan.html
-share/doc/fontconfig/fontconfig-devel/fcfini.html
-share/doc/fontconfig/fontconfig-devel/fcfontlist.html
-share/doc/fontconfig/fontconfig-devel/fcfontmatch.html
-share/doc/fontconfig/fontconfig-devel/fcfontrenderprepare.html
-share/doc/fontconfig/fontconfig-devel/fcfontsetadd.html
-share/doc/fontconfig/fontconfig-devel/fcfontsetcreate.html
-share/doc/fontconfig/fontconfig-devel/fcfontsetdestroy.html
-share/doc/fontconfig/fontconfig-devel/fcfontsetlist.html
-share/doc/fontconfig/fontconfig-devel/fcfontsetmatch.html
-share/doc/fontconfig/fontconfig-devel/fcfontsetprint.html
-share/doc/fontconfig/fontconfig-devel/fcfontsetsort.html
-share/doc/fontconfig/fontconfig-devel/fcfontsetsortdestroy.html
-share/doc/fontconfig/fontconfig-devel/fcfontsort.html
-share/doc/fontconfig/fontconfig-devel/fcfreetypecharindex.html
-share/doc/fontconfig/fontconfig-devel/fcfreetypecharset.html
-share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html
-share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html
-share/doc/fontconfig/fontconfig-devel/fcfreetypequeryall.html
-share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html
-share/doc/fontconfig/fontconfig-devel/fcgetdefaultlangs.html
-share/doc/fontconfig/fontconfig-devel/fcgetlangs.html
-share/doc/fontconfig/fontconfig-devel/fcgetversion.html
-share/doc/fontconfig/fontconfig-devel/fcinit.html
-share/doc/fontconfig/fontconfig-devel/fcinitbringuptodate.html
-share/doc/fontconfig/fontconfig-devel/fcinitloadconfig.html
-share/doc/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html
-share/doc/fontconfig/fontconfig-devel/fcinitreinitialize.html
-share/doc/fontconfig/fontconfig-devel/fcislower.html
-share/doc/fontconfig/fontconfig-devel/fcisupper.html
-share/doc/fontconfig/fontconfig-devel/fclanggetcharset.html
-share/doc/fontconfig/fontconfig-devel/fclangnormalize.html
-share/doc/fontconfig/fontconfig-devel/fclangsetadd.html
-share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html
-share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html
-share/doc/fontconfig/fontconfig-devel/fclangsetcopy.html
-share/doc/fontconfig/fontconfig-devel/fclangsetcreate.html
-share/doc/fontconfig/fontconfig-devel/fclangsetdel.html
-share/doc/fontconfig/fontconfig-devel/fclangsetdestroy.html
-share/doc/fontconfig/fontconfig-devel/fclangsetequal.html
-share/doc/fontconfig/fontconfig-devel/fclangsetgetlangs.html
-share/doc/fontconfig/fontconfig-devel/fclangsethash.html
-share/doc/fontconfig/fontconfig-devel/fclangsethaslang.html
-share/doc/fontconfig/fontconfig-devel/fclangsetsubtract.html
-share/doc/fontconfig/fontconfig-devel/fclangsetunion.html
-share/doc/fontconfig/fontconfig-devel/fcmatrixcopy.html
-share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html
-share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html
-share/doc/fontconfig/fontconfig-devel/fcmatrixmultiply.html
-share/doc/fontconfig/fontconfig-devel/fcmatrixrotate.html
-share/doc/fontconfig/fontconfig-devel/fcmatrixscale.html
-share/doc/fontconfig/fontconfig-devel/fcmatrixshear.html
-share/doc/fontconfig/fontconfig-devel/fcnameconstant.html
-share/doc/fontconfig/fontconfig-devel/fcnamegetconstant.html
-share/doc/fontconfig/fontconfig-devel/fcnamegetconstantfor.html
-share/doc/fontconfig/fontconfig-devel/fcnamegetobjecttype.html
-share/doc/fontconfig/fontconfig-devel/fcnameparse.html
-share/doc/fontconfig/fontconfig-devel/fcnameregisterconstants.html
-share/doc/fontconfig/fontconfig-devel/fcnameregisterobjecttypes.html
-share/doc/fontconfig/fontconfig-devel/fcnameunparse.html
-share/doc/fontconfig/fontconfig-devel/fcnameunregisterconstants.html
-share/doc/fontconfig/fontconfig-devel/fcnameunregisterobjecttypes.html
-share/doc/fontconfig/fontconfig-devel/fcobjectsetadd.html
-share/doc/fontconfig/fontconfig-devel/fcobjectsetbuild.html
-share/doc/fontconfig/fontconfig-devel/fcobjectsetcreate.html
-share/doc/fontconfig/fontconfig-devel/fcobjectsetdestroy.html
-share/doc/fontconfig/fontconfig-devel/fcpatternadd-type.html
-share/doc/fontconfig/fontconfig-devel/fcpatternadd.html
-share/doc/fontconfig/fontconfig-devel/fcpatternaddweak.html
-share/doc/fontconfig/fontconfig-devel/fcpatternbuild.html
-share/doc/fontconfig/fontconfig-devel/fcpatterncreate.html
-share/doc/fontconfig/fontconfig-devel/fcpatterndel.html
-share/doc/fontconfig/fontconfig-devel/fcpatterndestroy.html
-share/doc/fontconfig/fontconfig-devel/fcpatternduplicate.html
-share/doc/fontconfig/fontconfig-devel/fcpatternequal.html
-share/doc/fontconfig/fontconfig-devel/fcpatternequalsubset.html
-share/doc/fontconfig/fontconfig-devel/fcpatternfilter.html
-share/doc/fontconfig/fontconfig-devel/fcpatternfinditer.html
-share/doc/fontconfig/fontconfig-devel/fcpatternformat.html
-share/doc/fontconfig/fontconfig-devel/fcpatternget-type.html
-share/doc/fontconfig/fontconfig-devel/fcpatternget.html
-share/doc/fontconfig/fontconfig-devel/fcpatterngetwithbinding.html
-share/doc/fontconfig/fontconfig-devel/fcpatternhash.html
-share/doc/fontconfig/fontconfig-devel/fcpatterniterequal.html
-share/doc/fontconfig/fontconfig-devel/fcpatternitergetobject.html
-share/doc/fontconfig/fontconfig-devel/fcpatternitergetvalue.html
-share/doc/fontconfig/fontconfig-devel/fcpatterniterisvalid.html
-share/doc/fontconfig/fontconfig-devel/fcpatterniternext.html
-share/doc/fontconfig/fontconfig-devel/fcpatterniterstart.html
-share/doc/fontconfig/fontconfig-devel/fcpatternitervaluecount.html
-share/doc/fontconfig/fontconfig-devel/fcpatternobjectcount.html
-share/doc/fontconfig/fontconfig-devel/fcpatternprint.html
-share/doc/fontconfig/fontconfig-devel/fcpatternreference.html
-share/doc/fontconfig/fontconfig-devel/fcpatternremove.html
-share/doc/fontconfig/fontconfig-devel/fcrangecopy.html
-share/doc/fontconfig/fontconfig-devel/fcrangecreatedouble.html
-share/doc/fontconfig/fontconfig-devel/fcrangecreateinteger.html
-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
-share/doc/fontconfig/fontconfig-devel/fcstrcopyfilename.html
-share/doc/fontconfig/fontconfig-devel/fcstrdirname.html
-share/doc/fontconfig/fontconfig-devel/fcstrdowncase.html
-share/doc/fontconfig/fontconfig-devel/fcstrfree.html
-share/doc/fontconfig/fontconfig-devel/fcstrlistcreate.html
-share/doc/fontconfig/fontconfig-devel/fcstrlistdone.html
-share/doc/fontconfig/fontconfig-devel/fcstrlistfirst.html
-share/doc/fontconfig/fontconfig-devel/fcstrlistnext.html
-share/doc/fontconfig/fontconfig-devel/fcstrplus.html
-share/doc/fontconfig/fontconfig-devel/fcstrsetadd.html
-share/doc/fontconfig/fontconfig-devel/fcstrsetaddfilename.html
-share/doc/fontconfig/fontconfig-devel/fcstrsetcreate.html
-share/doc/fontconfig/fontconfig-devel/fcstrsetdel.html
-share/doc/fontconfig/fontconfig-devel/fcstrsetdestroy.html
-share/doc/fontconfig/fontconfig-devel/fcstrsetequal.html
-share/doc/fontconfig/fontconfig-devel/fcstrsetmember.html
-share/doc/fontconfig/fontconfig-devel/fcstrstr.html
-share/doc/fontconfig/fontconfig-devel/fcstrstrignorecase.html
-share/doc/fontconfig/fontconfig-devel/fctolower.html
-share/doc/fontconfig/fontconfig-devel/fcucs4toutf8.html
-share/doc/fontconfig/fontconfig-devel/fcutf16len.html
-share/doc/fontconfig/fontconfig-devel/fcutf16toucs4.html
-share/doc/fontconfig/fontconfig-devel/fcutf8len.html
-share/doc/fontconfig/fontconfig-devel/fcutf8toucs4.html
-share/doc/fontconfig/fontconfig-devel/fcvaluedestroy.html
-share/doc/fontconfig/fontconfig-devel/fcvalueequal.html
-share/doc/fontconfig/fontconfig-devel/fcvalueprint.html
-share/doc/fontconfig/fontconfig-devel/fcvaluesave.html
-share/doc/fontconfig/fontconfig-devel/fcweightfromopentype.html
-share/doc/fontconfig/fontconfig-devel/fcweightfromopentypedouble.html
-share/doc/fontconfig/fontconfig-devel/fcweighttoopentype.html
-share/doc/fontconfig/fontconfig-devel/fcweighttoopentypedouble.html
-share/doc/fontconfig/fontconfig-devel/ln12.html
-share/doc/fontconfig/fontconfig-devel/t1.html
-share/doc/fontconfig/fontconfig-devel/x103.html
-share/doc/fontconfig/fontconfig-devel/x19.html
-share/doc/fontconfig/fontconfig-devel/x31.html
-share/doc/fontconfig/fontconfig-user.html
-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
@@ -501,6 +45,7 @@ share/fontconfig/conf.avail/35-lang-norm
 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-guessfamily.conf
 share/fontconfig/conf.avail/48-spacing.conf
 share/fontconfig/conf.avail/49-sansserif.conf
 share/fontconfig/conf.avail/50-user.conf
@@ -512,6 +57,8 @@ share/fontconfig/conf.avail/65-khmer.con
 share/fontconfig/conf.avail/65-nonlatin.conf
 share/fontconfig/conf.avail/69-unifont.conf
 share/fontconfig/conf.avail/70-no-bitmap-webfonts.conf
+share/fontconfig/conf.avail/70-no-bitmaps-and-emoji.conf
+share/fontconfig/conf.avail/70-no-bitmaps-except-emoji.conf
 share/fontconfig/conf.avail/70-no-bitmaps.conf
 share/fontconfig/conf.avail/70-yes-bitmaps.conf
 share/fontconfig/conf.avail/80-delicious.conf

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.76 pkgsrc/fonts/fontconfig/distinfo:1.77
--- pkgsrc/fonts/fontconfig/distinfo:1.76       Sun Mar 30 21:10:42 2025
+++ pkgsrc/fonts/fontconfig/distinfo    Sun Aug 10 13:58:35 2025
@@ -1,15 +1,17 @@
-$NetBSD: distinfo,v 1.76 2025/03/30 21:10:42 wiz Exp $
+$NetBSD: distinfo,v 1.77 2025/08/10 13:58:35 ryoon Exp $
 
-BLAKE2s (fontconfig-2.15.0.tar.xz) = cc853fee4eda1050baf2cf5b1c8871b035f2cc0cc5507ef872e4350e158cbf92
-SHA512 (fontconfig-2.15.0.tar.xz) = 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417
-Size (fontconfig-2.15.0.tar.xz) = 1447820 bytes
+BLAKE2s (fontconfig-2.17.1.tar.xz) = 628b35de56b1f861d4b6a372bf0a2e91bcdaa72498336fc286f482dc9b45de3b
+SHA512 (fontconfig-2.17.1.tar.xz) = c09c1f041f61ee0d220ff906a86b5c4b329106dc96f8c04b23f8fdeb480df626717fe3613bccb41cb39e86334078139322710377f5ddaa3abe48569e798161c9
+Size (fontconfig-2.17.1.tar.xz) = 1326312 bytes
 SHA1 (patch-aa) = 8fec573ffd4bcc976681cae51a4ead1647e521e8
-SHA1 (patch-ac) = 10372dec9a5b7d2949798f3a4f45f437ab5b077c
-SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
-SHA1 (patch-configure) = 343cc3879f4d3d08a5d9d8101d47affa17f28df4
+SHA1 (patch-ac) = 869f7b831dde13626df5a25cf6ed74f5c64ffce4
+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_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
-SHA1 (patch-src_fcint.h) = 0f8accec35b75ad4cd4c558f9680d1f82548a308
-SHA1 (patch-src_fcstat.c) = f7c127ce77e637f3cc804f7de31fd256e59841c8
+SHA1 (patch-src_fcftint.h) = 28086bf5f6a1d397512699d7dc61b3716c971c89
+SHA1 (patch-src_fcint.h) = 2f7062dad03431fdf820f7bc61cdd767789d2caa
+SHA1 (patch-src_fcstat.c) = bbd650ce6f6a777393acb4fa33f211c2189e1f7d
 SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09

Index: pkgsrc/fonts/fontconfig/patches/patch-ac
diff -u pkgsrc/fonts/fontconfig/patches/patch-ac:1.15 pkgsrc/fonts/fontconfig/patches/patch-ac:1.16
--- pkgsrc/fonts/fontconfig/patches/patch-ac:1.15       Sat Dec 30 10:21:52 2023
+++ pkgsrc/fonts/fontconfig/patches/patch-ac    Sun Aug 10 13:58:35 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.15 2023/12/30 10:21:52 wiz Exp $
+$NetBSD: patch-ac,v 1.16 2025/08/10 13:58:35 ryoon Exp $
 
---- conf.d/Makefile.in.orig    2023-12-22 13:55:23.000000000 +0000
+--- conf.d/Makefile.in.orig    2025-07-02 04:53:19.334247000 +0000
 +++ conf.d/Makefile.in
-@@ -412,7 +412,7 @@ CONF_LINKS = \
- 
+@@ -404,7 +404,7 @@ CONF_LINKS = 10-hinting-$(PREFERRED_HINT
+       70-$(PREFERRED_BITMAP).conf
  EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
  CLEANFILES = $(DOC_FILES)
 -configdir = $(CONFIGDIR)
@@ -11,11 +11,11 @@ $NetBSD: patch-ac,v 1.15 2023/12/30 10:2
  config_DATA = $(DOC_FILES)
  templatedir = $(TEMPLATEDIR)
  template_DATA = \
-@@ -714,6 +714,7 @@ README: $(srcdir)/README.in
- 35-lang-normalize.conf: ../fc-lang/Makefile.am
+@@ -710,6 +710,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:
        $(PYTHON) $(srcdir)/link_confs.py $(templatedir) $(configdir) $(CONF_LINKS)
  uninstall-local:
+       @(echo cd $(DESTDIR)$(configdir);                       \

Index: pkgsrc/fonts/fontconfig/patches/patch-af
diff -u pkgsrc/fonts/fontconfig/patches/patch-af:1.2 pkgsrc/fonts/fontconfig/patches/patch-af:1.3
--- pkgsrc/fonts/fontconfig/patches/patch-af:1.2        Mon May 20 19:56:39 2013
+++ pkgsrc/fonts/fontconfig/patches/patch-af    Sun Aug 10 13:58:35 2025
@@ -1,16 +1,13 @@
-$NetBSD: patch-af,v 1.2 2013/05/20 19:56:39 adam Exp $
+$NetBSD: patch-af,v 1.3 2025/08/10 13:58:35 ryoon Exp $
 
---- conf.d/README.orig 2013-05-13 03:05:36.000000000 +0000
-+++ conf.d/README
-@@ -2,9 +2,8 @@ conf.d/README
+--- conf.d/README.in.orig      2025-01-17 15:15:05.000000000 +0000
++++ conf.d/README.in
+@@ -2,7 +2,7 @@ conf.d/README
  
  Each file in this directory is a fontconfig configuration file.  Fontconfig
  scans this directory, loading all files of the form [0-9][0-9]*.conf.
--These files are normally installed in /usr/share/fontconfig/conf.avail
--and then symlinked here, allowing them to be easily installed and then
--enabled/disabled by adjusting the symlinks.
+-These files are normally installed in @TEMPLATEDIR@
 +These files are normally installed in @PREFIX@/share/fontconfig/conf.avail
-+and then copied or symlinked here as needed.
+ and then symlinked here, allowing them to be easily installed and then
+ enabled/disabled by adjusting the symlinks.
  
- The files are loaded in numeric order, the structure of the configuration
- has led to the following conventions in usage:

Index: pkgsrc/fonts/fontconfig/patches/patch-configure
diff -u pkgsrc/fonts/fontconfig/patches/patch-configure:1.8 pkgsrc/fonts/fontconfig/patches/patch-configure:1.9
--- pkgsrc/fonts/fontconfig/patches/patch-configure:1.8 Sun Mar 30 21:10:42 2025
+++ pkgsrc/fonts/fontconfig/patches/patch-configure     Sun Aug 10 13:58:35 2025
@@ -1,26 +1,38 @@
-$NetBSD: patch-configure,v 1.8 2025/03/30 21:10:42 wiz Exp $
+$NetBSD: patch-configure,v 1.9 2025/08/10 13:58:35 ryoon Exp $
 
 Patch "GNU" gettext support to not depend unnecessary on "GNU" gettext.
 
---- configure.orig     2018-08-30 08:24:28.000000000 +0000
+--- configure.orig     2025-01-17 15:18:06.205389000 +0000
 +++ configure
-@@ -15236,8 +15236,7 @@ extern
+@@ -17797,14 +17797,13 @@ extern
  #ifdef __cplusplus
  "C"
  #endif
 -const char *_nl_expand_alias (const char *);
--#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *bindtextdomain ("", ""))
- #else
- #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
- #endif
-@@ -15273,8 +15272,7 @@ extern
+ 
+ int
+ main (void)
+ {
+ 
+ bindtextdomain ("", "");
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *bindtextdomain ("", "")
+ 
+   ;
+   return 0;
+@@ -17831,14 +17830,13 @@ extern
  #ifdef __cplusplus
  "C"
  #endif
 -const char *_nl_expand_alias (const char *);
--#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *bindtextdomain ("", ""))
- #else
- #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
- #endif
+ 
+ int
+ main (void)
+ {
+ 
+ bindtextdomain ("", "");
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *bindtextdomain ("", "")
+ 
+   ;
+   return 0;

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fcftint.h
diff -u pkgsrc/fonts/fontconfig/patches/patch-src_fcftint.h:1.1 pkgsrc/fonts/fontconfig/patches/patch-src_fcftint.h:1.2
--- pkgsrc/fonts/fontconfig/patches/patch-src_fcftint.h:1.1     Tue Jul 15 14:48:34 2014
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fcftint.h Sun Aug 10 13:58:35 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_fcftint.h,v 1.1 2014/07/15 14:48:34 ryoon Exp $
+$NetBSD: patch-src_fcftint.h,v 1.2 2025/08/10 13:58:35 ryoon Exp $
 
---- src/fcftint.h.orig 2014-01-20 08:14:20.000000000 +0000
+--- src/fcftint.h.orig 2025-07-02 04:46:34.000000000 +0000
 +++ src/fcftint.h
 @@ -25,7 +25,13 @@
  
@@ -13,7 +13,7 @@ $NetBSD: patch-src_fcftint.h,v 1.1 2014/
 +#define FcPrivate
 +#define HAVE_GNUC_ATTRIBUTE 1
 +#include "fcftalias.h"
-+#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
- #define FcPrivate             __attribute__((__visibility__("hidden")))
- #define HAVE_GNUC_ATTRIBUTE 1
- #include "fcftalias.h"
++#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
+ #  define FcPrivate           __attribute__ ((__visibility__ ("hidden")))
+ #  define HAVE_GNUC_ATTRIBUTE 1
+ #  include "fcftalias.h"

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h
diff -u pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h:1.3 pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h:1.4
--- pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h:1.3       Sun Mar 11 17:54:03 2018
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fcint.h   Sun Aug 10 13:58:35 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_fcint.h,v 1.3 2018/03/11 17:54:03 wiz Exp $
+$NetBSD: patch-src_fcint.h,v 1.4 2025/08/10 13:58:35 ryoon Exp $
 
---- src/fcint.h.orig   2018-02-04 10:20:56.000000000 +0000
+--- src/fcint.h.orig   2025-07-02 04:46:34.000000000 +0000
 +++ src/fcint.h
-@@ -76,6 +76,17 @@ extern pfnSHGetFolderPathA pSHGetFolderP
- #define FC_PATH_MAX   128
+@@ -92,6 +92,17 @@ extern pfnSHGetFolderPathA          pSHG
+ #  define FC_PATH_MAX 128
  #endif
  
 +/*
@@ -18,20 +18,20 @@ $NetBSD: patch-src_fcint.h,v 1.3 2018/03
 +#endif
 +
  #if __GNUC__ >= 4
- #define FC_UNUSED     __attribute__((unused))
+ #  define FC_UNUSED __attribute__ ((unused))
  #else
-@@ -103,7 +114,13 @@ extern pfnSHGetFolderPathA pSHGetFolderP
- #define FC_MAX(a,b) ((a) > (b) ? (a) : (b))
+@@ -123,7 +134,13 @@ extern pfnSHGetFolderPathA          pSHG
+ #define FC_MAX(a, b)                     ((a) > (b) ? (a) : (b))
  
  /* slim_internal.h */
--#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
+-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) && !defined(BINDGEN_IGNORE_VISIBILITY)
 +/* Bug of GCC 4.2 (visibility and -fPIC)
 +   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46861 */
 +#if (__GNUC__ == 4 && __GNUC_MINOR__ == 2) && defined(__ELF__) && !defined(__sun)
 +#define FcPrivate
 +#define HAVE_GNUC_ATTRIBUTE 1
 +#include "fcalias.h"
-+#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
- #define FcPrivate             __attribute__((__visibility__("hidden")))
- #define HAVE_GNUC_ATTRIBUTE 1
- #include "fcalias.h"
++#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) && !defined(BINDGEN_IGNORE_VISIBILITY)
+ #  define FcPrivate           __attribute__ ((__visibility__ ("hidden")))
+ #  define HAVE_GNUC_ATTRIBUTE 1
+ #  include "fcalias.h"

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c
diff -u pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c:1.7 pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c:1.8
--- pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c:1.7      Sun Mar 30 21:10:42 2025
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fcstat.c  Sun Aug 10 13:58:35 2025
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_fcstat.c,v 1.7 2025/03/30 21:10:42 wiz Exp $
+$NetBSD: patch-src_fcstat.c,v 1.8 2025/08/10 13:58:35 ryoon Exp $
 
 The argument types to scandir(3) differ between different OSes.
 I used the provided alphasort instead of rewriting the equivalent
 sorter function.
 
---- src/fcstat.c.orig  2016-04-06 03:22:55.000000000 +0000
+--- src/fcstat.c.orig  2025-07-02 04:46:34.000000000 +0000
 +++ src/fcstat.c
-@@ -52,6 +52,9 @@ typedef long long INT64;
- #define EPOCH_OFFSET 11644473600i64
- typedef __int64 INT64;
+@@ -337,6 +337,9 @@ FcStatChecksum (const FcChar8 *file, str
+           return -1;
+     }
  #endif
 +#if defined(_SCO_DS)
 +#include "../scandir.c"
 +#endif
  
- /* Workaround for problems in the stat() in the Microsoft C library:
-  *
+     return 0;
+ }

Added files:

Index: pkgsrc/fonts/fontconfig/patches/patch-conf.d_meson.build
diff -u /dev/null pkgsrc/fonts/fontconfig/patches/patch-conf.d_meson.build:1.1
--- /dev/null   Sun Aug 10 13:58:35 2025
+++ pkgsrc/fonts/fontconfig/patches/patch-conf.d_meson.build    Sun Aug 10 13:58:35 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-conf.d_meson.build,v 1.1 2025/08/10 13:58:35 ryoon Exp $
+
+--- conf.d/meson.build.orig    2025-01-17 15:15:05.000000000 +0000
++++ conf.d/meson.build
+@@ -74,11 +74,6 @@ install_data(conf_files,
+              install_dir: fc_templatedir,
+              install_tag: 'runtime')
+ 
+-meson.add_install_script('link_confs.py', fc_templatedir,
+-                         fc_configdir,
+-                         conf_links,
+-                         install_tag: 'runtime')
+-
+ # 35-lang-normalize.conf
+ orths = []
+ foreach o : orth_files          # orth_files is from fc-lang/meson.build
+@@ -101,6 +96,6 @@ readme_cdata.set('TEMPLATEDIR', fc_templ
+ configure_file(output: 'README',
+   input: 'README.in',
+   configuration: readme_cdata,
+-  install_dir: fc_configdir,
++  install_dir: '@PREFIX@/share/examples/fontconfig/conf.d',
+   install: true,
+   install_tag: 'runtime')
Index: pkgsrc/fonts/fontconfig/patches/patch-meson.build
diff -u /dev/null pkgsrc/fonts/fontconfig/patches/patch-meson.build:1.1
--- /dev/null   Sun Aug 10 13:58:35 2025
+++ pkgsrc/fonts/fontconfig/patches/patch-meson.build   Sun Aug 10 13:58:35 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-meson.build,v 1.1 2025/08/10 13:58:35 ryoon Exp $
+
+--- meson.build.orig   2025-04-02 14:51:30.122923578 +0000
++++ meson.build
+@@ -529,7 +529,7 @@ configure_file(output: 'config.h', confi
+ configure_file(output: 'fonts.conf',
+                input: 'fonts.conf.in',
+                configuration: fonts_conf,
+-               install_dir: fc_baseconfigdir,
++               install_dir: '@PREFIX@/share/examples/fontconfig',
+                install: true,
+                install_tag: 'runtime')
+

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