pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: [pkgsrc-2026Q3] pkgsrc/fonts/fontconfig
Module Name: pkgsrc
Committed By: maya
Date: Thu Nov 19 19:50:52 UTC 2026
Modified Files:
pkgsrc/fonts/fontconfig [pkgsrc-2026Q3]: Makefile distinfo
pkgsrc/fonts/fontconfig/files [pkgsrc-2026Q3]:
70-no-bitmap-webfonts.conf
pkgsrc/fonts/fontconfig/patches [pkgsrc-2026Q3]: patch-conf.d_README.in
patch-meson.build patch-test_test-migration.c
Log Message:
Pullup ticket #7394 - requested by taca
fonts/fontconfig: Security fix
Revisions pulled up:
- fonts/fontconfig/Makefile 1.145-1.148
- fonts/fontconfig/distinfo 1.84-1.85
- fonts/fontconfig/files/70-no-bitmap-webfonts.conf 1.3
- fonts/fontconfig/patches/patch-conf.d_README.in 1.2
- fonts/fontconfig/patches/patch-meson.build 1.2
- fonts/fontconfig/patches/patch-test_test-migration.c 1.5
---
Module Name: pkgsrc
Committed By: nia
Date: Wed Nov 11 10:00:07 UTC 2026
Modified Files:
pkgsrc/fonts/fontconfig: Makefile
pkgsrc/fonts/fontconfig/files: 70-no-bitmap-webfonts.conf
Log Message:
fontconfig: Sync the list of blacklisted bitmap web fonts with NetBSD.
Adds "New Century Schoolbook", a standard X11 font whose bitmap version=
is selected for e.g. https://www.lua.org/pil/20.html
PR xsrc/60991
---
Module Name: pkgsrc
Committed By: nia
Date: Wed Nov 11 10:36:38 UTC 2026
Modified Files:
pkgsrc/fonts/fontconfig: Makefile
Log Message:
fontconfig: Set the default hinting type to slight.
Looks better on most modern displays and matches NetBSD base. Other
vendors also seem to default to this.
Vaguely related to PR xsrc/60991
---
Module Name: pkgsrc
Committed By: wiz
Date: Tue Nov 17 16:58:52 UTC 2026
Modified Files:
pkgsrc/fonts/fontconfig: Makefile distinfo
pkgsrc/fonts/fontconfig/patches: patch-conf.d_README.in
patch-meson.build patch-test_test-migration.c
Log Message:
fontconfig: fix rpath in pkg-config file
This was modifying the file used by the automake build system,
but the package is using the meson one.
Remove outdated comment about gperf.
Add some comments to patches while here.
Bump PKGREVISION for pkg-config file fix.
---
Module Name: pkgsrc
Committed By: wiz
Date: Wed Nov 18 22:32:07 UTC 2026
Modified Files:
pkgsrc/fonts/fontconfig: Makefile distinfo
Log Message:
fontconfig: update to 2.18.4.
Security fix release.
2.18.4
Akira TAGOH (5):
Guard against mixing plain strings and triples in an FcStrSet
Fix uninitialized read from GNU stderror_r variant
Harden allocation-failure handling flagged by an OpenScanHub audi=
t
Fix crash on odd-addreessed pattern strings
Fix out-of-bounds access in FcCharSetMerge when merging page 0xff=
ff
Dominik R=F6ttsches (3):
Fix arbitrary free in cache validation
Add regression tests for cache value type validation
Validate cache value types against their object
Jeremy Huddleston Sequoia (2):
Do not dereference a NULL glob string
Do not strip a current directory prefix off an absolute glob
Thomas Anderson (1):
Validate unserializable types and value bounds in FcCacheOffsetsV=
alid
Tom Anderson (2):
Fix race during FcConfig initialization
Don't use the family table for non-string test values
To generate a diff of this commit:
cvs rdiff -u -r1.143.2.1 -r1.143.2.2 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.82.2.1 -r1.82.2.2 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.2 -r1.2.48.1 \
pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf
cvs rdiff -u -r1.1 -r1.1.2.1 \
pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in
cvs rdiff -u -r1.1 -r1.1.10.1 \
pkgsrc/fonts/fontconfig/patches/patch-meson.build
cvs rdiff -u -r1.4 -r1.4.98.1 \
pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.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.143.2.1 pkgsrc/fonts/fontconfig/Makefile:1.143.2.2
--- pkgsrc/fonts/fontconfig/Makefile:1.143.2.1 Sun Nov 15 12:12:54 2026
+++ pkgsrc/fonts/fontconfig/Makefile Thu Nov 19 19:50:51 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.143.2.1 2026/11/15 12:12:54 bsiegert Exp $
+# $NetBSD: Makefile,v 1.143.2.2 2026/11/19 19:50:51 maya Exp $
-DISTNAME= fontconfig-2.18.3
-PKGREVISION= 1
+DISTNAME= fontconfig-2.18.4
CATEGORIES= fonts
MASTER_SITES= https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tar.xz
@@ -11,8 +10,7 @@ HOMEPAGE= https://www.fontconfig.org/
COMMENT= Library for configuring and customizing font access
#LICENSE= x11?
-# https://bugs.freedesktop.org/show_bug.cgi?id=101280
-TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
+TOOL_DEPENDS+= gperf>=0:../../devel/gperf
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config msgfmt
@@ -23,7 +21,9 @@ MESON_ARGS+= -Ddoc=disabled # docbook2m
CPPFLAGS.SunOS+= -D__EXTENSIONS__
-PKGCONFIG_OVERRIDE= fontconfig.pc.in
+PKGCONFIG_OVERRIDE= output/meson-private/fontconfig.pc
+
+PKGCONFIG_OVERRIDE_STAGE= post-configure
PKG_SYSCONFSUBDIR= fontconfig
@@ -68,7 +68,7 @@ TMPLDIR= ${PREFIX}/share/fontconfig/conf
MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d
# following list from ${WRKSRC}/conf.d/Makefile.am
FC_STDCONF= \
- 10-hinting-full.conf \
+ 10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
10-yes-antialias.conf \
10-sub-pixel-none.conf \
Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.82.2.1 pkgsrc/fonts/fontconfig/distinfo:1.82.2.2
--- pkgsrc/fonts/fontconfig/distinfo:1.82.2.1 Sun Nov 15 12:12:54 2026
+++ pkgsrc/fonts/fontconfig/distinfo Thu Nov 19 19:50:51 2026
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.82.2.1 2026/11/15 12:12:54 bsiegert Exp $
+$NetBSD: distinfo,v 1.82.2.2 2026/11/19 19:50:51 maya Exp $
-BLAKE2s (fontconfig-2.18.3.tar.xz) = 1545093d46806ebda642b80dd88f8a74742e7ba7c4abc2fa5341400c61077280
-SHA512 (fontconfig-2.18.3.tar.xz) = c3e769f74dc21093ada48084bddaca1ab525b1c4f04c5c11f067b69346fab153cad95de8b8238b20b02e8b9679c314bf2e0e9c4218511d8fe0f1826e4c4c6a24
-Size (fontconfig-2.18.3.tar.xz) = 1172016 bytes
+BLAKE2s (fontconfig-2.18.4.tar.xz) = bd694eda19a56ebeaf8e9e03da1ee815a9787ca220ac4355e3ea7baf99922ff0
+SHA512 (fontconfig-2.18.4.tar.xz) = 53b2759536963c649ef3950a94eb9971e9f2e3b96d8cc4e3265d4c3c2d14cb5cffa528435f04d5b22d0f43534e24e11c6e05822c933c77a58cb3a70dad2608d5
+Size (fontconfig-2.18.4.tar.xz) = 1178564 bytes
SHA1 (patch-conf.d_60-latin.conf) = 1b91549d1199a2e76c4807aa25f1fd3456f10848
-SHA1 (patch-conf.d_README.in) = 542245860fd4f5374a8935f41a757b2ae960633d
+SHA1 (patch-conf.d_README.in) = 14f32bf6f2870cea0d7b4f6bbcb817105255ce09
SHA1 (patch-conf.d_meson.build) = d4cda841bc0be5ba04fe63207bc8c3845bbad520
-SHA1 (patch-meson.build) = 12c848996a2e08aebcc89d155f36168666269dcc
+SHA1 (patch-meson.build) = 8639b6a571a545aad1cf2e09352e2d3651d5b4fc
SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
SHA1 (patch-src_fccharset.c) = a292088633030a67627cc73db501c504bc4ffd94
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
+SHA1 (patch-test_test-migration.c) = 11496da155a685a42d962d50e682a448358b8698
Index: pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf
diff -u pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf:1.2 pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf:1.2.48.1
--- pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf:1.2 Thu Nov 5 17:41:28 2020
+++ pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf Thu Nov 19 19:50:51 2026
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $NetBSD: 70-no-bitmap-webfonts.conf,v 1.2 2020/11/05 17:41:28 nia Exp $ -->
+<!-- $NetBSD: 70-no-bitmap-webfonts.conf,v 1.2.48.1 2026/11/19 19:50:51 maya Exp $ -->
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
@@ -34,6 +34,10 @@
<patelt name="family"><string>Utopia</string></patelt>
<patelt name="scalable"><bool>false</bool></patelt>
</pattern>
+ <pattern>
+ <patelt name="family"><string>New Century Schoolbook</string></patelt>
+ <patelt name="scalable"><bool>false</bool></patelt>
+ </pattern>
</rejectfont>
</selectfont>
</fontconfig>
Index: pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in
diff -u pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in:1.1 pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in:1.1.2.1
--- pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in:1.1 Fri Aug 14 14:01:21 2026
+++ pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in Thu Nov 19 19:50:51 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-conf.d_README.in,v 1.1 2026/08/14 14:01:21 adam Exp $
+$NetBSD: patch-conf.d_README.in,v 1.1.2.1 2026/11/19 19:50:51 maya Exp $
+
+Adapt to pkgsrc paths.
--- conf.d/README.in.orig 2025-01-17 15:15:05.000000000 +0000
+++ conf.d/README.in
Index: pkgsrc/fonts/fontconfig/patches/patch-meson.build
diff -u pkgsrc/fonts/fontconfig/patches/patch-meson.build:1.1 pkgsrc/fonts/fontconfig/patches/patch-meson.build:1.1.10.1
--- pkgsrc/fonts/fontconfig/patches/patch-meson.build:1.1 Sun Aug 10 13:58:35 2025
+++ pkgsrc/fonts/fontconfig/patches/patch-meson.build Thu Nov 19 19:50:51 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-meson.build,v 1.1 2025/08/10 13:58:35 ryoon Exp $
+$NetBSD: patch-meson.build,v 1.1.10.1 2026/11/19 19:50:51 maya Exp $
+
+Adapt to pkgsrc paths.
--- meson.build.orig 2025-04-02 14:51:30.122923578 +0000
+++ meson.build
Index: pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c
diff -u pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c:1.4 pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c:1.4.98.1
--- pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c:1.4 Tue Jul 15 14:48:34 2014
+++ pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c Thu Nov 19 19:50:51 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-test_test-migration.c,v 1.4 2014/07/15 14:48:34 ryoon Exp $
+$NetBSD: patch-test_test-migration.c,v 1.4.98.1 2026/11/19 19:50:51 maya Exp $
+
+Fix build on SCO OpenServer 5.0.7/3.2.
--- test/test-migration.c.orig 2014-01-20 08:14:21.000000000 +0000
+++ test/test-migration.c
Home |
Main Index |
Thread Index |
Old Index