[pkgsrc/trunk]: pkgsrc/fonts/fontconfig fontconfig: Avoid selecting bitmap fo...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4be30c65d4f9
branches:  trunk
changeset: 440253:4be30c65d4f9
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Oct 05 09:36:34 2020 +0000

description:
fontconfig: Avoid selecting bitmap fonts included as part of X11 that
are also included as scalable fonts as part of macOS.

Many websites will attempt to select these fonts, which results in
very strange, poor quality rendering.

This should keep legacy X11 applications that want the old "Helvetica"
and "Times" fonts working, but prevent them from being selected by
applications that want scalable fonts.

It should not prevent "Helvetica" or "Times" from being selected
if the user installs a scalable version.

Bump PKGREVISION

diffstat:

 fonts/fontconfig/Makefile                         |   6 ++-
 fonts/fontconfig/PLIST                            |   3 +-
 fonts/fontconfig/files/70-no-bitmap-webfonts.conf |  31 +++++++++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diffs (81 lines):

diff -r 849ce2a71805 -r 4be30c65d4f9 fonts/fontconfig/Makefile
--- a/fonts/fontconfig/Makefile Mon Oct 05 07:19:33 2020 +0000
+++ b/fonts/fontconfig/Makefile Mon Oct 05 09:36:34 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.119 2020/08/18 08:19:17 tnn Exp $
+# $NetBSD: Makefile,v 1.120 2020/10/05 09:36:34 nia Exp $
 
 DISTNAME=      fontconfig-2.13.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    fonts
 MASTER_SITES=  https://www.fontconfig.org/release/
 EXTRACT_SUFX=  .tar.bz2
@@ -77,6 +77,7 @@
        80-delicious.conf 90-synthetic.conf
 # pkgsrc addition
 FC_STDCONF+=   30-pkgsrc-aliases.conf
+FC_STDCONF+=   70-no-bitmap-webfonts.conf
 .for f in ${FC_STDCONF}
 CONF_FILES+=   ${TMPLDIR}/${f} ${PKG_SYSCONFDIR}/conf.d/${f}
 .endfor
@@ -102,6 +103,7 @@
 
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
+       ${INSTALL_DATA} ${FILESDIR}/70-no-bitmap-webfonts.conf ${DESTDIR}${TMPLDIR}
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 849ce2a71805 -r 4be30c65d4f9 fonts/fontconfig/PLIST
--- a/fonts/fontconfig/PLIST    Mon Oct 05 07:19:33 2020 +0000
+++ b/fonts/fontconfig/PLIST    Mon Oct 05 09:36:34 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2018/09/02 20:30:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.32 2020/10/05 09:36:34 nia Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-conflist
@@ -498,6 +498,7 @@
 share/fontconfig/conf.avail/65-khmer.conf
 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.conf
 share/fontconfig/conf.avail/70-yes-bitmaps.conf
 share/fontconfig/conf.avail/80-delicious.conf
diff -r 849ce2a71805 -r 4be30c65d4f9 fonts/fontconfig/files/70-no-bitmap-webfonts.conf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/fontconfig/files/70-no-bitmap-webfonts.conf Mon Oct 05 09:36:34 2020 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!-- $NetBSD: 70-no-bitmap-webfonts.conf,v 1.1 2020/10/05 09:36:34 nia Exp $ -->
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Reject X11 bitmap fonts which may be selected in place of scalable
+  proportional fonts, e.g. on the web.
+
+  Mostly these are included as scalable system fonts in macOS.
+-->
+       <selectfont>
+               <rejectfont>
+                       <pattern>
+                           <patelt name="family"><string>Charter</string></patelt>
+                           <patelt name="scalable"><bool>false</bool></patelt>
+                       </pattern>
+                       <pattern>
+                           <patelt name="family"><string>Courier</string></patelt>
+                           <patelt name="scalable"><bool>false</bool></patelt>
+                       </pattern>
+                       <pattern>
+                           <patelt name="family"><string>Helvetica</string></patelt>
+                           <patelt name="scalable"><bool>false</bool></patelt>
+                       </pattern>
+                       <pattern>
+                           <patelt name="family"><string>Times</string></patelt>
+                           <patelt name="scalable"><bool>false</bool></patelt>
+                       </pattern>
+               </rejectfont>
+       </selectfont>
+</fontconfig>