Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6A0BF1A923A for ; Mon, 5 Oct 2020 09:36:36 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E813084D6C; Mon, 5 Oct 2020 09:36:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6B63184D47 for ; Mon, 5 Oct 2020 09:36:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 5f2bfXseXULl for ; Mon, 5 Oct 2020 09:36:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BC70584CE9 for ; Mon, 5 Oct 2020 09:36:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AAA3DFB28; Mon, 5 Oct 2020 09:36:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1601890594139410" MIME-Version: 1.0 Date: Mon, 5 Oct 2020 09:36:34 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/fonts/fontconfig To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20201005093634.AAA3DFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1601890594139410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Mon Oct 5 09:36:34 UTC 2020 Modified Files: pkgsrc/fonts/fontconfig: Makefile PLIST Added Files: pkgsrc/fonts/fontconfig/files: 70-no-bitmap-webfonts.conf Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 pkgsrc/fonts/fontconfig/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/fonts/fontconfig/PLIST cvs rdiff -u -r0 -r1.1 \ pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1601890594139410 Content-Disposition: inline Content-Length: 3313 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/fonts/fontconfig/Makefile diff -u pkgsrc/fonts/fontconfig/Makefile:1.119 pkgsrc/fonts/fontconfig/Makefile:1.120 --- pkgsrc/fonts/fontconfig/Makefile:1.119 Tue Aug 18 08:19:17 2020 +++ pkgsrc/fonts/fontconfig/Makefile Mon Oct 5 09:36:34 2020 @@ -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 @@ FC_STDCONF= 10-scale-bitmap-fonts.conf 1 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 @@ pre-configure: 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" Index: pkgsrc/fonts/fontconfig/PLIST diff -u pkgsrc/fonts/fontconfig/PLIST:1.31 pkgsrc/fonts/fontconfig/PLIST:1.32 --- pkgsrc/fonts/fontconfig/PLIST:1.31 Sun Sep 2 20:30:43 2018 +++ pkgsrc/fonts/fontconfig/PLIST Mon Oct 5 09:36:34 2020 @@ -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-fonts-per 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 Added files: Index: pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf diff -u /dev/null pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf:1.1 --- /dev/null Mon Oct 5 09:36:34 2020 +++ pkgsrc/fonts/fontconfig/files/70-no-bitmap-webfonts.conf Mon Oct 5 09:36:34 2020 @@ -0,0 +1,31 @@ + + + + + + + + + Charter + false + + + Courier + false + + + Helvetica + false + + + Times + false + + + + --_----------=_1601890594139410--