commit
968c31a226
@ -0,0 +1 @@
|
|||||||
|
9b1d4c5a61b4d25140db444e9cf56f09fb843fce SOURCES/fontconfig-2.14.0.tar.xz
|
@ -0,0 +1 @@
|
|||||||
|
SOURCES/fontconfig-2.14.0.tar.xz
|
@ -0,0 +1,44 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||||
|
<fontconfig>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>Kochi Mincho</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>false</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>Kochi Gothic</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>false</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>Sazanami Mincho</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>false</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>Sazanami Gothic</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>false</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
<match target="font">
|
||||||
|
<test name="family" compare="eq">
|
||||||
|
<string>AR PL ShanHeiSun Uni</string>
|
||||||
|
</test>
|
||||||
|
<edit name="embeddedbitmap" mode="assign">
|
||||||
|
<bool>true</bool>
|
||||||
|
</edit>
|
||||||
|
</match>
|
||||||
|
</fontconfig>
|
@ -0,0 +1,4 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
|
||||||
|
[ -x /usr/bin/fc-cache-32 ] && /usr/bin/fc-cache-32 "$@" || :
|
||||||
|
[ -x /usr/bin/fc-cache-64 ] && /usr/bin/fc-cache-64 "$@" || :
|
@ -0,0 +1,33 @@
|
|||||||
|
diff -pruN fontconfig-2.13.93.orig/test/run-test.sh fontconfig-2.13.93/test/run-test.sh
|
||||||
|
--- fontconfig-2.13.93.orig/test/run-test.sh 2020-11-28 10:56:42.000000000 +0900
|
||||||
|
+++ fontconfig-2.13.93/test/run-test.sh 2020-11-28 12:39:57.345644527 +0900
|
||||||
|
@@ -421,18 +421,18 @@ rm -rf "$MYCACHEBASEDIR" "$MYCONFIG" my-
|
||||||
|
|
||||||
|
fi # if [ "x$EXEEXT" = "x" ]
|
||||||
|
|
||||||
|
-if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
|
||||||
|
- dotest "MT-safe global config"
|
||||||
|
- prep
|
||||||
|
- curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
|
||||||
|
- (cd "$FONTDIR"; unzip noto.zip)
|
||||||
|
- if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
|
||||||
|
- touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
|
||||||
|
- fi
|
||||||
|
- "$BUILDTESTDIR"/test-crbug1004254
|
||||||
|
-else
|
||||||
|
+#if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
|
||||||
|
+# dotest "MT-safe global config"
|
||||||
|
+# prep
|
||||||
|
+# curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
|
||||||
|
+# (cd "$FONTDIR"; unzip noto.zip)
|
||||||
|
+# if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
|
||||||
|
+# touch -m -t "$(date -d @"${SOURCE_DATE_EPOCH}" +%y%m%d%H%M.%S)" "$FONTDIR"
|
||||||
|
+# fi
|
||||||
|
+# "$BUILDTESTDIR"/test-crbug1004254
|
||||||
|
+#else
|
||||||
|
echo "No test-crbug1004254: skipped"
|
||||||
|
-fi
|
||||||
|
+#fi
|
||||||
|
|
||||||
|
if [ "x$EXEEXT" = "x" ]; then
|
||||||
|
|
@ -0,0 +1,12 @@
|
|||||||
|
diff -pruN fontconfig-2.13.92.orig/src/fcformat.c fontconfig-2.13.92/src/fcformat.c
|
||||||
|
--- fontconfig-2.13.92.orig/src/fcformat.c 2018-07-19 12:14:39.000000000 +0900
|
||||||
|
+++ fontconfig-2.13.92/src/fcformat.c 2020-01-20 13:05:33.626227767 +0900
|
||||||
|
@@ -78,7 +78,7 @@
|
||||||
|
#define FCCAT_FORMAT "\"%{file|basename|cescape}\" %{index} \"%{-file{%{=unparse|cescape}}}\""
|
||||||
|
#define FCMATCH_FORMAT "%{file:-<unknown filename>|basename}: \"%{family[0]:-<unknown family>}\" \"%{style[0]:-<unknown style>}\""
|
||||||
|
#define FCLIST_FORMAT "%{?file{%{file}: }}%{-file{%{=unparse}}}"
|
||||||
|
-#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}"
|
||||||
|
+#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}"
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
@ -0,0 +1,27 @@
|
|||||||
|
diff -pruN fontconfig-2.14.0.orig/conf.d/60-latin.conf fontconfig-2.14.0/conf.d/60-latin.conf
|
||||||
|
--- fontconfig-2.14.0.orig/conf.d/60-latin.conf 2021-12-03 19:48:08.000000000 +0900
|
||||||
|
+++ fontconfig-2.14.0/conf.d/60-latin.conf 2022-04-18 19:21:20.287729201 +0900
|
||||||
|
@@ -5,7 +5,6 @@
|
||||||
|
<alias>
|
||||||
|
<family>serif</family>
|
||||||
|
<prefer>
|
||||||
|
- <family>Noto Serif</family>
|
||||||
|
<family>DejaVu Serif</family>
|
||||||
|
<family>Times New Roman</family>
|
||||||
|
<family>Thorndale AMT</family>
|
||||||
|
@@ -18,7 +17,6 @@
|
||||||
|
<alias>
|
||||||
|
<family>sans-serif</family>
|
||||||
|
<prefer>
|
||||||
|
- <family>Noto Sans</family>
|
||||||
|
<family>DejaVu Sans</family>
|
||||||
|
<family>Verdana</family>
|
||||||
|
<family>Arial</family>
|
||||||
|
@@ -35,7 +33,6 @@
|
||||||
|
<alias>
|
||||||
|
<family>monospace</family>
|
||||||
|
<prefer>
|
||||||
|
- <family>Noto Sans Mono</family>
|
||||||
|
<family>DejaVu Sans Mono</family>
|
||||||
|
<family>Inconsolata</family>
|
||||||
|
<family>Andale Mono</family>
|
@ -0,0 +1,12 @@
|
|||||||
|
diff -pruN fontconfig-2.12.91.orig/fc-cache/fc-cache.c fontconfig-2.12.91/fc-cache/fc-cache.c
|
||||||
|
--- fontconfig-2.12.91.orig/fc-cache/fc-cache.c 2017-11-20 21:02:20.000000000 +0900
|
||||||
|
+++ fontconfig-2.12.91/fc-cache/fc-cache.c 2017-12-14 16:59:19.002003145 +0900
|
||||||
|
@@ -413,7 +413,7 @@ main (int argc, char **argv)
|
||||||
|
*/
|
||||||
|
/* the resolution of mtime on FAT is 2 seconds */
|
||||||
|
if (changed)
|
||||||
|
- sleep (2);
|
||||||
|
+ sleep (1);
|
||||||
|
if (verbose)
|
||||||
|
printf ("%s: %s\n", argv[0], ret ? _("failed") : _("succeeded"));
|
||||||
|
return ret;
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue