CVS commit: pkgsrc/fonts/fontconfig

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec 30 10:21:52 UTC 2023

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile PLIST builtin.mk distinfo
        pkgsrc/fonts/fontconfig/patches: patch-ac

Log Message:
fontconfig: update to 2.15.0.

2.15

Akira TAGOH (39):
      Do not change the order of orth files
      Convert tabs to spaces
      Convert more tabs to spaces in docs
      src/meson.build: Store correct paths to fontconfig.pc.
      Fix a typo in description for HAVE_STDATOMIC_PRIMITIVES
      Report more detailed logs instead of assertion.
      Add some missing constant names for weight.
      Adujst indentation between programlisting in fontconfig-user.sgml
      Bump version to 2.14.2
      Clean up unused code
      Add another test case for flatpak
      Update 65-nonlatin.conf for macOS
      Change the order of the properties to the order of fontconfig cache format
      Add missing property descriptions
      Add namedinstance property
      Remove the problematic language from code and doc
      Fix a typo
      Fix a typo for FcCharSetDelChar doc
      Fix a typo in scalable property
      Use 'outline' instead of 'scalable' for bitmaps
      Add more docs about selectfont
      Rework CI implementation
      Fix a typo
      Rework CI implementation v2
      Apply a fix of ci-templates
      Fix uninitialized memory access when failing memory allocation.
      Create a symlink with relative path
      Fix an error of "initializer element is not constant"
      Update CaseFolding.txt to Unicode 15.1
      Update the encoding table for Simplified Chinese
      Retry to decode strings in the name table as UTF-16BE in some cases.
      Work around decoding strings in Macintosh encoding for the name table.
      Add iconv detection for meson build
      .gitlab-ci: Update
      CI: Update
      CI: static build only for rawhide
      Use memmove instead of memcpy
      Rename README to NEWS and add README.md
      Update so version

Ben Wagner (1):
      Fix leak of `reason` in _FcConfigParse when not complaining

Jean Abou Samra (2):
      Ignore LC_CTYPE if set to "UTF-8"
      Some doc clarifications

Khaled Hosny (2):
      Add FC_FONT_WRAPPER
      Detect standalone CFF fonts for FC_FONT_WRAPPER

Mike FABIAN (3):
      Add anp.orth, bhb.orth, hif.orth, mag.orth, raj.orth, and the.orth
      Add {agr,ayc,bem,ckb,cmn,dsb,hak,lij,lzh,mfe,mhr,miq,mjw,mnw,nan,nhn,niu,rif,sgs,shn,szl,tcy,tpi,unm,wae,yue,yuw}.orth
      Change index type to 16 bit and bump cache version to 9

Ondrej Balaz (1):
      Expand ~ in glob

Sefa Eyeoglu (1):
      Add optional 11-lcdfilter-none configuration

Tom Anderson (2):
      Fix filepaths added when scanning with sysroot
      Fix false-positive CFI failure

Vitaly Lysenkov (1):
      In fcfreetype.c, `GetScriptTags`: fix `use_of_uninitialized_value` and return the correct number of parsed tags in case the font file contains less tags than indicated.

Xavier Claessens (1):
      meson: Support any compiler with gcc or msvc argument syntax

lilinjie (1):
      fix typo

msizanoen1 (1):
      Reload MM/VF metadata for each font face in font collection

pell (1):
      fixed typos in fc-conflist.sgml

xiota (1):
      Add aliases for Helvetica LT Std


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/fonts/fontconfig/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/fonts/fontconfig/builtin.mk
cvs rdiff -u -r1.74 -r1.75 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/fonts/fontconfig/patches/patch-ac

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.131 pkgsrc/fonts/fontconfig/Makefile:1.132
--- pkgsrc/fonts/fontconfig/Makefile:1.131      Thu Nov 23 11:03:04 2023
+++ pkgsrc/fonts/fontconfig/Makefile    Sat Dec 30 10:21:52 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.131 2023/11/23 11:03:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.132 2023/12/30 10:21:52 wiz Exp $
 
-DISTNAME=      fontconfig-2.14.2
-PKGREVISION=   3
+DISTNAME=      fontconfig-2.15.0
 CATEGORIES=    fonts
 MASTER_SITES=  https://www.fontconfig.org/release/
 EXTRACT_SUFX=  .tar.xz
@@ -32,7 +31,7 @@ PKG_SYSCONFSUBDIR=    fontconfig
 .include "../../mk/compiler.mk"
 # Workaround for GCC 4.2 bug, http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46861
 # GCC 4.2 and -fPIC with visibility
-.if !empty(CC_VERSION:Mgcc-4.2.*)
+.if ${CC_VERSION:Mgcc-4.2.*}
 SUBST_CLASSES+=                        visibility
 SUBST_STAGE.visibility=                pre-configure
 SUBST_MESSAGE.visibility=      Removing visibility
@@ -74,6 +73,7 @@ FC_STDCONF=   \
        10-yes-antialias.conf   \
        10-sub-pixel-none.conf  \
        11-lcdfilter-default.conf \
+       11-lcdfilter-none.conf \
        20-unhint-small-vera.conf \
        30-metric-aliases.conf \
        40-nonlatin.conf \
