Compare commits

...

No commits in common. 'c9' and 'i10c-beta' have entirely different histories.

@ -1 +1 @@
9b1d4c5a61b4d25140db444e9cf56f09fb843fce SOURCES/fontconfig-2.14.0.tar.xz b6137ee5d542c0fe5c96a7724884f2e8e212d275 SOURCES/fontconfig-2.15.0.tar.xz

2
.gitignore vendored

@ -1 +1 @@
SOURCES/fontconfig-2.14.0.tar.xz SOURCES/fontconfig-2.15.0.tar.xz

@ -0,0 +1,54 @@
From eaa335e7c4686c622f31e691f8a41fdf30ea42b3 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 31 Jul 2024 17:31:36 +0900
Subject: [PATCH 1/2] Fix a memory leak in _get_real_paths_from_prefix
---
src/fcxml.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/fcxml.c b/src/fcxml.c
index 9fe0674..083fc1f 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -1327,11 +1327,9 @@ _get_real_paths_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcC
if (!p)
return NULL;
parent = FcStrDirname (p);
+ FcStrFree (p);
if (!parent)
- {
- free (p);
return NULL;
- }
}
}
#ifndef _WIN32
--
2.45.2
From ab765827101787d49c0a66b23addc1f68f99a455 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 31 Jul 2024 17:37:53 +0900
Subject: [PATCH 2/2] Set FcTypeVoid if no valid types to convert
---
src/fcname.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/fcname.c b/src/fcname.c
index 566f0ef..b152bd9 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -406,6 +406,8 @@ FcNameConvert (FcType type, const char *object, FcChar8 *string)
v.u.r = FcRangeCreateDouble (b, e);
break;
default:
+ /* No valid type to convert */
+ v.type = FcTypeVoid;
break;
}
return v;
--
2.45.2

