Compare commits
No commits in common. 'c9' and 'c8' have entirely different histories.
@ -1 +1 @@
|
|||||||
9b1d4c5a61b4d25140db444e9cf56f09fb843fce SOURCES/fontconfig-2.14.0.tar.xz
|
75612356ef4f801735b49baf987f8942b4a7a5e1 SOURCES/fontconfig-2.13.1.tar.bz2
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
SOURCES/fontconfig-2.14.0.tar.xz
|
SOURCES/fontconfig-2.13.1.tar.bz2
|
||||||
|
|||||||
@ -1,44 +0,0 @@
|
|||||||
<?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>
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
[ -x /usr/bin/fc-cache-32 ] && /usr/bin/fc-cache-32 "$@" || :
|
[ -x /usr/bin/fc-cache-32 ] && /usr/bin/fc-cache-32 $@ || :
|
||||||
[ -x /usr/bin/fc-cache-64 ] && /usr/bin/fc-cache-64 "$@" || :
|
[ -x /usr/bin/fc-cache-64 ] && /usr/bin/fc-cache-64 $@ || :
|
||||||
|
|||||||
@ -1,33 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
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,25 @@
|
|||||||
|
From c336b8471877371f0190ba06f7547c54e2b890ba Mon Sep 17 00:00:00 2001
|
||||||
|
From: Akira TAGOH <akira@tagoh.org>
|
||||||
|
Date: Thu, 9 May 2019 07:10:11 +0000
|
||||||
|
Subject: [PATCH] fc-validate: returns an error code when missing some glyphs
|
||||||
|
|
||||||
|
Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/154
|
||||||
|
---
|
||||||
|
fc-validate/fc-validate.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/fc-validate/fc-validate.c b/fc-validate/fc-validate.c
|
||||||
|
index 2ceee20..327ae63 100644
|
||||||
|
--- a/fc-validate/fc-validate.c
|
||||||
|
+++ b/fc-validate/fc-validate.c
|
||||||
|
@@ -197,6 +197,7 @@ main (int argc, char **argv)
|
||||||
|
{
|
||||||
|
FcChar32 ucs4, pos, map[FC_CHARSET_MAP_SIZE];
|
||||||
|
|
||||||
|
+ err = 1;
|
||||||
|
printf (_("%s:%d Missing %d glyph(s) to satisfy the coverage for %s language\n"),
|
||||||
|
argv[i], index, count, lang);
|
||||||
|
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
||||||
@ -1,129 +0,0 @@
|
|||||||
diff -pruN fontconfig-2.14.0.orig/test/run-test.sh fontconfig-2.14.0/test/run-test.sh
|
|
||||||
--- fontconfig-2.14.0.orig/test/run-test.sh 2022-12-02 21:12:26.755100156 +0900
|
|
||||||
+++ fontconfig-2.14.0/test/run-test.sh 2022-12-02 21:14:19.306721780 +0900
|
|
||||||
@@ -180,14 +180,8 @@ TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontcon
|
|
||||||
sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
|
|
||||||
s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
|
|
||||||
s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf
|
|
||||||
-echo "$BWRAP --bind / / --bind \"$CACHEDIR\" \"$TESTTMPDIR\"/cache.dir --bind \"$FONTDIR\" \"$TESTTMPDIR\"/fonts --bind .. \"$TESTTMPDIR\"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE \"$TESTTMPDIR\"/build/test/bind-fonts.conf \"$TESTTMPDIR\"/build/fc-match/fc-match\"$EXEEXT\" -f \"%{file}\n\" \":foundry=Misc\" > xxx"
|
|
||||||
-ls $CACHEDIR
|
|
||||||
-ls $TESTTMPDIR
|
|
||||||
-ls $FONTDIR
|
|
||||||
$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-match/fc-match"$EXEEXT" -f "%{file}\n" ":foundry=Misc" > xxx
|
|
||||||
-echo "$BWRAP --bind / / --bind \"$CACHEDIR\" \"$TESTTMPDIR\"/cache.dir --bind \"$FONTDIR\" \"$TESTTMPDIR\"/fonts --bind .. \"$TESTTMPDIR\"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE \"$TESTTMPDIR\"/build/test/bind-fonts.conf \"$TESTTMPDIR\"/build/test/test-bz106618\"$EXEEXT\" | sort > flist1"
|
|
||||||
$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/test/test-bz106618"$EXEEXT" | sort > flist1
|
|
||||||
-echo "$BWRAP --bind / / --bind \"$CACHEDIR\" \"$TESTTMPDIR\"/cache.dir --bind \"$FONTDIR\" \"$TESTTMPDIR\"/fonts --bind .. \"$TESTTMPDIR\"/build --dev-bind /dev /dev find \"$TESTTMPDIR\"/fonts/ -type f -name '*.pcf' | sort > flist2"
|
|
||||||
$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev find "$TESTTMPDIR"/fonts/ -type f -name '*.pcf' | sort > flist2
|
|
||||||
ls -l "$CACHEDIR" > out2
|
|
||||||
if cmp out1 out2 > /dev/null ; then : ; else
|
|
||||||
From fc0e9a78d2fe3b26f0b93c2a99b160e75e2a9f89 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Akira TAGOH <akira@tagoh.org>
|
|
||||||
Date: Wed, 28 Sep 2022 21:39:09 +0900
|
|
||||||
Subject: [PATCH 1/3] Real fix of 91114d18c
|
|
||||||
|
|
||||||
The change in 91114d18c broke remapping font paths.
|
|
||||||
|
|
||||||
Patch from Mattias Clasen
|
|
||||||
|
|
||||||
Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/331
|
|
||||||
---
|
|
||||||
src/fcstr.c | 6 +-----
|
|
||||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/fcstr.c b/src/fcstr.c
|
|
||||||
index 3fe518f..5ce65da 100644
|
|
||||||
--- a/src/fcstr.c
|
|
||||||
+++ b/src/fcstr.c
|
|
||||||
@@ -1467,7 +1467,6 @@ FcStrSetAddFilenamePairWithSalt (FcStrSet *set, const FcChar8 *a, const FcChar8
|
|
||||||
{
|
|
||||||
FcChar8 *new_a = NULL;
|
|
||||||
FcChar8 *new_b = NULL;
|
|
||||||
- FcChar8 *rs = NULL;
|
|
||||||
FcBool ret;
|
|
||||||
|
|
||||||
if (a)
|
|
||||||
@@ -1487,10 +1486,7 @@ FcStrSetAddFilenamePairWithSalt (FcStrSet *set, const FcChar8 *a, const FcChar8
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* Override maps with new one if exists */
|
|
||||||
- if (FcStrSetMemberAB (set, new_a, new_b, &rs))
|
|
||||||
- {
|
|
||||||
- FcStrSetDel (set, rs);
|
|
||||||
- }
|
|
||||||
+ FcStrSetDel (set, new_a);
|
|
||||||
ret = FcStrSetAddTriple (set, new_a, new_b, salt);
|
|
||||||
if (new_a)
|
|
||||||
FcStrFree (new_a);
|
|
||||||
--
|
|
||||||
2.38.1
|
|
||||||
|
|
||||||
From a10d07682a09ce5effbd121920b119618f4b7775 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Akira TAGOH <akira@tagoh.org>
|
|
||||||
Date: Wed, 28 Sep 2022 23:30:06 +0900
|
|
||||||
Subject: [PATCH 2/3] Fix test cases for wrong use of remap-dir
|
|
||||||
|
|
||||||
---
|
|
||||||
test/run-test.sh | 12 +++++++++---
|
|
||||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/test/run-test.sh b/test/run-test.sh
|
|
||||||
index 1cedb8d..2b8a412 100644
|
|
||||||
--- a/test/run-test.sh
|
|
||||||
+++ b/test/run-test.sh
|
|
||||||
@@ -177,11 +177,14 @@ $FCCACHE "$FONTDIR"
|
|
||||||
sleep 1
|
|
||||||
ls -l "$CACHEDIR" > out1
|
|
||||||
TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
|
|
||||||
-sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
|
|
||||||
+# Once font dir is remapped, we could use $FONTDIR as different one in theory.
|
|
||||||
+# but we don't use it here and to avoid duplicate entries, set the non-existing
|
|
||||||
+# directory here.
|
|
||||||
+sed "s!@FONTDIR@!$FONTDIR/a!
|
|
||||||
s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
|
|
||||||
s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf
|
|
||||||
$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-match/fc-match"$EXEEXT" -f "%{file}\n" ":foundry=Misc" > xxx
|
|
||||||
-$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/test/test-bz106618"$EXEEXT" | sort > flist1
|
|
||||||
+$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/test/test-bz106618"$EXEEXT" > flist1
|
|
||||||
$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev find "$TESTTMPDIR"/fonts/ -type f -name '*.pcf' | sort > flist2
|
|
||||||
ls -l "$CACHEDIR" > out2
|
|
||||||
if cmp out1 out2 > /dev/null ; then : ; else
|
|
||||||
@@ -273,7 +276,10 @@ sleep 1
|
|
||||||
(cd "$CACHEDIR"; ls -1 --color=no ./*cache*) > out1
|
|
||||||
TESTTMPDIR=$(mktemp -d "$TMPDIR"/fontconfig.XXXXXXXX)
|
|
||||||
mkdir -p "$TESTTMPDIR"/cache.dir
|
|
||||||
-sed "s!@FONTDIR@!$TESTTMPDIR/fonts!
|
|
||||||
+# Once font dir is remapped, we could use $FONTDIR as different one in theory.
|
|
||||||
+# but we don't use it here and to avoid duplicate entries, set the non-existing
|
|
||||||
+# directory here.
|
|
||||||
+sed "s!@FONTDIR@!$FONTDIR/a!
|
|
||||||
s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
|
|
||||||
s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf
|
|
||||||
$BWRAP --bind / / --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-cache/fc-cache"$EXEEXT" "$TESTTMPDIR"/fonts
|
|
||||||
--
|
|
||||||
2.38.1
|
|
||||||
|
|
||||||
From dac7f285c5c1a8876954075c7fcac6b8aa0fa5b9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Akira TAGOH <akira@tagoh.org>
|
|
||||||
Date: Thu, 29 Sep 2022 00:04:00 +0900
|
|
||||||
Subject: [PATCH 3/3] Add back sort command Oops
|
|
||||||
|
|
||||||
---
|
|
||||||
test/run-test.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/test/run-test.sh b/test/run-test.sh
|
|
||||||
index 2b8a412..c3da72a 100644
|
|
||||||
--- a/test/run-test.sh
|
|
||||||
+++ b/test/run-test.sh
|
|
||||||
@@ -184,7 +184,7 @@ sed "s!@FONTDIR@!$FONTDIR/a!
|
|
||||||
s!@REMAPDIR@!<remap-dir as-path="'"'"$FONTDIR"'"'">$TESTTMPDIR/fonts</remap-dir>!
|
|
||||||
s!@CACHEDIR@!$TESTTMPDIR/cache.dir!" < "$TESTDIR"/fonts.conf.in > bind-fonts.conf
|
|
||||||
$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/fc-match/fc-match"$EXEEXT" -f "%{file}\n" ":foundry=Misc" > xxx
|
|
||||||
-$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/test/test-bz106618"$EXEEXT" > flist1
|
|
||||||
+$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev --setenv FONTCONFIG_FILE "$TESTTMPDIR"/build/test/bind-fonts.conf "$TESTTMPDIR"/build/test/test-bz106618"$EXEEXT" | sort > flist1
|
|
||||||
$BWRAP --bind / / --bind "$CACHEDIR" "$TESTTMPDIR"/cache.dir --bind "$FONTDIR" "$TESTTMPDIR"/fonts --bind .. "$TESTTMPDIR"/build --dev-bind /dev /dev find "$TESTTMPDIR"/fonts/ -type f -name '*.pcf' | sort > flist2
|
|
||||||
ls -l "$CACHEDIR" > out2
|
|
||||||
if cmp out1 out2 > /dev/null ; then : ; else
|
|
||||||
--
|
|
||||||
2.38.1
|
|
||||||
|
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
diff -pruN fontconfig-2.12.93.orig/configure.ac fontconfig-2.12.93/configure.ac
|
||||||
|
--- fontconfig-2.12.93.orig/configure.ac 2018-02-15 22:01:54.000000000 +0900
|
||||||
|
+++ fontconfig-2.12.93/configure.ac 2018-02-15 22:33:42.353941393 +0900
|
||||||
|
@@ -308,8 +308,8 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,
|
||||||
|
# Checks for FreeType
|
||||||
|
#
|
||||||
|
dnl See http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT for versioning in freetype
|
||||||
|
-PKG_CHECK_MODULES(FREETYPE, freetype2 >= 21.0.15)
|
||||||
|
-PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2 >= 21.0.15"
|
||||||
|
+PKG_CHECK_MODULES(FREETYPE, freetype2 >= 20.0.14)
|
||||||
|
+PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2 >= 20.0.14"
|
||||||
|
|
||||||
|
AC_SUBST(FREETYPE_LIBS)
|
||||||
|
AC_SUBST(FREETYPE_CFLAGS)
|
||||||
@ -1,27 +0,0 @@
|
|||||||
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,93 @@
|
|||||||
|
From 5f12f564f8748deaa603adb7a4b8f616b6390ad4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Keith Packard <keithp@keithp.com>
|
||||||
|
Date: Wed, 17 Oct 2018 21:15:47 -0700
|
||||||
|
Subject: [PATCH 1/2] Do not remove UUID file when a scanned directory is empty
|
||||||
|
|
||||||
|
Because FcDirCacheDeleteUUID does not reset the modification time on
|
||||||
|
the directory, and because FcDirCacheRead unconditionally creates the
|
||||||
|
UUID file each time it is run, any empty directory in the cache will
|
||||||
|
get its timestamp changed each time the cache for that directory is
|
||||||
|
read.
|
||||||
|
|
||||||
|
Instead, just leave the UUID file around as it is harmless.
|
||||||
|
|
||||||
|
The alternative would be to only create the UUID file after the cache
|
||||||
|
has been created and the directory has been discovered to be
|
||||||
|
non-empty, but that would delay the creation of the UUID file.
|
||||||
|
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
---
|
||||||
|
src/fcdir.c | 7 -------
|
||||||
|
1 file changed, 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/fcdir.c b/src/fcdir.c
|
||||||
|
index 93f220c..bfcdf95 100644
|
||||||
|
--- a/src/fcdir.c
|
||||||
|
+++ b/src/fcdir.c
|
||||||
|
@@ -421,13 +421,6 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
|
||||||
|
/* Not using existing cache file, construct new cache */
|
||||||
|
if (!cache)
|
||||||
|
cache = FcDirCacheScan (dir, config);
|
||||||
|
- if (cache)
|
||||||
|
- {
|
||||||
|
- FcFontSet *fs = FcCacheSet (cache);
|
||||||
|
-
|
||||||
|
- if (cache->dirs_count == 0 && (!fs || fs->nfont == 0))
|
||||||
|
- FcDirCacheDeleteUUID (dir, config);
|
||||||
|
- }
|
||||||
|
|
||||||
|
return cache;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
||||||
|
From e9113a764a1001165711022aceb45aa2765feb8b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Akira TAGOH <akira@tagoh.org>
|
||||||
|
Date: Thu, 25 Oct 2018 07:16:32 +0000
|
||||||
|
Subject: [PATCH 2/2] Do not run a test case for .uuid deletion
|
||||||
|
|
||||||
|
---
|
||||||
|
test/run-test.sh | 28 ++++++++++++++--------------
|
||||||
|
1 file changed, 14 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/test/run-test.sh b/test/run-test.sh
|
||||||
|
index e76e39b..ed41456 100644
|
||||||
|
--- a/test/run-test.sh
|
||||||
|
+++ b/test/run-test.sh
|
||||||
|
@@ -239,19 +239,19 @@ fi
|
||||||
|
|
||||||
|
rm -rf $MyPWD/sysroot
|
||||||
|
|
||||||
|
-dotest "deleting .uuid file on empty dir"
|
||||||
|
-prep
|
||||||
|
-cp $FONT1 $FONT2 $FONTDIR
|
||||||
|
-$FCCACHE $FONTDIR
|
||||||
|
-sleep 1
|
||||||
|
-rm -f $FONTDIR/*pcf
|
||||||
|
-$FCCACHE $FONTDIR
|
||||||
|
-rmdir $FONTDIR > /dev/null 2>&1
|
||||||
|
-if [ $? != 0 ]; then
|
||||||
|
- echo "*** Test failed: $TEST"
|
||||||
|
- echo "$FONTDIR isn't empty"
|
||||||
|
- ls -al $FONTDIR
|
||||||
|
- exit 1
|
||||||
|
-fi
|
||||||
|
+# dotest "deleting .uuid file on empty dir"
|
||||||
|
+# prep
|
||||||
|
+# cp $FONT1 $FONT2 $FONTDIR
|
||||||
|
+# $FCCACHE $FONTDIR
|
||||||
|
+# sleep 1
|
||||||
|
+# rm -f $FONTDIR/*pcf
|
||||||
|
+# $FCCACHE $FONTDIR
|
||||||
|
+# rmdir $FONTDIR > /dev/null 2>&1
|
||||||
|
+# if [ $? != 0 ]; then
|
||||||
|
+# echo "*** Test failed: $TEST"
|
||||||
|
+# echo "$FONTDIR isn't empty"
|
||||||
|
+# ls -al $FONTDIR
|
||||||
|
+# exit 1
|
||||||
|
+# fi
|
||||||
|
|
||||||
|
rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
||||||
@ -0,0 +1,56 @@
|
|||||||
|
diff -pruN fontconfig-2.13.1.orig/test/test-bz106632.c fontconfig-2.13.1/test/test-bz106632.c
|
||||||
|
--- fontconfig-2.13.1.orig/test/test-bz106632.c 2018-08-29 09:55:14.000000000 +0000
|
||||||
|
+++ fontconfig-2.13.1/test/test-bz106632.c 2018-11-13 11:57:37.822142424 +0000
|
||||||
|
@@ -197,7 +197,7 @@ main (void)
|
||||||
|
mkdir_p (cachedir);
|
||||||
|
|
||||||
|
fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
|
||||||
|
- snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir);
|
||||||
|
+ snprintf (cmd, 512, "sleep 1; cp -a %s %s; sleep 1", FONTFILE, fontdir);
|
||||||
|
system (cmd);
|
||||||
|
|
||||||
|
fprintf (stderr, "D: Loading a config\n");
|
||||||
|
@@ -226,15 +226,21 @@ main (void)
|
||||||
|
goto bail;
|
||||||
|
}
|
||||||
|
fprintf (stderr, "D: Removing %s\n", fontdir);
|
||||||
|
- snprintf (cmd, 512, "rm -f %s%s*", fontdir, FC_DIR_SEPARATOR_S);
|
||||||
|
+ snprintf (cmd, 512, "sleep 1; rm -f %s%s*; sleep 1", fontdir, FC_DIR_SEPARATOR_S);
|
||||||
|
system (cmd);
|
||||||
|
fprintf (stderr, "D: Reinitializing\n");
|
||||||
|
- if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
|
||||||
|
+ if (FcConfigUptoDate (config))
|
||||||
|
{
|
||||||
|
- fprintf (stderr, "E: Unable to reinitialize\n");
|
||||||
|
+ fprintf (stderr, "E: Config reports up-to-date\n");
|
||||||
|
ret = 2;
|
||||||
|
goto bail;
|
||||||
|
}
|
||||||
|
+ if (!FcInitReinitialize ())
|
||||||
|
+ {
|
||||||
|
+ fprintf (stderr, "E: Unable to reinitialize\n");
|
||||||
|
+ ret = 3;
|
||||||
|
+ goto bail;
|
||||||
|
+ }
|
||||||
|
if (FcConfigGetCurrent () == config)
|
||||||
|
{
|
||||||
|
fprintf (stderr, "E: config wasn't reloaded\n");
|
||||||
|
@@ -265,10 +271,16 @@ main (void)
|
||||||
|
goto bail;
|
||||||
|
}
|
||||||
|
fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
|
||||||
|
- snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir);
|
||||||
|
+ snprintf (cmd, 512, "sleep 1; cp -a %s %s; sleep 1", FONTFILE, fontdir);
|
||||||
|
system (cmd);
|
||||||
|
fprintf (stderr, "D: Reinitializing\n");
|
||||||
|
- if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
|
||||||
|
+ if (FcConfigUptoDate (config))
|
||||||
|
+ {
|
||||||
|
+ fprintf (stderr, "E: Config up-to-date after addition\n");
|
||||||
|
+ ret = 3;
|
||||||
|
+ goto bail;
|
||||||
|
+ }
|
||||||
|
+ if (!FcInitReinitialize ())
|
||||||
|
{
|
||||||
|
fprintf (stderr, "E: Unable to reinitialize\n");
|
||||||
|
ret = 2;
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From 13b4ba91353a4ead4623d0133f6eb0283e91b15a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Akira TAGOH <akira@tagoh.org>
|
||||||
|
Date: Tue, 13 Nov 2018 06:34:11 +0000
|
||||||
|
Subject: [PATCH] Use Rachana instead of Meera for Malayalam
|
||||||
|
|
||||||
|
Meera is a sans-serif font for Malayalam. that should be substituted for serif.
|
||||||
|
---
|
||||||
|
conf.d/65-nonlatin.conf | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
|
||||||
|
index 54fb974f..1b9de316 100644
|
||||||
|
--- a/conf.d/65-nonlatin.conf
|
||||||
|
+++ b/conf.d/65-nonlatin.conf
|
||||||
|
@@ -63,7 +63,7 @@
|
||||||
|
<family>Lohit Sindhi</family>
|
||||||
|
<family>Lohit Punjabi</family>
|
||||||
|
<family>Lohit Tamil</family>
|
||||||
|
- <family>Meera</family>
|
||||||
|
+ <family>Rachana</family>
|
||||||
|
<family>Lohit Malayalam</family>
|
||||||
|
<family>Lohit Kannada</family>
|
||||||
|
<family>Lohit Telugu</family>
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
||||||
Loading…
Reference in new issue