Compare commits
No commits in common. "c8s" and "c9-beta" have entirely different histories.
1
.fontconfig.metadata
Normal file
1
.fontconfig.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
9b1d4c5a61b4d25140db444e9cf56f09fb843fce SOURCES/fontconfig-2.14.0.tar.xz
|
||||||
33
.gitignore
vendored
33
.gitignore
vendored
@ -1,32 +1 @@
|
|||||||
fontconfig-2.8.0.tar.gz
|
SOURCES/fontconfig-2.14.0.tar.xz
|
||||||
/fontconfig-2.9.0.tar.gz
|
|
||||||
/fontconfig-2.9.91.tar.bz2
|
|
||||||
/fontconfig-2.9.92.tar.bz2
|
|
||||||
/fontconfig-2.10.tar.bz2
|
|
||||||
/fontconfig-2.10.0.tar.bz2
|
|
||||||
/fontconfig-2.10.1.tar.bz2
|
|
||||||
/fontconfig-2.10.2.tar.bz2
|
|
||||||
/fontconfig-2.10.91.tar.bz2
|
|
||||||
/fontconfig-2.10.92.tar.bz2
|
|
||||||
/fontconfig-2.10.93.tar.bz2
|
|
||||||
/fontconfig-2.10.94.tar.bz2
|
|
||||||
/fontconfig-2.10.95.tar.bz2
|
|
||||||
/fontconfig-2.11.0.tar.bz2
|
|
||||||
/fontconfig-2.11.1.tar.bz2
|
|
||||||
/fontconfig-2.11.91.tar.bz2
|
|
||||||
/fontconfig-2.11.92.tar.bz2
|
|
||||||
/fontconfig-2.11.93.tar.bz2
|
|
||||||
/fontconfig-2.11.94.tar.bz2
|
|
||||||
/fontconfig-2.11.95.tar.bz2
|
|
||||||
/fontconfig-2.12.0.tar.bz2
|
|
||||||
/fontconfig-2.12.1.tar.bz2
|
|
||||||
/fontconfig-2.12.2.tar.bz2
|
|
||||||
/fontconfig-2.12.3.tar.bz2
|
|
||||||
/fontconfig-2.12.4.tar.bz2
|
|
||||||
/fontconfig-2.12.5.tar.bz2
|
|
||||||
/fontconfig-2.12.6.tar.bz2
|
|
||||||
/fontconfig-2.12.91.tar.bz2
|
|
||||||
/fontconfig-2.12.92.tar.bz2
|
|
||||||
/fontconfig-2.12.93.tar.bz2
|
|
||||||
/fontconfig-2.13.0.tar.bz2
|
|
||||||
/fontconfig-2.13.1.tar.bz2
|
|
||||||
|
|||||||
44
SOURCES/25-no-bitmap-fedora.conf
Normal file
44
SOURCES/25-no-bitmap-fedora.conf
Normal file
@ -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>
|
||||||
4
SOURCES/fc-cache
Executable file
4
SOURCES/fc-cache
Executable file
@ -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 "$@" || :
|
||||||
33
SOURCES/fontconfig-disable-network-required-test.patch
Normal file
33
SOURCES/fontconfig-disable-network-required-test.patch
Normal file
@ -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
|
||||||
|
|
||||||
12
SOURCES/fontconfig-drop-lang-from-pkgkit-format.patch
Normal file
12
SOURCES/fontconfig-drop-lang-from-pkgkit-format.patch
Normal file
@ -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
|
||||||
129
SOURCES/fontconfig-fix-remapdir.patch
Normal file
129
SOURCES/fontconfig-fix-remapdir.patch
Normal file
@ -0,0 +1,129 @@
|
|||||||
|
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
|
||||||
|
|
||||||
27
SOURCES/fontconfig-revert-noto-default.patch
Normal file
27
SOURCES/fontconfig-revert-noto-default.patch
Normal file
@ -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>
|
||||||
@ -4,38 +4,42 @@
|
|||||||
|
|
||||||
Summary: Font configuration and customization library
|
Summary: Font configuration and customization library
|
||||||
Name: fontconfig
|
Name: fontconfig
|
||||||
Version: 2.13.1
|
Version: 2.14.0
|
||||||
Release: 4%{?dist}
|
Release: 2%{?dist}
|
||||||
# src/ftglue.[ch] is in Public Domain
|
# src/ftglue.[ch] is in Public Domain
|
||||||
# src/fccache.c contains Public Domain code
|
# src/fccache.c contains Public Domain code
|
||||||
# fc-case/CaseFolding.txt is in the UCD
|
# fc-case/CaseFolding.txt is in the UCD
|
||||||
# otherwise MIT
|
# otherwise MIT
|
||||||
License: MIT and Public Domain and UCD
|
License: MIT and Public Domain and UCD
|
||||||
Source: http://fontconfig.org/release/%{name}-%{version}.tar.bz2
|
Source: http://fontconfig.org/release/%{name}-%{version}.tar.xz
|
||||||
URL: http://fontconfig.org
|
URL: http://fontconfig.org
|
||||||
|
Source1: 25-no-bitmap-fedora.conf
|
||||||
Source2: fc-cache
|
Source2: fc-cache
|
||||||
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=140335
|
# https://bugzilla.redhat.com/show_bug.cgi?id=140335
|
||||||
Patch0: %{name}-sleep-less.patch
|
Patch0: %{name}-sleep-less.patch
|
||||||
Patch1: %{name}-required-freetype-version.patch
|
Patch4: %{name}-drop-lang-from-pkgkit-format.patch
|
||||||
Patch2: %{name}-stop-cleanup-uuid.patch
|
Patch5: %{name}-disable-network-required-test.patch
|
||||||
Patch3: %{name}-use-rachana.patch
|
Patch6: %{name}-revert-noto-default.patch
|
||||||
Patch4: %{name}-test-delay.patch
|
Patch7: %{name}-fix-remapdir.patch
|
||||||
Patch5: %{name}-fix-fcvalidate.patch
|
|
||||||
|
|
||||||
BuildRequires: expat-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: freetype-devel >= %{freetype_version}
|
BuildRequires: freetype-devel >= %{freetype_version}
|
||||||
BuildRequires: fontpackages-devel
|
BuildRequires: fontpackages-devel
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: autoconf automake libtool gettext
|
||||||
BuildRequires: autoconf automake libtool gettext itstool
|
|
||||||
BuildRequires: gperf
|
BuildRequires: gperf
|
||||||
|
BuildRequires: docbook-utils docbook-utils-pdf
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
Requires: fontpackages-filesystem freetype
|
Requires: fonts-filesystem freetype
|
||||||
Requires(pre): freetype >= 2.9.1
|
# Register DTD system-wide to make validation work by default
|
||||||
Requires(post): grep coreutils /sbin/ldconfig
|
# (used by fonts-rpm-macros)
|
||||||
Requires(postun): /sbin/ldconfig
|
Requires(pre): xml-common
|
||||||
|
Requires(postun): xml-common
|
||||||
|
PreReq: freetype >= 2.9.1-6
|
||||||
|
Requires(post): grep coreutils
|
||||||
Requires: font(:lang=en)
|
Requires: font(:lang=en)
|
||||||
Suggests: dejavu-sans-fonts
|
Suggests: font(dejavusans)
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Fontconfig is designed to locate fonts within the
|
Fontconfig is designed to locate fonts within the
|
||||||
@ -44,7 +48,6 @@ applications.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Font configuration and customization library
|
Summary: Font configuration and customization library
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: freetype-devel >= %{freetype_version}
|
Requires: freetype-devel >= %{freetype_version}
|
||||||
Requires: pkgconfig
|
Requires: pkgconfig
|
||||||
@ -59,7 +62,6 @@ will use fontconfig.
|
|||||||
|
|
||||||
%package devel-doc
|
%package devel-doc
|
||||||
Summary: Development Documentation files for fontconfig library
|
Summary: Development Documentation files for fontconfig library
|
||||||
Group: Documentation
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Requires: %{name}-devel = %{version}-%{release}
|
Requires: %{name}-devel = %{version}-%{release}
|
||||||
|
|
||||||
@ -74,8 +76,12 @@ which is useful for developing applications that uses fontconfig.
|
|||||||
# We don't want to rebuild the docs, but we want to install the included ones.
|
# We don't want to rebuild the docs, but we want to install the included ones.
|
||||||
export HASDOCBOOK=no
|
export HASDOCBOOK=no
|
||||||
|
|
||||||
|
for i in doc/*.fncs; do
|
||||||
|
touch -r $i ${i//.fncs/.sgml}
|
||||||
|
done
|
||||||
autoreconf
|
autoreconf
|
||||||
%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \
|
%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \
|
||||||
|
--enable-libxml2 \
|
||||||
--disable-static --with-cache-dir=/usr/lib/fontconfig/cache
|
--disable-static --with-cache-dir=/usr/lib/fontconfig/cache
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
@ -85,6 +91,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
|||||||
|
|
||||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||||
|
|
||||||
|
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
|
||||||
ln -s %{_fontconfig_templatedir}/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontconfig_confdir}/
|
ln -s %{_fontconfig_templatedir}/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontconfig_confdir}/
|
||||||
|
|
||||||
# move installed doc files back to build directory to package them
|
# move installed doc files back to build directory to package them
|
||||||
@ -92,9 +99,16 @@ ln -s %{_fontconfig_templatedir}/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontc
|
|||||||
mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* .
|
mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* .
|
||||||
rmdir $RPM_BUILD_ROOT%{_docdir}/fontconfig/
|
rmdir $RPM_BUILD_ROOT%{_docdir}/fontconfig/
|
||||||
|
|
||||||
|
# adjust the timestamp to avoid conflicts for multilib
|
||||||
|
touch -r doc/fontconfig-user.sgml fontconfig-user.txt
|
||||||
|
touch -r doc/fontconfig-user.sgml fontconfig-user.html
|
||||||
|
|
||||||
# rename fc-cache binary
|
# rename fc-cache binary
|
||||||
mv $RPM_BUILD_ROOT%{_bindir}/fc-cache $RPM_BUILD_ROOT%{_bindir}/fc-cache-%{__isa_bits}
|
mv $RPM_BUILD_ROOT%{_bindir}/fc-cache $RPM_BUILD_ROOT%{_bindir}/fc-cache-%{__isa_bits}
|
||||||
|
|
||||||
|
# create link to man page
|
||||||
|
echo ".so man1/fc-cache.1" > $RPM_BUILD_ROOT%{_mandir}/man1/fc-cache-%{__isa_bits}.1
|
||||||
|
|
||||||
install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fc-cache
|
install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fc-cache
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
@ -102,11 +116,9 @@ install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fc-cache
|
|||||||
cat %{name}-conf.lang >> %{name}.lang
|
cat %{name}-conf.lang >> %{name}.lang
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make check
|
VERBOSE=1 make check
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%{?ldconfig: %ldconfig}
|
|
||||||
|
|
||||||
umask 0022
|
umask 0022
|
||||||
|
|
||||||
mkdir -p /usr/lib/fontconfig/cache
|
mkdir -p /usr/lib/fontconfig/cache
|
||||||
@ -121,14 +133,25 @@ if [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache --version 2>&1 | grep -q %{vers
|
|||||||
HOME=/root /usr/bin/fc-cache -f
|
HOME=/root /usr/bin/fc-cache -f
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%ldconfig_postun
|
|
||||||
|
|
||||||
%transfiletriggerin -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts
|
%transfiletriggerin -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts
|
||||||
HOME=/root /usr/bin/fc-cache -s
|
HOME=/root /usr/bin/fc-cache -s
|
||||||
|
|
||||||
%transfiletriggerpostun -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts
|
%transfiletriggerpostun -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts
|
||||||
HOME=/root /usr/bin/fc-cache -s
|
HOME=/root /usr/bin/fc-cache -s
|
||||||
|
|
||||||
|
%posttrans
|
||||||
|
if [ -e %{_sysconfdir}/xml/catalog ]; then
|
||||||
|
%{_bindir}/xmlcatalog --noout --add system \
|
||||||
|
"urn:fontconfig:fonts.dtd" \
|
||||||
|
"file://%{_datadir}/xml/fontconfig/fonts.dtd" \
|
||||||
|
%{_sysconfdir}/xml/catalog
|
||||||
|
fi
|
||||||
|
|
||||||
|
%postun
|
||||||
|
if [ $1 == 0 ] && [ -e %{_sysconfdir}/xml/catalog ]; then
|
||||||
|
%{_bindir}/xmlcatalog --noout --del "urn:fontconfig:fonts.dtd" %{_sysconfdir}/xml/catalog
|
||||||
|
fi
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%doc README AUTHORS
|
%doc README AUTHORS
|
||||||
%doc fontconfig-user.txt fontconfig-user.html
|
%doc fontconfig-user.txt fontconfig-user.html
|
||||||
@ -166,18 +189,135 @@ HOME=/root /usr/bin/fc-cache -s
|
|||||||
%doc fontconfig-devel.txt fontconfig-devel
|
%doc fontconfig-devel.txt fontconfig-devel
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Aug 16 2021 Akira TAGOH <tagoh@redhat.com> - 2.13.1-4
|
* Fri Dec 2 2022 Akira TAGOH <tagoh@redhat.com> - 2.14.0-2
|
||||||
- Return the error code when fc-validate detects missing glyphs.
|
- Fix the wrong behavior on remap-dir in config.
|
||||||
Resolves: rhbz#1972037
|
Resolves: rhbz#2150227
|
||||||
|
|
||||||
* Fri Nov 30 2018 Akira TAGOH <tagoh@redhat.com> - 2.13.1-3
|
* Thu Mar 31 2022 Akira TAGOH <tagoh@redhat.com> - 2.14.0-1
|
||||||
|
- New upstream release.
|
||||||
|
- Rebase to 2.14 and revert Noto Default change happened in f36.
|
||||||
|
Resolves: rhbz#2075393
|
||||||
|
|
||||||
|
* Fri Feb 4 2022 Akira TAGOH <tagoh@redhat.com> - 2.13.96-1
|
||||||
|
- New upstream release.
|
||||||
|
- Fix missing a file in the archive.
|
||||||
|
Resolves: rhbz#2050478
|
||||||
|
|
||||||
|
* Tue Feb 1 2022 Akira TAGOH <tagoh@redhat.com> - 2.13.95-1
|
||||||
|
- New upstream release.
|
||||||
|
- Update deps to font(notosans)
|
||||||
|
https://fedoraproject.org/wiki/Changes/DefaultToNotoFonts
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.94-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.94-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 20 2021 Akira TAGOH <tagoh@redhat.com> - 2.13.94-2
|
||||||
|
- Fix the score calculation on matching for multiple values.
|
||||||
|
- Enable 11-lcdfilter-default.conf.
|
||||||
|
Resolves: rhbz#1965684
|
||||||
|
- Rebase to the latest release.
|
||||||
|
Resolves: rhbz#2023161
|
||||||
|
|
||||||
|
* Tue Jun 29 2021 Akira TAGOH <tagoh@redhat.com> - 2.13.94-1
|
||||||
|
- New upstream release.
|
||||||
|
|
||||||
|
* Thu Mar 25 2021 Akira TAGOH <tagoh@redhat.com> - 2.13.93-6
|
||||||
|
- Fix postun scriptlet to remove the entry from xml catalog.
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.93-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Dec 23 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.93-4
|
||||||
|
- cherry pick some upstream patches
|
||||||
|
- Skip leading white space in style.
|
||||||
|
- Remove abort from FcCompareSize.
|
||||||
|
- Fix memory leaks
|
||||||
|
- Check qual and compare for family tests.
|
||||||
|
-
|
||||||
|
* Thu Dec 3 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.93-3
|
||||||
|
- Add back fullname property at the scan matching phase for the backward compatibility.
|
||||||
|
Resolves: rhbz#1902881
|
||||||
|
|
||||||
|
* Mon Nov 30 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.93-2
|
||||||
|
- Fix file conflicts.
|
||||||
|
|
||||||
|
* Sat Nov 28 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.93-1
|
||||||
|
- New upstream release.
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.92-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Apr 23 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.92-11
|
||||||
|
- deal with system caches as always latest on Silverblue. (#1750891)
|
||||||
|
|
||||||
|
* Thu Apr 02 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.92-10
|
||||||
|
- Build against libxml2 instead of expat.
|
||||||
|
|
||||||
|
* Sat Mar 28 2020 Nicolas Mailhot <nim@fedoraproject.org> - 2.13.92-9
|
||||||
|
- Fix DTD declaration and registration so users and Fedora automation can
|
||||||
|
easily validate new configuration files
|
||||||
|
|
||||||
|
* Mon Mar 23 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.92-8
|
||||||
|
- Fix assertion in FcCacheFini() again.
|
||||||
|
Resolves: rhbz#1815684
|
||||||
|
|
||||||
|
* Wed Feb 26 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.92-7
|
||||||
|
- Fix assertion in FcCacheFini().
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.92-6
|
||||||
|
- Fix some wrong behavior with sysroot option.
|
||||||
|
- Fix reading the outdated caches.
|
||||||
|
- Apply a patch to make it MT-safe more.
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.92-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 20 2020 Akira TAGOH <tagoh@redhat.com> - 2.13.92-4
|
||||||
|
- Drop font(:lang=...) from %%{=pkgkit} format.
|
||||||
|
Reference: rhbz#1792463
|
||||||
|
|
||||||
|
* Wed Aug 28 2019 Akira TAGOH <tagoh@redhat.com> - 2.13.92-3
|
||||||
|
- Do not return false on FcConfigParseAndLoad*() if complain is set to false.
|
||||||
|
Resolves: rhbz#1744377
|
||||||
|
|
||||||
|
* Fri Aug 9 2019 Akira TAGOH <tagoh@redhat.com> - 2.13.92-2
|
||||||
|
- Fix to affect fonthashint property for score on match.
|
||||||
|
|
||||||
|
* Fri Aug 9 2019 Akira TAGOH <tagoh@redhat.com> - 2.13.92-1
|
||||||
|
- New upstream release.
|
||||||
|
|
||||||
|
* Wed Jul 31 2019 Akira TAGOH <tagoh@redhat.com> - 2.13.91-4
|
||||||
|
- Fix make check fails.
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.91-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jun 16 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 2.13.91-2
|
||||||
|
- Remove calls to ldconfig from scriptlets
|
||||||
|
- Use "PreReq" instead of "Requires(pre)" for freetype
|
||||||
|
|
||||||
|
* Mon Jun 10 2019 Akira TAGOH <tagoh@redhat.com> - 2.13.91-1
|
||||||
|
- New upstream release.
|
||||||
|
|
||||||
|
* Fri Feb 22 2019 Akira TAGOH <tagoh@redhat.com> - 2.13.1-6
|
||||||
|
- Update freetype version for runtime dependency to ensure
|
||||||
|
they have FT_Done_MM_Var symbol certainly. (#1679619)
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Nov 13 2018 Akira TAGOH <tagoh@redhat.com> - 2.13.1-4
|
||||||
|
- Use Rachana instead of Meera for serif subsitution. (#1649184)
|
||||||
|
|
||||||
|
* Wed Nov 07 2018 Akira TAGOH <tagoh@redhat.com> - 2.13.1-3
|
||||||
- Stop cleaning up .uuid file even when a directory is empty.
|
- Stop cleaning up .uuid file even when a directory is empty.
|
||||||
resolves: rhbz#1653171
|
|
||||||
- Use Rachana instead of Meera for serif subsitution.
|
|
||||||
resolves: rhbz#1650491
|
|
||||||
|
|
||||||
* Wed Sep 12 2018 Akira TAGOH <tagoh@redhat.com> - 2.13.1-2
|
* Wed Sep 26 2018 Akira TAGOH <tagoh@redhat.com> - 2.13.1-2
|
||||||
- Remove 25-no-bitmap-fedora.conf. (#1627023)
|
- Add man page for fc-cache-* links to fc-cache.
|
||||||
|
- Drop unnecessary BR.
|
||||||
|
|
||||||
* Thu Aug 30 2018 Akira TAGOH <tagoh@redhat.com> - 2.13.1-1
|
* Thu Aug 30 2018 Akira TAGOH <tagoh@redhat.com> - 2.13.1-1
|
||||||
- New upstream release.
|
- New upstream release.
|
||||||
4
fc-cache
4
fc-cache
@ -1,4 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
|
|
||||||
[ -x /usr/bin/fc-cache-32 ] && /usr/bin/fc-cache-32 $@ || :
|
|
||||||
[ -x /usr/bin/fc-cache-64 ] && /usr/bin/fc-cache-64 $@ || :
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
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,14 +0,0 @@
|
|||||||
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,93 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
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;
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-8
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
|
||||||
1
sources
1
sources
@ -1 +0,0 @@
|
|||||||
SHA512 (fontconfig-2.13.1.tar.bz2) = f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: standard-test-basic
|
|
||||||
tags:
|
|
||||||
- classic
|
|
||||||
required_packages:
|
|
||||||
- fontconfig
|
|
||||||
tests:
|
|
||||||
- fcmatch_test:
|
|
||||||
dir: .
|
|
||||||
run: fc-match
|
|
||||||
- fclist_test:
|
|
||||||
dir: .
|
|
||||||
run: fc-list
|
|
||||||
Loading…
Reference in New Issue
Block a user