View | Details | Raw Unified | Return to bug 254963 | Differences between
and this patch

Collapse All | Expand All

(-)b/x11-fonts/fontconfig/Makefile (+1 lines)
Lines 16-21 LIB_DEPENDS= libfreetype.so:print/freetype2 \ Link Here
16
		libexpat.so:textproc/expat2
16
		libexpat.so:textproc/expat2
17
17
18
USES=		cpe gperf meson pkgconfig python:3.6+,build shebangfix tar:xz
18
USES=		cpe gperf meson pkgconfig python:3.6+,build shebangfix tar:xz
19
CONFIGURE_ARGS=	-Dfc-cache=disabled
19
CPE_VENDOR=	fontconfig_project
20
CPE_VENDOR=	fontconfig_project
20
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
21
22
(-)b/x11-fonts/fontconfig/files/patch-fc-cache_meson.build (+21 lines)
Added Link Here
1
Add option to avoid running fc-cache on install (make stage).
2
This can be committed upstream.
3
4
--- meson_options.txt.orig	2020-12-03 11:45:00 UTC
5
+++ meson_options.txt
6
@@ -11,3 +11,5 @@ option('tests', type : 'feature', value 
7
   description: 'Enable unit tests')
8
 option('tools', type : 'feature', value : 'auto', yield : true,
9
   description: 'Build command-line tools (fc-list, fc-query, etc.)')
10
+option('fc-cache', type: 'feature', value : 'enabled',
11
+  description : 'Run fc-cache on install')
12
--- fc-cache/meson.build.orig	2021-01-28 11:53:32 UTC
13
+++ fc-cache/meson.build
14
@@ -8,6 +8,6 @@ fccache = executable('fc-cache', ['fc-ca
15
 tools_man_pages += ['fc-cache']
16
 
17
 # Do not try to execute target's fc-cache on host when cross compiling
18
-if not meson.is_cross_build()
19
+if get_option('fc-cache').enabled() and not meson.is_cross_build()
20
   meson.add_install_script(fccache, '-s', '-f', '-v')
21
 endif
(-)b/x11-fonts/fontconfig/pkg-plist (+1 lines)
Lines 79-81 share/gettext/its/fontconfig.loc Link Here
79
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
79
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
80
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
80
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
81
@dir /var/db/fontconfig
81
@dir /var/db/fontconfig
82
@postexec %D/bin/fc-cache -f -s -v

Return to bug 254963