From owner-dev-commits-ports-all@freebsd.org Sun Jul 4 14:03:37 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B4C0F66567A; Sun, 4 Jul 2021 14:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GHrBx4gDVz58qX; Sun, 4 Jul 2021 14:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8902F14014; Sun, 4 Jul 2021 14:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 164E3baP096689; Sun, 4 Jul 2021 14:03:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 164E3bsB096688; Sun, 4 Jul 2021 14:03:37 GMT (envelope-from git) Date: Sun, 4 Jul 2021 14:03:37 GMT Message-Id: <202107041403.164E3bsB096688@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 4b4126ceba9b - main - x11-fonts/fontconfig: add upstream fix 49-sansserif.conf MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b4126ceba9b8adf8d7b6a6af421923ebba86118 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jul 2021 14:03:37 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b4126ceba9b8adf8d7b6a6af421923ebba86118 commit 4b4126ceba9b8adf8d7b6a6af421923ebba86118 Author: Ting-Wei Lan AuthorDate: 2021-07-04 14:01:10 +0000 Commit: Tobias C. Berner CommitDate: 2021-07-04 14:03:16 +0000 x11-fonts/fontconfig: add upstream fix 49-sansserif.conf After updating fontconfig 2.13.93, the configuration file '49-sansserif.conf' shipped with fontconfig itself stops working. This means if some glyphs cannot be found in the given font, fontconfig will pick fallback fonts randomly instead of honoring what the user sets as sans-serif. This commit pulls in upstreams fix for this issue from https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/142 See also upstreams PR: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/267 PR: 256969 --- x11-fonts/fontconfig/Makefile | 1 + x11-fonts/fontconfig/files/patch-src_fccfg.c | 42 ++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 2ae668106cf5..8aced7d414ae 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -2,6 +2,7 @@ PORTNAME= fontconfig DISTVERSION= 2.13.93 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= https://www.freedesktop.org/software/fontconfig/release/ diff --git a/x11-fonts/fontconfig/files/patch-src_fccfg.c b/x11-fonts/fontconfig/files/patch-src_fccfg.c new file mode 100644 index 000000000000..210815161b2b --- /dev/null +++ b/x11-fonts/fontconfig/files/patch-src_fccfg.c @@ -0,0 +1,42 @@ +From df29933e1a06b7aa7af229bd7cd03c62d957f15f Mon Sep 17 00:00:00 2001 +From: Szunti +Date: Sun, 6 Dec 2020 12:52:44 +0100 +Subject: [PATCH] Check qual and compare for family tests + +Fixes #267. Hash table lookups assumed qual="any" compare="eq". +Add a test too. +--- src/fccfg.c.orig 2020-11-28 01:56:42 UTC ++++ src/fccfg.c +@@ -1714,6 +1714,7 @@ FcConfigMatchValueList (FcPattern *p, + FcExpr *e = t->expr; + FcValue value; + FcValueList *v; ++ FcOp op; + + while (e) + { +@@ -1731,10 +1732,23 @@ FcConfigMatchValueList (FcPattern *p, + + if (t->object == FC_FAMILY_OBJECT && table) + { +- if (!FamilyTableLookup (table, t->op, FcValueString (&value))) ++ op = FC_OP_GET_OP (t->op); ++ if (op == FcOpEqual || op == FcOpListing) + { ++ if (!FamilyTableLookup (table, t->op, FcValueString (&value))) ++ { + ret = 0; + goto done; ++ } ++ } ++ if (op == FcOpNotEqual && t->qual == FcQualAll) ++ { ++ ret = 0; ++ if (!FamilyTableLookup (table, t->op, FcValueString (&value))) ++ { ++ ret = values; ++ } ++ goto done; + } + } + for (v = values; v; v = FcValueListNext(v))