Attachment 226377 Details for Bug 257119 – Patch for fontconfig

[patch] Patch for fontconfig

fontconfig-21394.patch (text/plain), 5.02 KB, created by Daniel Engberg on 2021-07-11 20:31:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-07-11 20:31:34 UTC

Size: 5.02 KB

patch

obsolete

>diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
>index 8aced7d414ae..178524431376 100644
>--- a/x11-fonts/fontconfig/Makefile
>+++ b/x11-fonts/fontconfig/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
> 
> PORTNAME=	fontconfig
>-DISTVERSION=	2.13.93
>-PORTREVISION?=	1
>+DISTVERSION=	2.13.94
> PORTEPOCH=	1
> CATEGORIES=	x11-fonts
> MASTER_SITES=	https://www.freedesktop.org/software/fontconfig/release/
>diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
>index 4b15b7171dd2..7d2eb30f06d8 100644
>--- a/x11-fonts/fontconfig/distinfo
>+++ b/x11-fonts/fontconfig/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1612204906
>-SHA256 (fontconfig-2.13.93.tar.xz) = ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0
>-SIZE (fontconfig-2.13.93.tar.xz) = 1418288
>+TIMESTAMP = 1625421212
>+SHA256 (fontconfig-2.13.94.tar.xz) = a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c
>+SIZE (fontconfig-2.13.94.tar.xz) = 1416832
>diff --git a/x11-fonts/fontconfig/files/patch-meson.build b/x11-fonts/fontconfig/files/patch-meson.build
>index e0cf68262003..406e4bcbb06a 100644
>--- a/x11-fonts/fontconfig/files/patch-meson.build
>+++ b/x11-fonts/fontconfig/files/patch-meson.build
>@@ -1,20 +1,20 @@
>---- meson.build.orig	2020-11-28 02:38:31 UTC
>+--- meson.build.orig	2021-07-04 17:55:10 UTC
> +++ meson.build
>-@@ -212,19 +212,19 @@ else
>-     conf.set_quoted('FC_DEFAULT_FONTS', '<dir>/System/Library/Fonts</dir> <dir>/Library/Fonts</dir> <dir>~/Library/Fonts</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font3</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font4</dir>')
>-     fonts_conf.set('FC_DEFAULT_FONTS', '<dir>/System/Library/Fonts</dir> <dir>/Library/Fonts</dir> <dir>~/Library/Fonts</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font3</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font4</dir>')
>+@@ -210,9 +210,9 @@ else
>+   if host_machine.system() == 'darwin'
>+     fc_fonts_path = ['/System/Library/Fonts', '/Library/Fonts', '~/Library/Fonts', '/System/Library/Assets/com_apple_MobileAsset_Font3', '/System/Library/Assets/com_apple_MobileAsset_Font4']
>    else
>--    conf.set_quoted('FC_DEFAULT_FONTS', '<dir>/usr/share/fonts</dir>')
>--    fonts_conf.set('FC_DEFAULT_FONTS', '<dir>/usr/share/fonts</dir>')
>-+    conf.set_quoted('FC_DEFAULT_FONTS', '<dir>%%FCDEFAULTFONTS%%</dir> <dir>%%FCADDFONTS%%</dir>')
>-+    fonts_conf.set('FC_DEFAULT_FONTS', '<dir>%%FCDEFAULTFONTS%%</dir> <dir>%%FCADDFONTS%%</dir>')
>+-    fc_fonts_path = ['/usr/share/fonts', '/usr/local/share/fonts']
>++    fc_fonts_path = ['%%FCDEFAULTFONTS%%', '%%FCADDFONTS%%']
>    endif
> -  fc_cachedir = join_paths(prefix, get_option('localstatedir'), 'cache', meson.project_name())
> +  fc_cachedir = '/var/db/fontconfig'
>    thread_dep = dependency('threads')
>    conf.set('HAVE_PTHREAD', 1)
>    deps += [thread_dep]
>- endif
>+@@ -229,10 +229,10 @@ endforeach
>+ conf.set_quoted('FC_DEFAULT_FONTS', escaped_xml_path)
>+ fonts_conf.set('FC_DEFAULT_FONTS', xml_path)
>  
> -fc_templatedir = join_paths(prefix, get_option('datadir'), 'fontconfig/conf.avail')
> +fc_templatedir = join_paths(prefix, get_option('sysconfdir'), 'fonts/conf.avail')
>@@ -25,7 +25,7 @@
>  
>  
>  conf.set_quoted('CONFIGDIR', fc_configdir)
>-@@ -361,7 +361,7 @@ configure_file(output: 'fonts.conf',
>+@@ -365,7 +365,7 @@ configure_file(output: 'fonts.conf',
>    install: true)
>  
>  install_data('fonts.dtd',
>diff --git a/x11-fonts/fontconfig/files/patch-src_fccfg.c b/x11-fonts/fontconfig/files/patch-src_fccfg.c
>deleted file mode 100644
>index 210815161b2b..000000000000
>--- a/x11-fonts/fontconfig/files/patch-src_fccfg.c
>+++ /dev/null
>@@ -1,42 +0,0 @@
>-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 257119: 226377