mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-03 11:12:13 +00:00
x11-fonts/fontconfig: Restore generation of font cache
Restore generation of cache prior to Meson switch Upstream patch provided by John Hein PR: 254963 Reported by: Piotr Smyrak Tested by: Piotr Smyrak and John Hein Approved by: arrowd (mentor) Obtained from: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/296 Differential Revision: https://reviews.freebsd.org/D31602
This commit is contained in:
parent
c7aa6ea8f7
commit
1215cfdc18
@ -26,6 +26,8 @@ SHEBANG_FILES= conf.d/link_confs.py \
|
||||
fc-lang/fc-lang.py
|
||||
|
||||
TEST_TARGET= test
|
||||
SUB_FILES= pkg-install
|
||||
SUB_LIST= PREFIX=${PREFIX}
|
||||
|
||||
# Custom configuration variables
|
||||
FCDEFAULTFONTS= ${PREFIX}/share/fonts
|
||||
@ -33,7 +35,7 @@ FCADDFONTS= ${LOCALBASE}/lib/X11/fonts
|
||||
|
||||
# To avoid circular dependency rebuild of docs (including manpages) needs to be
|
||||
# disabled as they depend on textproc/docbook-utils which requires fontconfig
|
||||
MESON_ARGS= -Ddefault_library=both -Ddoc=disabled
|
||||
MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dfc-cache=disabled
|
||||
|
||||
PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING}
|
||||
PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
|
||||
|
10
x11-fonts/fontconfig/files/patch-fc-cache_meson.build
Normal file
10
x11-fonts/fontconfig/files/patch-fc-cache_meson.build
Normal file
@ -0,0 +1,10 @@
|
||||
--- fc-cache/meson.build.orig 2021-01-28 11:53:32 UTC
|
||||
+++ fc-cache/meson.build
|
||||
@@ -8,6 +8,6 @@ fccache = executable('fc-cache', ['fc-cache.c', fcstdi
|
||||
tools_man_pages += ['fc-cache']
|
||||
|
||||
# Do not try to execute target's fc-cache on host when cross compiling
|
||||
-if not meson.is_cross_build()
|
||||
+if get_option('fc-cache').enabled() and not meson.is_cross_build()
|
||||
meson.add_install_script(fccache, '-s', '-f', '-v')
|
||||
endif
|
8
x11-fonts/fontconfig/files/patch-meson__options.txt
Normal file
8
x11-fonts/fontconfig/files/patch-meson__options.txt
Normal file
@ -0,0 +1,8 @@
|
||||
--- meson_options.txt.orig 2020-12-03 11:45:00 UTC
|
||||
+++ meson_options.txt
|
||||
@@ -11,3 +11,5 @@ option('tests', type : 'feature', value : 'auto', yiel
|
||||
description: 'Enable unit tests')
|
||||
option('tools', type : 'feature', value : 'auto', yield : true,
|
||||
description: 'Build command-line tools (fc-list, fc-query, etc.)')
|
||||
+option('fc-cache', type: 'feature', value : 'enabled',
|
||||
+ description : 'Run fc-cache on install')
|
Loading…
x
Reference in New Issue
Block a user