new blfs: media-libs/fontconfig-2.17.1

2026-01-08 05:29:40 -05:00
parent e15b23c133
commit 668cd38153
6 changed files with 227 additions and 0 deletions
--- a/media-libs/fontconfig-2.17.1/40-fontconfig-config.HOOK
+++ b/media-libs/fontconfig-2.17.1/40-fontconfig-config.HOOK
@@ -0,0 +1,7 @@
+target=(/usr/share/fontconfig/conf.default/*
+  /etc/fonts/conf.d/*
+)
+triggers=("install" "remove")
+operation() {
+  /usr/bin/fc-cache -rs
+}
--- a/media-libs/fontconfig-2.17.1/fontconfig-2.14.0-latin-update.patch
+++ b/media-libs/fontconfig-2.17.1/fontconfig-2.14.0-latin-update.patch
@@ -0,0 +1,66 @@
+https://bugs.gentoo.org/130466
+--- a/conf.d/60-latin.conf
+++ b/conf.d/60-latin.conf
+@@ -5,47 +5,50 @@
+ 	<alias>
+ 		<family>serif</family>
+ 		<prefer>
+			<family>Liberation Serif</family>
+ 			<family>Noto Serif</family>
+ 			<family>DejaVu Serif</family>
+ 			<family>Times New Roman</family>
+-			<family>Thorndale AMT</family>
+ 			<family>Luxi Serif</family>
+ 			<family>Nimbus Roman No9 L</family>
+ 			<family>Nimbus Roman</family>
+ 			<family>Times</family>
+			<family>Thorndale AMT</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>sans-serif</family>
+ 		<prefer>
+			<family>Liberation Sans</family>
+ 			<family>Noto Sans</family>
+ 			<family>DejaVu Sans</family>
+-			<family>Verdana</family>
+ 			<family>Arial</family>
+-			<family>Albany AMT</family>
+ 			<family>Luxi Sans</family>
+ 			<family>Nimbus Sans L</family>
+ 			<family>Nimbus Sans</family>
+ 			<family>Helvetica</family>
+ 			<family>Lucida Sans Unicode</family>
+ 			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
+			<family>Verdana</family>
+ 			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
+			<family>Albany AMT</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
+			<family>Liberation Mono</family>
+ 			<family>Noto Sans Mono</family>
+ 			<family>DejaVu Sans Mono</family>
+ 			<family>Inconsolata</family>
+ 			<family>Andale Mono</family>
+ 			<family>Courier New</family>
+-			<family>Cumberland AMT</family>
+ 			<family>Luxi Mono</family>
+ 			<family>Nimbus Mono L</family>
+ 			<family>Nimbus Mono</family>
+ 			<family>Nimbus Mono PS</family>
+ 			<family>Courier</family>
+			<family>Cumberland AMT</family>
+ 		</prefer>
+ 	</alias>
+ <!--
+@@ -66,6 +69,7 @@
+ 	<alias>
+ 		<family>cursive</family>
+ 		<prefer>
+			<family>Comic Neue</family>
+ 			<family>ITC Zapf Chancery Std</family>
+ 			<family>Zapfino</family>
+ 			<family>Comic Sans MS</family>
--- a/media-libs/fontconfig-2.17.1/fontconfig-2.17.0-macro-preprocess.patch
+++ b/media-libs/fontconfig-2.17.1/fontconfig-2.17.0-macro-preprocess.patch
@@ -0,0 +1,13 @@
+https://github.com/mesonbuild/meson/issues/14201
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -49,7 +49,7 @@ fc_sources = files([
+ 
+ 
+ 
+-fcobjshash_h = cc.preprocess('fcobjshash.gperf.h', include_directories: incbase)
+fcobjshash_h = cc.preprocess('fcobjshash.gperf.h', include_directories: incbase, compile_args: '-g0')
+ fcobjshash_gperf = custom_target(
+   input: fcobjshash_h,
+   output: 'fcobjshash.gperf',
+
--- a/media-libs/fontconfig-2.17.1/fontconfig-2.17.0-network-test.patch
+++ b/media-libs/fontconfig-2.17.1/fontconfig-2.17.0-network-test.patch
@@ -0,0 +1,16 @@
+If pytest is found, it tries to use pytest-tap (which is currently unpackaged).
+
+But as of fontconfig-2.16.0, this only runs test_issue431.py which needs
+network access, so we can't run it anyway. Stub it out.
+--- a/test/meson.build
+++ b/test/meson.build
+@@ -91,7 +91,7 @@ if host_machine.system() != 'windows'
+ 
+   test('run_test_sh', find_program('run-test.sh'), timeout: 600, env: ['srcdir=@0@'.format(meson.current_source_dir()), 'builddir=@0@'.format(meson.current_build_dir()), 'EXEEXT=@0@'.format(conf.get('EXEEXT')), 'VERBOSE=1'])
+ 
+-  if pytest.found()
+  if false
+     test('pytest', pytest, args: ['--tap'],
+          workdir: meson.current_source_dir(),
+          env: ['builddir=@0@'.format(meson.project_build_root())],
+
--- a/media-libs/fontconfig-2.17.1/fontconfig-2.17.0-skip-bubblewrap-tests.patch
+++ b/media-libs/fontconfig-2.17.1/fontconfig-2.17.0-skip-bubblewrap-tests.patch
@@ -0,0 +1,14 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/320
+--- a/test/run-test.sh
+++ b/test/run-test.sh
+@@ -44,9 +44,7 @@ EXPECTED=${EXPECTED-"out.expected"}
+ FCLIST="$LOG_COMPILER $BUILDTESTDIR/../fc-list/fc-list$EXEEXT"
+ FCCACHE="$LOG_COMPILER $BUILDTESTDIR/../fc-cache/fc-cache$EXEEXT"
+ 
+-if [ -x "$(command -v bwrap)" ]; then
+-    BWRAP="$(command -v bwrap)"
+-fi
+BWRAP=""
+ 
+ if [ -x "$(command -v md5sum)" ]; then
+     MD5SUM="$(command -v md5sum)"