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,78 +1,77 @@ # Created by: Joe Marcus Clarke 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/ MAINTAINER= desktop@FreeBSD.org COMMENT= XML-based font configuration API for X Windows LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 USES= cpe gperf meson pkgconfig python:3.6+,build shebangfix tar:xz CPE_VENDOR= fontconfig_project USE_LDCONFIG= yes SHEBANG_FILES= conf.d/link_confs.py \ conf.d/write-35-lang-normalize-conf.py \ fc-case/fc-case.py \ fc-lang/fc-lang.py TEST_TARGET= test # Custom configuration variables FCDEFAULTFONTS= ${PREFIX}/share/fonts FCADDFONTS= ${LOCALBASE}/lib/X11/fonts # To avoid circular depdency docs (including manpages) needs to be disabled as # they depend on textproc/docbook-utils which requires fontconfig MESON_ARGS= -Ddefault_library=both -Ddoc=disabled PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING} OPTIONS_DEFINE= NLS BITMAPS TEST OPTIONS_DEFAULT=BITMAPS HINTING_SLIGHT OPTIONS_SUB= yes OPTIONS_SINGLE= HINTING .for opt in NONE SLIGHT MEDIUM FULL OPTIONS_SINGLE_HINTING+= HINTING_${opt} HINTING_${opt}_DESC= ${opt:tl} HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl} .endfor BITMAPS_DESC= Enable bitmap fonts by default HINTING_DESC= Preferred pixel hinting configuration NLS_USES= gettext-tools NLS_MESON_ENABLED= nls TEST_MESON_ENABLED= tests post-patch: @${REINPLACE_CMD} -e 's|%%FCDEFAULTFONTS%%|${FCDEFAULTFONTS}|g' \ ${PATCH_WRKSRC}/meson.build @${REINPLACE_CMD} -e 's|%%FCADDFONTS%%|${FCADDFONTS}|g' \ ${PATCH_WRKSRC}/meson.build @${REINPLACE_CMD} -e 's|%%FCPREFERREDHINTING%%|${PREFERRED_HINTING}|g' \ ${PATCH_WRKSRC}/conf.d/meson.build post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample @${MKDIR} ${STAGEDIR}/var/db/fontconfig post-install-BITMAPS-off: ${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-no-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf post-install-BITMAPS-on: ${RM} ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf ${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-yes-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-yes-bitmaps.conf .include 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,36 +1,36 @@ ---- 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', '/System/Library/Fonts /Library/Fonts ~/Library/Fonts /System/Library/Assets/com_apple_MobileAsset_Font3 /System/Library/Assets/com_apple_MobileAsset_Font4') - fonts_conf.set('FC_DEFAULT_FONTS', '/System/Library/Fonts /Library/Fonts ~/Library/Fonts /System/Library/Assets/com_apple_MobileAsset_Font3 /System/Library/Assets/com_apple_MobileAsset_Font4') +@@ -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', '/usr/share/fonts') -- fonts_conf.set('FC_DEFAULT_FONTS', '/usr/share/fonts') -+ conf.set_quoted('FC_DEFAULT_FONTS', '%%FCDEFAULTFONTS%% %%FCADDFONTS%%') -+ fonts_conf.set('FC_DEFAULT_FONTS', '%%FCDEFAULTFONTS%% %%FCADDFONTS%%') +- 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') fc_baseconfigdir = join_paths(prefix, get_option('sysconfdir'), 'fonts') fc_configdir = join_paths(fc_baseconfigdir, 'conf.d') -fc_xmldir = join_paths(prefix, get_option('datadir'), 'xml/fontconfig') +fc_xmldir = join_paths(prefix, get_option('sysconfdir'), 'fonts') 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', - install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'xml/fontconfig') + install_dir: join_paths(get_option('prefix'), get_option('sysconfdir'), 'fonts') ) fc_headers = [ 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 -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))