@ -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,509 @@
diff -pruN fontconfig-2.15.0.orig/conf.d/65-nonlatin.conf fontconfig-2.15.0/conf.d/65-nonlatin.conf
--- fontconfig-2.15.0.orig/conf.d/65-nonlatin.conf 2023-03-22 20:36:46.000000000 +0900
+++ fontconfig-2.15.0/conf.d/65-nonlatin.conf 1970-01-01 09:00:00.000000000 +0900
@@ -1,240 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-<fontconfig>
- <description>Set preferable fonts for non-Latin</description>
- <alias>
- <family>serif</family>
- <prefer>
- <family>Artsounk</family> <!-- armenian -->
- <family>BPG UTF8 M</family> <!-- georgian -->
- <family>Kinnari</family> <!-- thai -->
- <family>Norasi</family> <!-- thai -->
- <family>Frank Ruehl</family> <!-- hebrew -->
- <family>Dror</family> <!-- hebrew -->
- <family>JG LaoTimes</family> <!-- lao -->
- <family>Saysettha Unicode</family> <!-- lao -->
- <family>Pigiarniq</family> <!-- canadian syllabics -->
- <family>B Davat</family> <!-- arabic (fa) -->
- <family>B Compset</family> <!-- arabic (fa) -->
- <family>Kacst-Qr</family> <!-- arabic (ar) -->
- <family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
- <family>Raghindi</family> <!-- devanagari -->
- <family>Mukti Narrow</family> <!-- bengali -->
- <family>malayalam</family> <!-- malayalam -->
- <family>Sampige</family> <!-- kannada -->
- <family>padmaa</family> <!-- gujarati -->
- <family>Hapax Berbère</family> <!-- tifinagh -->
- <family>MS Mincho</family> <!-- han (ja) -->
- <family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
- <family>PMingLiu</family> <!-- han (zh-tw) -->
- <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
- <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
- <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
- <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
- <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
- <family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
- <family>Hiragino Mincho ProN</family> <!-- han (ja) - macOS -->
- <family>Songti SC</family> <!-- han (zh-cn) - macOS -->
- <family>Songti TC</family> <!-- han (zh-tw) - macOS -->
- <family>SimSong</family> <!-- han (zh-cn) - macOS -->
- <family>MgOpen Canonica</family>
- <family>Sazanami Mincho</family>
- <family>IPAMonaMincho</family>
- <family>IPAMincho</family>
- <family>Kochi Mincho</family>
- <family>AR PL SungtiL GB</family>
- <family>AR PL Mingti2L Big5</family>
- <family>AR PL Zenkai Uni</family>
- <family> 明朝</family>
- <family>ZYSong18030</family>
- <family>NanumMyeongjo</family> <!-- hangul (ko) -->
- <family>UnBatang</family> <!-- hangul (ko) -->
- <family>Baekmuk Batang</family> <!-- hangul (ko) -->
- <family>AppleMyungjo</family> <!-- hangul (ko) - macOS -->
- <family>KacstQura</family>
- <family>Frank Ruehl CLM</family>
- <family>Lohit Bengali</family>
- <family>Lohit Gujarati</family>
- <family>Lohit Hindi</family>
- <family>Lohit Marathi</family>
- <family>Lohit Maithili</family>
- <family>Lohit Kashmiri</family>
- <family>Lohit Konkani</family>
- <family>Lohit Nepali</family>
- <family>Lohit Sindhi</family>
- <family>Lohit Punjabi</family>
- <family>Lohit Tamil</family>
- <family>Rachana</family>
- <family>Lohit Malayalam</family>
- <family>Lohit Kannada</family>
- <family>Lohit Telugu</family>
- <family>Lohit Oriya</family>
- <family>LKLUG</family>
- </prefer>
- </alias>
- <alias>
- <family>sans-serif</family>
- <prefer>
- <family>Nachlieli</family> <!-- hebrew -->
- <family>Lucida Sans Unicode</family>
- <family>Yudit Unicode</family>
- <family>Kerkis</family> <!-- greek -->
- <family>ArmNet Helvetica</family> <!-- armenian -->
- <family>Artsounk</family> <!-- armenian -->
- <family>BPG UTF8 M</family> <!-- georgian -->
- <family>Waree</family> <!-- thai -->
- <family>Loma</family> <!-- thai -->
- <family>Garuda</family> <!-- thai -->
- <family>Umpush</family> <!-- thai -->
- <family>Saysettha Unicode</family> <!-- lao? -->
- <family>JG Lao Old Arial</family> <!-- lao -->
- <family>GF Zemen Unicode</family> <!-- ethiopic -->
- <family>Pigiarniq</family> <!-- canadian syllabics -->
- <family>B Davat</family> <!-- arabic (fa) -->
- <family>B Compset</family> <!-- arabic (fa) -->
- <family>Kacst-Qr</family> <!-- arabic (ar) -->
- <family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
- <family>Raghindi</family> <!-- devanagari -->
- <family>Mukti Narrow</family> <!-- bengali -->
- <family>malayalam</family> <!-- malayalam -->
- <family>Sampige</family> <!-- kannada -->
- <family>padmaa</family> <!-- gujarati -->
- <family>Hapax Berbère</family> <!-- tifinagh -->
- <family>MS Gothic</family> <!-- han (ja) -->
- <family>UmePlus P Gothic</family> <!-- han (ja) -->
- <family>Microsoft YaHei</family> <!-- han (zh-cn,zh-tw) -->
- <family>Microsoft JhengHei</family> <!-- han (zh-tw) -->
- <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
- <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
- <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
- <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
- <family>Hiragino Sans</family> <!-- han (ja) - macOS -->
- <family>PingFang SC</family> <!-- han (zh-cn) - macOS -->
- <family>PingFang TC</family> <!-- han (zh-tw) - macOS -->
- <family>PingFang HK</family> <!-- han (zh-hk) - macOS -->
- <family>Hiragino Sans CNS</family> <!-- han (zh-cn) - macOS -->
- <family>Hiragino Sans GB</family> <!-- han (zh-tw) - macOS -->
- <family>MgOpen Modata</family>
- <family>VL Gothic</family>
- <family>IPAMonaGothic</family>
- <family>IPAGothic</family>
- <family>Sazanami Gothic</family>
- <family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
- <family>AR PL KaitiM Big5</family>
- <family>AR PL ShanHeiSun Uni</family>
- <family>AR PL SungtiL GB</family>
- <family>AR PL Mingti2L Big5</family>
- <family> ゴシック</family>
- <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
- <family>TSCu_Paranar</family> <!-- tamil -->
- <family>NanumGothic</family> <!-- hangul (ko) -->
- <family>UnDotum</family> <!-- hangul (ko) -->
- <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
- <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
- <family>Apple SD Gothic Neo</family> <!-- hangul (ko) - macOS -->
- <family>KacstQura</family>
- <family>Lohit Bengali</family>
- <family>Lohit Gujarati</family>
- <family>Lohit Hindi</family>
- <family>Lohit Marathi</family>
- <family>Lohit Maithili</family>
- <family>Lohit Kashmiri</family>
- <family>Lohit Konkani</family>
- <family>Lohit Nepali</family>
- <family>Lohit Sindhi</family>
- <family>Lohit Punjabi</family>
- <family>Lohit Tamil</family>
- <family>Meera</family>
- <family>Lohit Malayalam</family>
- <family>Lohit Kannada</family>
- <family>Lohit Telugu</family>
- <family>Lohit Oriya</family>
- <family>LKLUG</family>
- </prefer>
- </alias>
- <alias>
- <family>monospace</family>
- <prefer>
- <family>Miriam Mono</family> <!-- hebrew -->
- <family>VL Gothic</family>
- <family>IPAMonaGothic</family>
- <family>IPAGothic</family>
- <family>Sazanami Gothic</family>
- <family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
- <family>MS Gothic</family> <!-- han (ja) -->
- <family>UmePlus Gothic</family> <!-- han (ja) -->
- <family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
- <family>MingLiu</family> <!-- han (zh-tw) -->
- <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
- <family>AR PL New Sung Mono</family> <!-- han (zh-cn,zh-tw) -->
- <family>HanyiSong</family> <!-- han (zh-cn) -->
- <family>AR PL SungtiL GB</family>
- <family>AR PL Mingti2L Big5</family>
- <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
- <family>NanumGothicCoding</family> <!-- hangul (ko) -->
- <family>NanumGothic</family> <!-- hangul (ko) -->
- <family>UnDotum</family> <!-- hangul (ko) -->
- <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
- <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
- <family>TlwgTypo</family> <!-- thai -->
- <family>TlwgTypist</family> <!-- thai -->
- <family>TlwgTypewriter</family> <!-- thai -->
- <family>TlwgMono</family> <!-- thai -->
- <family>Hasida</family> <!-- hebrew -->
- <family>GF Zemen Unicode</family> <!-- ethiopic -->
- <family>Hapax Berbère</family> <!-- tifinagh -->
- <family>Lohit Bengali</family>
- <family>Lohit Gujarati</family>
- <family>Lohit Hindi</family>
- <family>Lohit Marathi</family>
- <family>Lohit Maithili</family>
- <family>Lohit Kashmiri</family>
- <family>Lohit Konkani</family>
- <family>Lohit Nepali</family>
- <family>Lohit Sindhi</family>
- <family>Lohit Punjabi</family>
- <family>Lohit Tamil</family>
- <family>Meera</family>
- <family>Lohit Malayalam</family>
- <family>Lohit Kannada</family>
- <family>Lohit Telugu</family>
- <family>Lohit Oriya</family>
- <family>LKLUG</family>
- </prefer>
- </alias>
-<!--
- system-ui
--->
- <alias>
- <family>system-ui</family>
- <prefer>
- <family>Noto Sans Arabic UI</family><!-- ar -->
- <family>Noto Sans Bengali UI</family><!-- bn -->
- <family>Noto Sans Devanagari UI</family><!-- hi, mai, mr -->
- <family>Noto Sans Gujarati UI</family><!-- gu -->
- <family>Noto Sans Gurmukhi UI</family><!-- pa -->
- <family>Noto Sans Kannada UI</family><!-- kn -->
- <family>Noto Sans Khmer UI</family><!-- km -->
- <family>Noto Sans Lao UI</family><!-- lo -->
- <family>Noto Sans Malayalam UI</family><!-- ml -->
- <family>Noto Sans Myanmar UI</family><!-- my -->
- <family>Noto Sans Oriya UI</family><!-- or -->
- <family>Noto Sans Sinhala UI</family><!-- si -->
- <family>Noto Sans Tamil UI</family><!-- ta -->
- <family>Noto Sans Telugu UI</family><!-- te -->
- <family>Noto Sans Thai UI</family><!-- th -->
- <family>Leelawadee UI</family><!-- bug, th, jv, km, lo -->
- <family>Nirmala UI</family><!-- Indic -->
- <family>Yu Gothic UI</family><!-- han (ja) -->
- <family>Meiryo UI</family><!-- han (ja) -->
- <family>MS UI Gothic</family><!-- han (ja) -->
- <family>Khmer UI</family><!-- km -->
- <family>Lao UI</family><!-- lo -->
- <family>Microsoft YaHei UI</family><!-- han (zh-cn) -->
- <family>Microsoft JhengHei UI</family><!-- han (zh-tw) -->
- </prefer>
- </alias>
-
-</fontconfig>
diff -pruN fontconfig-2.15.0.orig/conf.d/69-nonlatin.conf fontconfig-2.15.0/conf.d/69-nonlatin.conf
--- fontconfig-2.15.0.orig/conf.d/69-nonlatin.conf 1970-01-01 09:00:00.000000000 +0900
+++ fontconfig-2.15.0/conf.d/69-nonlatin.conf 2023-03-22 20:36:46.000000000 +0900
@@ -0,0 +1,240 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+ <description>Set preferable fonts for non-Latin</description>
+ <alias>
+ <family>serif</family>
+ <prefer>
+ <family>Artsounk</family> <!-- armenian -->
+ <family>BPG UTF8 M</family> <!-- georgian -->
+ <family>Kinnari</family> <!-- thai -->
+ <family>Norasi</family> <!-- thai -->
+ <family>Frank Ruehl</family> <!-- hebrew -->
+ <family>Dror</family> <!-- hebrew -->
+ <family>JG LaoTimes</family> <!-- lao -->
+ <family>Saysettha Unicode</family> <!-- lao -->
+ <family>Pigiarniq</family> <!-- canadian syllabics -->
+ <family>B Davat</family> <!-- arabic (fa) -->
+ <family>B Compset</family> <!-- arabic (fa) -->
+ <family>Kacst-Qr</family> <!-- arabic (ar) -->
+ <family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+ <family>Raghindi</family> <!-- devanagari -->
+ <family>Mukti Narrow</family> <!-- bengali -->
+ <family>malayalam</family> <!-- malayalam -->
+ <family>Sampige</family> <!-- kannada -->
+ <family>padmaa</family> <!-- gujarati -->
+ <family>Hapax Berbère</family> <!-- tifinagh -->
+ <family>MS Mincho</family> <!-- han (ja) -->
+ <family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+ <family>PMingLiu</family> <!-- han (zh-tw) -->
+ <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+ <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+ <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+ <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+ <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+ <family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
+ <family>Hiragino Mincho ProN</family> <!-- han (ja) - macOS -->
+ <family>Songti SC</family> <!-- han (zh-cn) - macOS -->
+ <family>Songti TC</family> <!-- han (zh-tw) - macOS -->
+ <family>SimSong</family> <!-- han (zh-cn) - macOS -->
+ <family>MgOpen Canonica</family>
+ <family>Sazanami Mincho</family>
+ <family>IPAMonaMincho</family>
+ <family>IPAMincho</family>
+ <family>Kochi Mincho</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>AR PL Zenkai Uni</family>
+ <family> 明朝</family>
+ <family>ZYSong18030</family>
+ <family>NanumMyeongjo</family> <!-- hangul (ko) -->
+ <family>UnBatang</family> <!-- hangul (ko) -->
+ <family>Baekmuk Batang</family> <!-- hangul (ko) -->
+ <family>AppleMyungjo</family> <!-- hangul (ko) - macOS -->
+ <family>KacstQura</family>
+ <family>Frank Ruehl CLM</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Marathi</family>
+ <family>Lohit Maithili</family>
+ <family>Lohit Kashmiri</family>
+ <family>Lohit Konkani</family>
+ <family>Lohit Nepali</family>
+ <family>Lohit Sindhi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Rachana</family>
+ <family>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Oriya</family>
+ <family>LKLUG</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+ <family>Nachlieli</family> <!-- hebrew -->
+ <family>Lucida Sans Unicode</family>
+ <family>Yudit Unicode</family>
+ <family>Kerkis</family> <!-- greek -->
+ <family>ArmNet Helvetica</family> <!-- armenian -->
+ <family>Artsounk</family> <!-- armenian -->
+ <family>BPG UTF8 M</family> <!-- georgian -->
+ <family>Waree</family> <!-- thai -->
+ <family>Loma</family> <!-- thai -->
+ <family>Garuda</family> <!-- thai -->
+ <family>Umpush</family> <!-- thai -->
+ <family>Saysettha Unicode</family> <!-- lao? -->
+ <family>JG Lao Old Arial</family> <!-- lao -->
+ <family>GF Zemen Unicode</family> <!-- ethiopic -->
+ <family>Pigiarniq</family> <!-- canadian syllabics -->
+ <family>B Davat</family> <!-- arabic (fa) -->
+ <family>B Compset</family> <!-- arabic (fa) -->
+ <family>Kacst-Qr</family> <!-- arabic (ar) -->
+ <family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+ <family>Raghindi</family> <!-- devanagari -->
+ <family>Mukti Narrow</family> <!-- bengali -->
+ <family>malayalam</family> <!-- malayalam -->
+ <family>Sampige</family> <!-- kannada -->
+ <family>padmaa</family> <!-- gujarati -->
+ <family>Hapax Berbère</family> <!-- tifinagh -->
+ <family>MS Gothic</family> <!-- han (ja) -->
+ <family>UmePlus P Gothic</family> <!-- han (ja) -->
+ <family>Microsoft YaHei</family> <!-- han (zh-cn,zh-tw) -->
+ <family>Microsoft JhengHei</family> <!-- han (zh-tw) -->
+ <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+ <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+ <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
+ <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+ <family>Hiragino Sans</family> <!-- han (ja) - macOS -->
+ <family>PingFang SC</family> <!-- han (zh-cn) - macOS -->
+ <family>PingFang TC</family> <!-- han (zh-tw) - macOS -->
+ <family>PingFang HK</family> <!-- han (zh-hk) - macOS -->
+ <family>Hiragino Sans CNS</family> <!-- han (zh-cn) - macOS -->
+ <family>Hiragino Sans GB</family> <!-- han (zh-tw) - macOS -->
+ <family>MgOpen Modata</family>
+ <family>VL Gothic</family>
+ <family>IPAMonaGothic</family>
+ <family>IPAGothic</family>
+ <family>Sazanami Gothic</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>AR PL KaitiM Big5</family>
+ <family>AR PL ShanHeiSun Uni</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family> ゴシック</family>
+ <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+ <family>TSCu_Paranar</family> <!-- tamil -->
+ <family>NanumGothic</family> <!-- hangul (ko) -->
+ <family>UnDotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+ <family>Apple SD Gothic Neo</family> <!-- hangul (ko) - macOS -->
+ <family>KacstQura</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Marathi</family>
+ <family>Lohit Maithili</family>
+ <family>Lohit Kashmiri</family>
+ <family>Lohit Konkani</family>
+ <family>Lohit Nepali</family>
+ <family>Lohit Sindhi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Meera</family>
+ <family>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Oriya</family>
+ <family>LKLUG</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <prefer>
+ <family>Miriam Mono</family> <!-- hebrew -->
+ <family>VL Gothic</family>
+ <family>IPAMonaGothic</family>
+ <family>IPAGothic</family>
+ <family>Sazanami Gothic</family>
+ <family>Kochi Gothic</family>
+ <family>AR PL KaitiM GB</family>
+ <family>MS Gothic</family> <!-- han (ja) -->
+ <family>UmePlus Gothic</family> <!-- han (ja) -->
+ <family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
+ <family>MingLiu</family> <!-- han (zh-tw) -->
+ <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+ <family>AR PL New Sung Mono</family> <!-- han (zh-cn,zh-tw) -->
+ <family>HanyiSong</family> <!-- han (zh-cn) -->
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+ <family>NanumGothicCoding</family> <!-- hangul (ko) -->
+ <family>NanumGothic</family> <!-- hangul (ko) -->
+ <family>UnDotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+ <family>TlwgTypo</family> <!-- thai -->
+ <family>TlwgTypist</family> <!-- thai -->
+ <family>TlwgTypewriter</family> <!-- thai -->
+ <family>TlwgMono</family> <!-- thai -->
+ <family>Hasida</family> <!-- hebrew -->
+ <family>GF Zemen Unicode</family> <!-- ethiopic -->
+ <family>Hapax Berbère</family> <!-- tifinagh -->
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Marathi</family>
+ <family>Lohit Maithili</family>
+ <family>Lohit Kashmiri</family>
+ <family>Lohit Konkani</family>
+ <family>Lohit Nepali</family>
+ <family>Lohit Sindhi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Meera</family>
+ <family>Lohit Malayalam</family>
+ <family>Lohit Kannada</family>
+ <family>Lohit Telugu</family>
+ <family>Lohit Oriya</family>
+ <family>LKLUG</family>
+ </prefer>
+ </alias>
+<!--
+ system-ui
+-->
+ <alias>
+ <family>system-ui</family>
+ <prefer>
+ <family>Noto Sans Arabic UI</family><!-- ar -->
+ <family>Noto Sans Bengali UI</family><!-- bn -->
+ <family>Noto Sans Devanagari UI</family><!-- hi, mai, mr -->
+ <family>Noto Sans Gujarati UI</family><!-- gu -->
+ <family>Noto Sans Gurmukhi UI</family><!-- pa -->
+ <family>Noto Sans Kannada UI</family><!-- kn -->
+ <family>Noto Sans Khmer UI</family><!-- km -->
+ <family>Noto Sans Lao UI</family><!-- lo -->
+ <family>Noto Sans Malayalam UI</family><!-- ml -->
+ <family>Noto Sans Myanmar UI</family><!-- my -->
+ <family>Noto Sans Oriya UI</family><!-- or -->
+ <family>Noto Sans Sinhala UI</family><!-- si -->
+ <family>Noto Sans Tamil UI</family><!-- ta -->
+ <family>Noto Sans Telugu UI</family><!-- te -->
+ <family>Noto Sans Thai UI</family><!-- th -->
+ <family>Leelawadee UI</family><!-- bug, th, jv, km, lo -->
+ <family>Nirmala UI</family><!-- Indic -->
+ <family>Yu Gothic UI</family><!-- han (ja) -->
+ <family>Meiryo UI</family><!-- han (ja) -->
+ <family>MS UI Gothic</family><!-- han (ja) -->
+ <family>Khmer UI</family><!-- km -->
+ <family>Lao UI</family><!-- lo -->
+ <family>Microsoft YaHei UI</family><!-- han (zh-cn) -->
+ <family>Microsoft JhengHei UI</family><!-- han (zh-tw) -->
+ </prefer>
+ </alias>
+
+</fontconfig>
diff -pruN fontconfig-2.15.0.orig/conf.d/Makefile.am fontconfig-2.15.0/conf.d/Makefile.am
--- fontconfig-2.15.0.orig/conf.d/Makefile.am 2023-08-24 14:14:15.000000000 +0900
+++ fontconfig-2.15.0/conf.d/Makefile.am 2023-12-22 23:08:05.514969924 +0900
@@ -47,7 +47,7 @@ CONF_LINKS = \
60-generic.conf \
60-latin.conf \
65-fonts-persian.conf \
- 65-nonlatin.conf \
+ 69-nonlatin.conf \
69-unifont.conf \
80-delicious.conf \
90-synthetic.conf
@@ -95,7 +95,7 @@ template_DATA = \
60-latin.conf \
65-fonts-persian.conf \
65-khmer.conf \
- 65-nonlatin.conf \
+ 69-nonlatin.conf \
69-unifont.conf \
70-no-bitmaps.conf \
70-yes-bitmaps.conf \