@@ -118,7 +118,6 @@ post-install:
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.freetype2+=      freetype2>=2.8.1
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/fontconfig/PLIST
diff -u pkgsrc/fonts/fontconfig/PLIST:1.34 pkgsrc/fonts/fontconfig/PLIST:1.35
--- pkgsrc/fonts/fontconfig/PLIST:1.34  Tue Jan 31 15:25:04 2023
+++ pkgsrc/fonts/fontconfig/PLIST       Sat Dec 30 10:21:52 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2023/01/31 15:25:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.35 2023/12/30 10:21:52 wiz Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-conflist
@@ -492,6 +492,7 @@ share/fontconfig/conf.avail/10-yes-antia
 share/fontconfig/conf.avail/11-lcdfilter-default.conf
 share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
 share/fontconfig/conf.avail/11-lcdfilter-light.conf
+share/fontconfig/conf.avail/11-lcdfilter-none.conf
 share/fontconfig/conf.avail/20-unhint-small-vera.conf
 share/fontconfig/conf.avail/25-unhint-nonlatin.conf
 share/fontconfig/conf.avail/30-metric-aliases.conf

Index: pkgsrc/fonts/fontconfig/builtin.mk
diff -u pkgsrc/fonts/fontconfig/builtin.mk:1.14 pkgsrc/fonts/fontconfig/builtin.mk:1.15
--- pkgsrc/fonts/fontconfig/builtin.mk:1.14     Fri Jan 20 13:10:08 2023
+++ pkgsrc/fonts/fontconfig/builtin.mk  Sat Dec 30 10:21:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2023/01/20 13:10:08 wiz Exp $
+# $NetBSD: builtin.mk,v 1.15 2023/12/30 10:21:52 wiz Exp $
 
 BUILTIN_PKG:=  fontconfig
 
@@ -78,7 +78,6 @@ CHECK_BUILTIN.fontconfig?=    no
 
 .  if ${USE_BUILTIN.fontconfig:tl} == no
 BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.1nb2
-BUILDLINK_API_DEPENDS.freetype2+=      freetype2>=2.1.3
 .  endif
 
 .endif # CHECK_BUILTIN.fontconfig

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.74 pkgsrc/fonts/fontconfig/distinfo:1.75
--- pkgsrc/fonts/fontconfig/distinfo:1.74       Tue Jan 31 15:25:04 2023
+++ pkgsrc/fonts/fontconfig/distinfo    Sat Dec 30 10:21:52 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.74 2023/01/31 15:25:04 wiz Exp $
+$NetBSD: distinfo,v 1.75 2023/12/30 10:21:52 wiz Exp $
 
-BLAKE2s (fontconfig-2.14.2.tar.xz) = 840cd81d955d0f4a67dcbacca3b5498bf5d8a07c3372bc007668bef6d932b5d5
-SHA512 (fontconfig-2.14.2.tar.xz) = 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
-Size (fontconfig-2.14.2.tar.xz) = 1440844 bytes
+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
 SHA1 (patch-aa) = 8fec573ffd4bcc976681cae51a4ead1647e521e8
-SHA1 (patch-ac) = 47b98e6766d2a842bc69d209622dfe83d9b5d06e
+SHA1 (patch-ac) = 10372dec9a5b7d2949798f3a4f45f437ab5b077c
 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
 SHA1 (patch-configure) = 1fb33ba5c2cdac74eb3d30792cf762bd061bd8d2
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200

Index: pkgsrc/fonts/fontconfig/patches/patch-ac
diff -u pkgsrc/fonts/fontconfig/patches/patch-ac:1.14 pkgsrc/fonts/fontconfig/patches/patch-ac:1.15
--- pkgsrc/fonts/fontconfig/patches/patch-ac:1.14       Fri Jan 20 13:10:09 2023
+++ pkgsrc/fonts/fontconfig/patches/patch-ac    Sat Dec 30 10:21:52 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.14 2023/01/20 13:10:09 wiz Exp $
+$NetBSD: patch-ac,v 1.15 2023/12/30 10:21:52 wiz Exp $
 
---- conf.d/Makefile.in.orig    2022-10-21 07:33:38.000000000 +0000
+--- conf.d/Makefile.in.orig    2023-12-22 13:55:23.000000000 +0000
 +++ conf.d/Makefile.in
-@@ -411,7 +411,7 @@ CONF_LINKS = \
+@@ -412,7 +412,7 @@ CONF_LINKS = \
  
  EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
  CLEANFILES = $(DOC_FILES)
@@ -11,11 +11,11 @@ $NetBSD: patch-ac,v 1.14 2023/01/20 13:1
  config_DATA = $(DOC_FILES)
  templatedir = $(TEMPLATEDIR)
  template_DATA = \
-@@ -713,6 +713,7 @@ README: $(srcdir)/README.in
+@@ -714,6 +714,7 @@ README: $(srcdir)/README.in
+ 35-lang-normalize.conf: ../fc-lang/Makefile.am
        cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) $(top_builddir)/conf.d/35-lang-normalize.conf
  
  install-data-hook:
 +xinstall-data-hook:
-       mkdir -p $(DESTDIR)$(configdir)
-       @(echo cd $(DESTDIR)$(configdir);                       \
-         cd $(DESTDIR)$(configdir);                            \
+       $(PYTHON) $(srcdir)/link_confs.py $(templatedir) $(configdir) $(CONF_LINKS)
+ uninstall-local: