Attachment #240067 for bug #268627

Lines 1-5 Link Here

(-)b/x11-fonts/fontconfig/Makefile (-14 / +9 lines)
1	PORTNAME= fontconfig	1	PORTNAME= fontconfig
2	DISTVERSION= 2.14.0	2	DISTVERSION= 2.14.2
3	PORTEPOCH= 1	3	PORTEPOCH= 1
4	CATEGORIES= x11-fonts	4	CATEGORIES= x11-fonts
5	MASTER_SITES= https://www.freedesktop.org/software/fontconfig/release/	5	MASTER_SITES= https://www.freedesktop.org/software/fontconfig/release/
Lines 26-38 SHEBANG_FILES= conf.d/link_confs.py \ Link Here
26		26
27	TEST_TARGET= test	27	TEST_TARGET= test
28		28
29	# Custom configuration variables
30	FCDEFAULTFONTS= ${PREFIX}/share/fonts
31	FCADDFONTS= ${LOCALBASE}/lib/X11/fonts
32
33	# To avoid circular dependency rebuild of docs (including manpages) needs to be	29	# To avoid circular dependency rebuild of docs (including manpages) needs to be
34	# disabled as they depend on textproc/docbook-utils which requires fontconfig	30	# disabled as they depend on textproc/docbook-utils which requires fontconfig
35	MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled	31	MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled \
		32	-Ddefault-fonts-dirs=${PREFIX}/share/fonts \
		33	-Dadditional-fonts-dirs=${LOCALBASE}/lib/X11/fonts \
		34	-Dlocalstatedir=/var \
		35	-Dcache-dir=/var/db/fontconfig \
		36	-Dtemplate-dir=${LOCALBASE}/etc/fonts/conf.avail \
		37	-Dxml-dir=${LOCALBASE}/etc/fonts
36		38
37	PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING}	39	PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING}
38	PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt	40	PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
Lines 46-51 OPTIONS_SINGLE= HINTING Link Here
46	OPTIONS_SINGLE_HINTING+= HINTING_${opt}	48	OPTIONS_SINGLE_HINTING+= HINTING_${opt}
47	HINTING_${opt}_DESC= ${opt:tl}	49	HINTING_${opt}_DESC= ${opt:tl}
48	HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl}	50	HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl}
		51	HINTING_${opt}_MESON_ON= -Ddefault-hinting=${opt:tl}
