Attachment 226209 Details for Bug 256969 – Fix 49-sansserif.conf for fontconfig 2.13.93

[patch] Fix 49-sansserif.conf for fontconfig 2.13.93

fontconfig.patch (text/plain), 2.02 KB, created by Ting-Wei Lan on 2021-07-04 09:56:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ting-Wei Lan

Created: 2021-07-04 09:56:04 UTC

Size: 2.02 KB

patch

obsolete

>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 <Szunti@users.noreply.github.com>
>+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))

Actions: View | Diff

Attachments on bug 256969: 226209