CVS commit: pkgsrc/fonts/fontconfig

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Nov 11 09:44:45 UTC 2026

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile distinfo
Added Files:
        pkgsrc/fonts/fontconfig/patches: patch-conf.d_60-latin.conf

Log Message:
fontconfig: Adjust default preference order to prefer Bitstream Vera
and Liberation fonts over the Luxi Type1 fonts, which freetype
struggles to render.  Helps make the default text rendering better in
e.g.  GTK applications and web browsers.

Luxi Type1 fonts are otherwise the only fonts in this list shipped with
X11 as standard.

PR xsrc/60991: fontconfig prefers Luxi Type1 fonts for Latin text, which
are extremely ugly


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/fonts/fontconfig/patches/patch-conf.d_60-latin.conf

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 pkgsrc/fonts/fontconfig/Makefile:1.144
--- pkgsrc/fonts/fontconfig/Makefile:1.143      Mon Aug 17 01:30:38 2026
+++ pkgsrc/fonts/fontconfig/Makefile    Wed Nov 11 09:44:45 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.143 2026/08/17 01:30:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.144 2026/11/11 09:44:45 nia Exp $
 
 DISTNAME=      fontconfig-2.18.3
+PKGREVISION=   1
 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.82 pkgsrc/fonts/fontconfig/distinfo:1.83
--- pkgsrc/fonts/fontconfig/distinfo:1.82       Fri Aug 14 14:01:21 2026
+++ pkgsrc/fonts/fontconfig/distinfo    Wed Nov 11 09:44:45 2026
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.82 2026/08/14 14:01:21 adam Exp $
+$NetBSD: distinfo,v 1.83 2026/11/11 09:44:45 nia 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
+SHA1 (patch-conf.d_60-latin.conf) = 1b91549d1199a2e76c4807aa25f1fd3456f10848
 SHA1 (patch-conf.d_README.in) = 542245860fd4f5374a8935f41a757b2ae960633d
 SHA1 (patch-conf.d_meson.build) = d4cda841bc0be5ba04fe63207bc8c3845bbad520
 SHA1 (patch-meson.build) = 12c848996a2e08aebcc89d155f36168666269dcc

Added files:

Index: pkgsrc/fonts/fontconfig/patches/patch-conf.d_60-latin.conf
diff -u /dev/null pkgsrc/fonts/fontconfig/patches/patch-conf.d_60-latin.conf:1.1
--- /dev/null   Wed Nov 11 09:44:45 2026
+++ pkgsrc/fonts/fontconfig/patches/patch-conf.d_60-latin.conf  Wed Nov 11 09:44:45 2026
@@ -0,0 +1,59 @@
+$NetBSD: patch-conf.d_60-latin.conf,v 1.1 2026/11/11 09:44:45 nia Exp $
+
+Adjust default preference order to prefer Bitstream Vera and Liberation
+fonts over the Luxi Type1 fonts, which freetype struggles to render.
+Helps make the default text rendering better in e.g.  GTK applications
+and web browsers.
+
+Luxi Type1 fonts are otherwise the only fonts in this list shipped with
+X11 as standard.
+
+PR xsrc/60991: fontconfig prefers Luxi Type1 fonts for Latin text, which
+are extremely ugly
+
+--- conf.d/60-latin.conf.orig  2026-08-06 06:05:15.000000000 +0000
++++ conf.d/60-latin.conf
+@@ -9,7 +9,8 @@
+                       <family>DejaVu Serif</family>
+                       <family>Times New Roman</family>
+                       <family>Thorndale AMT</family>
+-                      <family>Luxi Serif</family>
++                      <family>Bitstream Vera Serif</family>
++                      <family>Liberation Serif</family>
+                       <family>Nimbus Roman No9 L</family>
+                       <family>Nimbus Roman</family>
+                       <family>Times</family>
+@@ -23,7 +24,8 @@
+                       <family>Verdana</family>
+                       <family>Arial</family>
+                       <family>Albany AMT</family>
+-                      <family>Luxi Sans</family>
++                      <family>Bitstream Vera Sans</family>
++                      <family>Liberation Sans</family>
+                       <family>Nimbus Sans L</family>
+                       <family>Nimbus Sans</family>
+                       <family>Helvetica</family>
+@@ -41,7 +43,8 @@
+                       <family>Andale Mono</family>
+                       <family>Courier New</family>
+                       <family>Cumberland AMT</family>
+-                      <family>Luxi Mono</family>
++                      <family>Bitstream Vera Sans Mono</family>
++                      <family>Liberation Mono</family>
+                       <family>Nimbus Mono L</family>
+                       <family>Nimbus Mono</family>
+                       <family>Nimbus Mono PS</family>
+@@ -77,13 +80,11 @@ -->
+       <alias>
+               <family>system-ui</family>
+               <prefer>
+-                      <family>Adwaita Sans</family>
+                       <family>Cantarell</family>
+                       <family>Noto Sans UI</family>
+                       <family>Segoe UI</family>
+                       <family>Segoe UI Historic</family>
+                       <family>Segoe UI Symbol</family>
+-                      <family>Noto Sans</family><!-- fallback -->
+               </prefer>
+       </alias>
+