49	.endfor	52	.endfor
50		53
51	BITMAPS_DESC= Enable bitmap fonts by default	54	BITMAPS_DESC= Enable bitmap fonts by default
Lines 56-69 NLS_MESON_ENABLED= nls Link Here
56		59
57	TEST_MESON_ENABLED= tests	60	TEST_MESON_ENABLED= tests
58		61
59	post-patch:
60	@${REINPLACE_CMD} -e 's\|%%FCDEFAULTFONTS%%\|${FCDEFAULTFONTS}\|g' \
61	${PATCH_WRKSRC}/meson.build
62	@${REINPLACE_CMD} -e 's\|%%FCADDFONTS%%\|${FCADDFONTS}\|g' \
63	${PATCH_WRKSRC}/meson.build
64	@${REINPLACE_CMD} -e 's\|%%FCPREFERREDHINTING%%\|${PREFERRED_HINTING}\|g' \
65	${PATCH_WRKSRC}/conf.d/meson.build
66
67	post-install:	62	post-install:
68	${INSTALL_MAN} ${WRKSRC}/fc-/.1 ${STAGEDIR}${PREFIX}/man/man1	63	${INSTALL_MAN} ${WRKSRC}/fc-/.1 ${STAGEDIR}${PREFIX}/man/man1
69	${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${PREFIX}/man/man3	64	${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${PREFIX}/man/man3

Lines 1-3 Link Here

(-)b/x11-fonts/fontconfig/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1661936025	1	TIMESTAMP = 1676011090
2	SHA256 (fontconfig-2.14.0.tar.xz) = dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac	2	SHA256 (fontconfig-2.14.2.tar.xz) = dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
3	SIZE (fontconfig-2.14.0.tar.xz) = 1431056	3	SIZE (fontconfig-2.14.2.tar.xz) = 1440844




--- conf.d/meson.build.orig	2020-11-28 01:56:42 UTC
+++ conf.d/meson.build
@@ -37,7 +37,7 @@ conf_files = [
   '90-synthetic.conf',
 ]
 
-preferred_hinting = 'slight'
+preferred_hinting = '%%FCPREFERREDHINTING%%'
 
 conf_links = [
   '10-hinting-@0@.conf'.format(preferred_hinting),
@@ -59,10 +59,10 @@ conf_links = [
   '90-synthetic.conf',
 ]
 
-install_data(conf_files, install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail'))
+install_data(conf_files, install_dir: join_paths(get_option('sysconfdir'), 'fonts/conf.avail'))
 
 meson.add_install_script('link_confs.py',
-  join_paths(get_option('prefix'), get_option('datadir'), 'fontconfig/conf.avail'),
+  join_paths(get_option('prefix'), get_option('sysconfdir'), 'fonts/conf.avail'),
   join_paths(get_option('sysconfdir'), 'fonts', 'conf.d'),
   conf_links,
 )
@@ -79,7 +79,7 @@ endforeach
 custom_target('35-lang-normalize.conf',
   output: '35-lang-normalize.conf',
   command: [find_program('write-35-lang-normalize-conf.py'), ','.join(orths), '@OUTPUT@'],
-  install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail'),
+  install_dir: join_paths(get_option('sysconfdir'), 'fonts/conf.avail'),
   install: true)
 
 # README




--- meson.build.orig	2022-12-27 07:24:19 UTC
+++ meson.build
@@ -432,7 +432,7 @@ configure_file(output: 'fonts.conf',
   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
-    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]
@@ -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)
@@ -365,7 +365,7 @@ configure_file(output: 'fonts.conf',
   install: true)
 
 install_data('fonts.dtd',

Removed Link Here

(-)a/x11-fonts/fontconfig/files/patch-meson__options.txt (-8 lines)
1	--- meson_options.txt.orig 2020-12-03 11:45:00 UTC
2	+++ meson_options.txt
3	@@ -11,3 +11,5 @@ option('tests', type : 'feature', value : 'auto', yiel
4	description: 'Enable unit tests')
5	option('tools', type : 'feature', value : 'auto', yield : true,
6	description: 'Build command-line tools (fc-list, fc-query, etc.)')
7	+option('fc-cache', type: 'feature', value : 'enabled',
8	+ description : 'Run fc-cache on install')




--- src/meson.build.orig	2020-11-28 01:56:42 UTC
+++ src/meson.build
@@ -88,7 +88,7 @@ pkgmod.generate(libfontconfig,
   version: fc_version,
   variables: [
     'sysconfdir=@0@'.format(join_paths(prefix, get_option('sysconfdir'))),
-    'localstatedir=@0@'.format(join_paths(prefix, get_option('localstatedir'))),
+    'localstatedir=/var',
     'confdir=${sysconfdir}/fonts',
-    'cachedir=${localstatedir}/cache/fontconfig',
+    'cachedir=/var/db/fontconfig',
   ])

Lines 14-26 etc/fonts/conf.avail/10-hinting-full.conf Link Here

(-)b/x11-fonts/fontconfig/pkg-plist (-1 / +8 lines)
14	etc/fonts/conf.avail/10-hinting-medium.conf	14	etc/fonts/conf.avail/10-hinting-medium.conf
15	etc/fonts/conf.avail/10-hinting-none.conf	15	etc/fonts/conf.avail/10-hinting-none.conf
16	etc/fonts/conf.avail/10-hinting-slight.conf	16	etc/fonts/conf.avail/10-hinting-slight.conf
17	etc/fonts/conf.avail/10-no-sub-pixel.conf	17	etc/fonts/conf.avail/10-no-antialias.conf
18	etc/fonts/conf.avail/10-scale-bitmap-fonts.conf	18	etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
19	etc/fonts/conf.avail/10-sub-pixel-bgr.conf	19	etc/fonts/conf.avail/10-sub-pixel-bgr.conf
		20	etc/fonts/conf.avail/10-sub-pixel-none.conf
20	etc/fonts/conf.avail/10-sub-pixel-rgb.conf	21	etc/fonts/conf.avail/10-sub-pixel-rgb.conf
21	etc/fonts/conf.avail/10-sub-pixel-vbgr.conf	22	etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
22	etc/fonts/conf.avail/10-sub-pixel-vrgb.conf	23	etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
23	etc/fonts/conf.avail/10-unhinted.conf	24	etc/fonts/conf.avail/10-unhinted.conf
		25	etc/fonts/conf.avail/10-yes-antialias.conf
24	etc/fonts/conf.avail/11-lcdfilter-default.conf	26	etc/fonts/conf.avail/11-lcdfilter-default.conf
25	etc/fonts/conf.avail/11-lcdfilter-legacy.conf	27	etc/fonts/conf.avail/11-lcdfilter-legacy.conf
26	etc/fonts/conf.avail/11-lcdfilter-light.conf	28	etc/fonts/conf.avail/11-lcdfilter-light.conf
Lines 47-52 etc/fonts/conf.avail/80-delicious.conf Link Here
47	etc/fonts/conf.avail/90-synthetic.conf	49	etc/fonts/conf.avail/90-synthetic.conf
48	etc/fonts/conf.d/10-hinting-%%PREFERRED_HINTING%%.conf	50	etc/fonts/conf.d/10-hinting-%%PREFERRED_HINTING%%.conf
49	etc/fonts/conf.d/10-scale-bitmap-fonts.conf	51	etc/fonts/conf.d/10-scale-bitmap-fonts.conf
		52	etc/fonts/conf.d/10-sub-pixel-none.conf
		53	etc/fonts/conf.d/10-yes-antialias.conf
50	etc/fonts/conf.d/11-lcdfilter-default.conf	54	etc/fonts/conf.d/11-lcdfilter-default.conf
51	etc/fonts/conf.d/20-unhint-small-vera.conf	55	etc/fonts/conf.d/20-unhint-small-vera.conf
52	etc/fonts/conf.d/30-metric-aliases.conf	56	etc/fonts/conf.d/30-metric-aliases.conf
Lines 223-228 man/man3/FcMatrixScale.3.gz Link Here
223	man/man3/FcMatrixShear.3.gz	227	man/man3/FcMatrixShear.3.gz
224	man/man3/FcNameConstant.3.gz	228	man/man3/FcNameConstant.3.gz
225	man/man3/FcNameGetConstant.3.gz	229	man/man3/FcNameGetConstant.3.gz
		230	man/man3/FcNameGetConstantFor.3.gz
226	man/man3/FcNameGetObjectType.3.gz	231	man/man3/FcNameGetObjectType.3.gz
227	man/man3/FcNameParse.3.gz	232	man/man3/FcNameParse.3.gz
228	man/man3/FcNameRegisterConstants.3.gz	233	man/man3/FcNameRegisterConstants.3.gz
Lines 307-312 man/man3/FcWeightToOpenTypeDouble.3.gz Link Here
307	man/man5/fonts-conf.5.gz	312	man/man5/fonts-conf.5.gz
308	share/gettext/its/fontconfig.its	313	share/gettext/its/fontconfig.its
309	share/gettext/its/fontconfig.loc	314	share/gettext/its/fontconfig.loc
		315	%%NLS%%share/locale/ka/LC_MESSAGES/fontconfig-conf.mo
		316	%%NLS%%share/locale/ka/LC_MESSAGES/fontconfig.mo
310	%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo	317	%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
311	%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig.mo	318	%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
312	@dir /var/db/fontconfig	319	@dir /var/db/fontconfig

Return to bug 268627

Removed Link Here

(-)a/x11-fonts/fontconfig/files/patch-conf.d_meson.build (-33 lines)
1	--- conf.d/meson.build.orig 2020-11-28 01:56:42 UTC
2	+++ conf.d/meson.build
3	@@ -37,7 +37,7 @@ conf_files = [
4	'90-synthetic.conf',
5	]
6
7	-preferred_hinting = 'slight'
8	+preferred_hinting = '%%FCPREFERREDHINTING%%'
9
10	conf_links = [
11	'10-hinting-@0@.conf'.format(preferred_hinting),
12	@@ -59,10 +59,10 @@ conf_links = [
13	'90-synthetic.conf',
14	]
15
16	-install_data(conf_files, install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail'))
17	+install_data(conf_files, install_dir: join_paths(get_option('sysconfdir'), 'fonts/conf.avail'))
18
19	meson.add_install_script('link_confs.py',
20	- join_paths(get_option('prefix'), get_option('datadir'), 'fontconfig/conf.avail'),
21	+ join_paths(get_option('prefix'), get_option('sysconfdir'), 'fonts/conf.avail'),
22	join_paths(get_option('sysconfdir'), 'fonts', 'conf.d'),
23	conf_links,
24	)
25	@@ -79,7 +79,7 @@ endforeach
26	custom_target('35-lang-normalize.conf',
27	output: '35-lang-normalize.conf',
28	command: [find_program('write-35-lang-normalize-conf.py'), ','.join(orths), '@OUTPUT@'],
29	- install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail'),
30	+ install_dir: join_paths(get_option('sysconfdir'), 'fonts/conf.avail'),
31	install: true)
32
33	# README

Lines 1-31 Link Here

(-)b/x11-fonts/fontconfig/files/patch-meson.build (-27 / +2 lines)
1	--- meson.build.orig 2021-07-04 17:55:10 UTC	1	--- meson.build.orig 2022-12-27 07:24:19 UTC
2	+++ meson.build	2	+++ meson.build
3	@@ -210,9 +210,9 @@ else	3	@@ -432,7 +432,7 @@ configure_file(output: 'fonts.conf',
4	if host_machine.system() == 'darwin'
5	fc_fonts_path = ['/System/Library/Fonts', '/Library/Fonts', '~/Library/Fonts', '/System/Library/Assets/com_apple_MobileAsset_Font3', '/System/Library/Assets/com_apple_MobileAsset_Font4']
6	else
7	- fc_fonts_path = ['/usr/share/fonts', '/usr/local/share/fonts']
8	+ fc_fonts_path = ['%%FCDEFAULTFONTS%%', '%%FCADDFONTS%%']
9	endif
10	- fc_cachedir = join_paths(prefix, get_option('localstatedir'), 'cache', meson.project_name())
11	+ fc_cachedir = '/var/db/fontconfig'
12	thread_dep = dependency('threads')
13	conf.set('HAVE_PTHREAD', 1)
14	deps += [thread_dep]
15	@@ -229,10 +229,10 @@ endforeach
16	conf.set_quoted('FC_DEFAULT_FONTS', escaped_xml_path)
17	fonts_conf.set('FC_DEFAULT_FONTS', xml_path)
18
19	-fc_templatedir = join_paths(prefix, get_option('datadir'), 'fontconfig/conf.avail')
20	+fc_templatedir = join_paths(prefix, get_option('sysconfdir'), 'fonts/conf.avail')
21	fc_baseconfigdir = join_paths(prefix, get_option('sysconfdir'), 'fonts')
22	fc_configdir = join_paths(fc_baseconfigdir, 'conf.d')
23	-fc_xmldir = join_paths(prefix, get_option('datadir'), 'xml/fontconfig')
24	+fc_xmldir = join_paths(prefix, get_option('sysconfdir'), 'fonts')
25
26
27	conf.set_quoted('CONFIGDIR', fc_configdir)
28	@@ -365,7 +365,7 @@ configure_file(output: 'fonts.conf',
29	install: true)	4	install: true)
30		5
31	install_data('fonts.dtd',	6	install_data('fonts.dtd',

Removed Link Here

(-)a/x11-fonts/fontconfig/files/patch-src_meson.build (-12 lines)
1	--- src/meson.build.orig 2020-11-28 01:56:42 UTC
2	+++ src/meson.build
3	@@ -88,7 +88,7 @@ pkgmod.generate(libfontconfig,
4	version: fc_version,
5	variables: [
6	'sysconfdir=@0@'.format(join_paths(prefix, get_option('sysconfdir'))),
7	- 'localstatedir=@0@'.format(join_paths(prefix, get_option('localstatedir'))),
8	+ 'localstatedir=/var',
9	'confdir=${sysconfdir}/fonts',
10	- 'cachedir=${localstatedir}/cache/fontconfig',
11	+ 'cachedir=/var/db/fontconfig',
12	])