@ -0,0 +1,67 @@
From c22908828fb2dbfdf38733d119adc1cf5fe00173 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Sat, 10 Feb 2024 00:20:54 +0900
Subject: [PATCH 1/2] Clean up .uuid files with fc-cache -f too
.uuid file was obsoleted >5 years ago and it was supposed to
be cleaned up by fc-cache -r but not -f.
This change tries to clean it up by fc-cache -f.
https://bugzilla.redhat.com/show_bug.cgi?id=1761885
---
src/fcdir.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/fcdir.c b/src/fcdir.c
index 6f7b3835..2e4fdc69 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -234,7 +234,7 @@ FcDirScanConfig (FcFontSet *set,
if (FcDebug () & FC_DBG_SCAN)
printf ("\tScanning dir %s\n", s_dir);
-
+
d = opendir ((char *) s_dir);
if (!d)
{
@@ -459,7 +459,10 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
/* Not using existing cache file, construct new cache */
if (!cache)
+ {
+ FcDirCacheDeleteUUID (dir, config);
cache = FcDirCacheScan (dir, config);
+ }
FcConfigDestroy (config);
return cache;
--
2.43.0
From a76b95105ca26c600279b2daf4bd43b37a918823 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Sat, 10 Feb 2024 02:15:45 +0900
Subject: [PATCH 2/2] Fix undesired unref of FcConfig on Win32
---
src/fccache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fccache.c b/src/fccache.c
index cebbb810..54f76ac1 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -106,8 +106,8 @@ FcDirCacheDeleteUUID (const FcChar8 *dir,
FcStrFree (target);
bail:
FcStrFree (d);
-#endif
FcConfigDestroy (config);
+#endif
return ret;
}
--
2.43.0

@ -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>

@ -4,13 +4,14 @@
Summary: Font configuration and customization library Summary: Font configuration and customization library
Name: fontconfig Name: fontconfig
Version: 2.14.0 Version: 2.15.0
Release: 2%{?dist} Release: 6%{?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
## https://gitlab.com/fedora/legal/fedora-license-data/-/issues/177
# 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: HPND AND LicenseRef-Fedora-Public-Domain AND Unicode-DFS-2016
Source: http://fontconfig.org/release/%{name}-%{version}.tar.xz Source: http://fontconfig.org/release/%{name}-%{version}.tar.xz
URL: http://fontconfig.org URL: http://fontconfig.org
Source1: 25-no-bitmap-fedora.conf Source1: 25-no-bitmap-fedora.conf
@ -20,8 +21,9 @@ Source2: fc-cache
Patch0: %{name}-sleep-less.patch Patch0: %{name}-sleep-less.patch
Patch4: %{name}-drop-lang-from-pkgkit-format.patch Patch4: %{name}-drop-lang-from-pkgkit-format.patch
Patch5: %{name}-disable-network-required-test.patch Patch5: %{name}-disable-network-required-test.patch
Patch6: %{name}-revert-noto-default.patch Patch6: %{name}-lower-nonlatin-conf.patch
Patch7: %{name}-fix-remapdir.patch Patch7: %{name}-remove-uuid.patch
Patch9: %{name}-fix-SAST.patch
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: freetype-devel >= %{freetype_version}
@ -39,7 +41,7 @@ Requires(postun): xml-common
PreReq: freetype >= 2.9.1-6 PreReq: freetype >= 2.9.1-6
Requires(post): grep coreutils Requires(post): grep coreutils
Requires: font(:lang=en) Requires: font(:lang=en)
Suggests: font(dejavusans) Suggests: font(notosans)
%description %description
Fontconfig is designed to locate fonts within the Fontconfig is designed to locate fonts within the
@ -94,6 +96,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d 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}/
# Use implied value to allow the use of conditional conf
rm $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d/10-sub-pixel-*.conf
# move installed doc files back to build directory to package them # move installed doc files back to build directory to package them
# in the right place # in the right place
mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* . mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* .
@ -153,7 +158,7 @@ if [ $1 == 0 ] && [ -e %{_sysconfdir}/xml/catalog ]; then
fi fi
%files -f %{name}.lang %files -f %{name}.lang
%doc README AUTHORS %doc README.md AUTHORS
%doc fontconfig-user.txt fontconfig-user.html %doc fontconfig-user.txt fontconfig-user.html
%doc %{_fontconfig_confdir}/README %doc %{_fontconfig_confdir}/README
%license COPYING %license COPYING
@ -189,14 +194,71 @@ fi
%doc fontconfig-devel.txt fontconfig-devel %doc fontconfig-devel.txt fontconfig-devel
%changelog %changelog
* Fri Dec 2 2022 Akira TAGOH <tagoh@redhat.com> - 2.14.0-2 * Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.15.0-6
- Fix the wrong behavior on remap-dir in config. - Rebuilt for MSVSphere 10
Resolves: rhbz#2150227
* Thu Aug 1 2024 Akira TAGOH <tagoh@redhat.com> - 2.15.0-6
- Fix a memory leak and potentially uninitialized values.
Resolves: RHEL-41007, RHEL-41008
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.15.0-5
- Bump release for June 2024 mass rebuild
* Sat Feb 10 2024 Akira TAGOH <tagoh@redhat.com> - 2.15.0-4
- Delete .uuid with fc-cache -f.
Resolves: rhbz#1761885
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Dec 22 2023 Akira TAGOH <tagoh@redhat.com> - 2.15.0-1
- New upstream release.
Resolves: rhbz#2255623
* Thu Aug 17 2023 Akira TAGOH <tagoh@redhat.com> - 2.14.2-5
- Update 65-nonlatin.conf to 69-nonlatin.conf
This basically provides substitutes for certain languages and is helpful
to determine default behavior though, we have per-package config for similar purpose.
Since 65 is mostly used for default fonts and this config prevents some behavior for
packages named something coming later than "nonlatin" in the alphabetical order.
So moving this to the safer priority.
This would fixes an issue, particularly Lohit Marathi vs Lohit Devanagari after
updating their priorities from 65 to 66.
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jun 16 2023 Akira TAGOH <tagoh@redhat.com> - 2.14.2-3
- Drop 10-sub-pixel-rgb-for-kde.conf
Resolves: rhbz#2212512
* Tue Apr 4 2023 Akira TAGOH <tagoh@redhat.com> - 2.14.2-2
- Migrated license tag to SPDX.
* Fri Jan 27 2023 Akira TAGOH <tagoh@redhat.com> - 2.14.2-1
- New upstream release.
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Nov 26 2022 Akira TAGOH <tagoh@redhat.com> - 2.14.1-2
- Enable RGB stripes layout for sub-pixel rendering on KDE only.
Resolves: rhbz#2137825
* Fri Oct 21 2022 Akira TAGOH <tagoh@redhat.com> - 2.14.1-1
- New upstream release.
* Wed Sep 28 2022 Akira TAGOH <tagoh@redhat.com> - 2.14.0-3
- Remap font paths to other place properly.
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Mar 31 2022 Akira TAGOH <tagoh@redhat.com> - 2.14.0-1 * Thu Mar 31 2022 Akira TAGOH <tagoh@redhat.com> - 2.14.0-1
- New upstream release. - 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 * Fri Feb 4 2022 Akira TAGOH <tagoh@redhat.com> - 2.13.96-1
- New upstream release. - New upstream release.
@ -218,8 +280,6 @@ fi
- Fix the score calculation on matching for multiple values. - Fix the score calculation on matching for multiple values.
- Enable 11-lcdfilter-default.conf. - Enable 11-lcdfilter-default.conf.
Resolves: rhbz#1965684 Resolves: rhbz#1965684
- Rebase to the latest release.
Resolves: rhbz#2023161
* Tue Jun 29 2021 Akira TAGOH <tagoh@redhat.com> - 2.13.94-1 * Tue Jun 29 2021 Akira TAGOH <tagoh@redhat.com> - 2.13.94-1
- New upstream release. - New upstream release.

Loading…
Cancel
Save