diff --git a/.gitignore b/.gitignore index f153c22..487af73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1 @@ -fontconfig-2.8.0.tar.gz -/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 +fontconfig-2.15.0.tar.xz diff --git a/25-no-bitmap-fedora.conf b/25-no-bitmap-fedora.conf new file mode 100644 index 0000000..ffa7926 --- /dev/null +++ b/25-no-bitmap-fedora.conf @@ -0,0 +1,44 @@ + + + + + + Kochi Mincho + + + false + + + + + Kochi Gothic + + + false + + + + + Sazanami Mincho + + + false + + + + + Sazanami Gothic + + + false + + + + + AR PL ShanHeiSun Uni + + + true + + + diff --git a/fc-cache b/fc-cache index 6a12446..8253ae7 100755 --- a/fc-cache +++ b/fc-cache @@ -1,4 +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 $@ || : +[ -x /usr/bin/fc-cache-32 ] && /usr/bin/fc-cache-32 "$@" || : +[ -x /usr/bin/fc-cache-64 ] && /usr/bin/fc-cache-64 "$@" || : diff --git a/fontconfig-disable-network-required-test.patch b/fontconfig-disable-network-required-test.patch new file mode 100644 index 0000000..8481f39 --- /dev/null +++ b/fontconfig-disable-network-required-test.patch @@ -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 + diff --git a/fontconfig-drop-lang-from-pkgkit-format.patch b/fontconfig-drop-lang-from-pkgkit-format.patch new file mode 100644 index 0000000..8b77308 --- /dev/null +++ b/fontconfig-drop-lang-from-pkgkit-format.patch @@ -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:-|basename}: \"%{family[0]:-}\" \"%{style[0]:-}\"" + #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 diff --git a/fontconfig-fix-SAST.patch b/fontconfig-fix-SAST.patch new file mode 100644 index 0000000..6ef1b07 --- /dev/null +++ b/fontconfig-fix-SAST.patch @@ -0,0 +1,54 @@ +From eaa335e7c4686c622f31e691f8a41fdf30ea42b3 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +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 +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 + diff --git a/fontconfig-fix-fcvalidate.patch b/fontconfig-fix-fcvalidate.patch deleted file mode 100644 index fb77e61..0000000 --- a/fontconfig-fix-fcvalidate.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c336b8471877371f0190ba06f7547c54e2b890ba Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -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 - diff --git a/fontconfig-lower-nonlatin-conf.patch b/fontconfig-lower-nonlatin-conf.patch new file mode 100644 index 0000000..2be984f --- /dev/null +++ b/fontconfig-lower-nonlatin-conf.patch @@ -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 @@ +- +- +- +- Set preferable fonts for non-Latin +- +- serif +- +- Artsounk +- BPG UTF8 M +- Kinnari +- Norasi +- Frank Ruehl +- Dror +- JG LaoTimes +- Saysettha Unicode +- Pigiarniq +- B Davat +- B Compset +- Kacst-Qr +- Urdu Nastaliq Unicode +- Raghindi +- Mukti Narrow +- malayalam +- Sampige +- padmaa +- Hapax Berbère +- MS Mincho +- SimSun +- PMingLiu +- WenQuanYi Zen Hei +- WenQuanYi Bitmap Song +- AR PL ShanHeiSun Uni +- AR PL New Sung +- ZYSong18030 +- HanyiSong +- Hiragino Mincho ProN +- Songti SC +- Songti TC +- SimSong +- MgOpen Canonica +- Sazanami Mincho +- IPAMonaMincho +- IPAMincho +- Kochi Mincho +- AR PL SungtiL GB +- AR PL Mingti2L Big5 +- AR PL Zenkai Uni +- MS 明朝 +- ZYSong18030 +- NanumMyeongjo +- UnBatang +- Baekmuk Batang +- AppleMyungjo +- KacstQura +- Frank Ruehl CLM +- Lohit Bengali +- Lohit Gujarati +- Lohit Hindi +- Lohit Marathi +- Lohit Maithili +- Lohit Kashmiri +- Lohit Konkani +- Lohit Nepali +- Lohit Sindhi +- Lohit Punjabi +- Lohit Tamil +- Rachana +- Lohit Malayalam +- Lohit Kannada +- Lohit Telugu +- Lohit Oriya +- LKLUG +- +- +- +- sans-serif +- +- Nachlieli +- Lucida Sans Unicode +- Yudit Unicode +- Kerkis +- ArmNet Helvetica +- Artsounk +- BPG UTF8 M +- Waree +- Loma +- Garuda +- Umpush +- Saysettha Unicode +- JG Lao Old Arial +- GF Zemen Unicode +- Pigiarniq +- B Davat +- B Compset +- Kacst-Qr +- Urdu Nastaliq Unicode +- Raghindi +- Mukti Narrow +- malayalam +- Sampige +- padmaa +- Hapax Berbère +- MS Gothic +- UmePlus P Gothic +- Microsoft YaHei +- Microsoft JhengHei +- WenQuanYi Zen Hei +- WenQuanYi Bitmap Song +- AR PL ShanHeiSun Uni +- AR PL New Sung +- Hiragino Sans +- PingFang SC +- PingFang TC +- PingFang HK +- Hiragino Sans CNS +- Hiragino Sans GB +- MgOpen Modata +- VL Gothic +- IPAMonaGothic +- IPAGothic +- Sazanami Gothic +- Kochi Gothic +- AR PL KaitiM GB +- AR PL KaitiM Big5 +- AR PL ShanHeiSun Uni +- AR PL SungtiL GB +- AR PL Mingti2L Big5 +- MS ゴシック +- ZYSong18030 +- TSCu_Paranar +- NanumGothic +- UnDotum +- Baekmuk Dotum +- Baekmuk Gulim +- Apple SD Gothic Neo +- KacstQura +- Lohit Bengali +- Lohit Gujarati +- Lohit Hindi +- Lohit Marathi +- Lohit Maithili +- Lohit Kashmiri +- Lohit Konkani +- Lohit Nepali +- Lohit Sindhi +- Lohit Punjabi +- Lohit Tamil +- Meera +- Lohit Malayalam +- Lohit Kannada +- Lohit Telugu +- Lohit Oriya +- LKLUG +- +- +- +- monospace +- +- Miriam Mono +- VL Gothic +- IPAMonaGothic +- IPAGothic +- Sazanami Gothic +- Kochi Gothic +- AR PL KaitiM GB +- MS Gothic +- UmePlus Gothic +- NSimSun +- MingLiu +- AR PL ShanHeiSun Uni +- AR PL New Sung Mono +- HanyiSong +- AR PL SungtiL GB +- AR PL Mingti2L Big5 +- ZYSong18030 +- NanumGothicCoding +- NanumGothic +- UnDotum +- Baekmuk Dotum +- Baekmuk Gulim +- TlwgTypo +- TlwgTypist +- TlwgTypewriter +- TlwgMono +- Hasida +- GF Zemen Unicode +- Hapax Berbère +- Lohit Bengali +- Lohit Gujarati +- Lohit Hindi +- Lohit Marathi +- Lohit Maithili +- Lohit Kashmiri +- Lohit Konkani +- Lohit Nepali +- Lohit Sindhi +- Lohit Punjabi +- Lohit Tamil +- Meera +- Lohit Malayalam +- Lohit Kannada +- Lohit Telugu +- Lohit Oriya +- LKLUG +- +- +- +- +- system-ui +- +- Noto Sans Arabic UI +- Noto Sans Bengali UI +- Noto Sans Devanagari UI +- Noto Sans Gujarati UI +- Noto Sans Gurmukhi UI +- Noto Sans Kannada UI +- Noto Sans Khmer UI +- Noto Sans Lao UI +- Noto Sans Malayalam UI +- Noto Sans Myanmar UI +- Noto Sans Oriya UI +- Noto Sans Sinhala UI +- Noto Sans Tamil UI +- Noto Sans Telugu UI +- Noto Sans Thai UI +- Leelawadee UI +- Nirmala UI +- Yu Gothic UI +- Meiryo UI +- MS UI Gothic +- Khmer UI +- Lao UI +- Microsoft YaHei UI +- Microsoft JhengHei UI +- +- +- +- +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 @@ ++ ++ ++ ++ Set preferable fonts for non-Latin ++ ++ serif ++ ++ Artsounk ++ BPG UTF8 M ++ Kinnari ++ Norasi ++ Frank Ruehl ++ Dror ++ JG LaoTimes ++ Saysettha Unicode ++ Pigiarniq ++ B Davat ++ B Compset ++ Kacst-Qr ++ Urdu Nastaliq Unicode ++ Raghindi ++ Mukti Narrow ++ malayalam ++ Sampige ++ padmaa ++ Hapax Berbère ++ MS Mincho ++ SimSun ++ PMingLiu ++ WenQuanYi Zen Hei ++ WenQuanYi Bitmap Song ++ AR PL ShanHeiSun Uni ++ AR PL New Sung ++ ZYSong18030 ++ HanyiSong ++ Hiragino Mincho ProN ++ Songti SC ++ Songti TC ++ SimSong ++ MgOpen Canonica ++ Sazanami Mincho ++ IPAMonaMincho ++ IPAMincho ++ Kochi Mincho ++ AR PL SungtiL GB ++ AR PL Mingti2L Big5 ++ AR PL Zenkai Uni ++ MS 明朝 ++ ZYSong18030 ++ NanumMyeongjo ++ UnBatang ++ Baekmuk Batang ++ AppleMyungjo ++ KacstQura ++ Frank Ruehl CLM ++ Lohit Bengali ++ Lohit Gujarati ++ Lohit Hindi ++ Lohit Marathi ++ Lohit Maithili ++ Lohit Kashmiri ++ Lohit Konkani ++ Lohit Nepali ++ Lohit Sindhi ++ Lohit Punjabi ++ Lohit Tamil ++ Rachana ++ Lohit Malayalam ++ Lohit Kannada ++ Lohit Telugu ++ Lohit Oriya ++ LKLUG ++ ++ ++ ++ sans-serif ++ ++ Nachlieli ++ Lucida Sans Unicode ++ Yudit Unicode ++ Kerkis ++ ArmNet Helvetica ++ Artsounk ++ BPG UTF8 M ++ Waree ++ Loma ++ Garuda ++ Umpush ++ Saysettha Unicode ++ JG Lao Old Arial ++ GF Zemen Unicode ++ Pigiarniq ++ B Davat ++ B Compset ++ Kacst-Qr ++ Urdu Nastaliq Unicode ++ Raghindi ++ Mukti Narrow ++ malayalam ++ Sampige ++ padmaa ++ Hapax Berbère ++ MS Gothic ++ UmePlus P Gothic ++ Microsoft YaHei ++ Microsoft JhengHei ++ WenQuanYi Zen Hei ++ WenQuanYi Bitmap Song ++ AR PL ShanHeiSun Uni ++ AR PL New Sung ++ Hiragino Sans ++ PingFang SC ++ PingFang TC ++ PingFang HK ++ Hiragino Sans CNS ++ Hiragino Sans GB ++ MgOpen Modata ++ VL Gothic ++ IPAMonaGothic ++ IPAGothic ++ Sazanami Gothic ++ Kochi Gothic ++ AR PL KaitiM GB ++ AR PL KaitiM Big5 ++ AR PL ShanHeiSun Uni ++ AR PL SungtiL GB ++ AR PL Mingti2L Big5 ++ MS ゴシック ++ ZYSong18030 ++ TSCu_Paranar ++ NanumGothic ++ UnDotum ++ Baekmuk Dotum ++ Baekmuk Gulim ++ Apple SD Gothic Neo ++ KacstQura ++ Lohit Bengali ++ Lohit Gujarati ++ Lohit Hindi ++ Lohit Marathi ++ Lohit Maithili ++ Lohit Kashmiri ++ Lohit Konkani ++ Lohit Nepali ++ Lohit Sindhi ++ Lohit Punjabi ++ Lohit Tamil ++ Meera ++ Lohit Malayalam ++ Lohit Kannada ++ Lohit Telugu ++ Lohit Oriya ++ LKLUG ++ ++ ++ ++ monospace ++ ++ Miriam Mono ++ VL Gothic ++ IPAMonaGothic ++ IPAGothic ++ Sazanami Gothic ++ Kochi Gothic ++ AR PL KaitiM GB ++ MS Gothic ++ UmePlus Gothic ++ NSimSun ++ MingLiu ++ AR PL ShanHeiSun Uni ++ AR PL New Sung Mono ++ HanyiSong ++ AR PL SungtiL GB ++ AR PL Mingti2L Big5 ++ ZYSong18030 ++ NanumGothicCoding ++ NanumGothic ++ UnDotum ++ Baekmuk Dotum ++ Baekmuk Gulim ++ TlwgTypo ++ TlwgTypist ++ TlwgTypewriter ++ TlwgMono ++ Hasida ++ GF Zemen Unicode ++ Hapax Berbère ++ Lohit Bengali ++ Lohit Gujarati ++ Lohit Hindi ++ Lohit Marathi ++ Lohit Maithili ++ Lohit Kashmiri ++ Lohit Konkani ++ Lohit Nepali ++ Lohit Sindhi ++ Lohit Punjabi ++ Lohit Tamil ++ Meera ++ Lohit Malayalam ++ Lohit Kannada ++ Lohit Telugu ++ Lohit Oriya ++ LKLUG ++ ++ ++ ++ ++ system-ui ++ ++ Noto Sans Arabic UI ++ Noto Sans Bengali UI ++ Noto Sans Devanagari UI ++ Noto Sans Gujarati UI ++ Noto Sans Gurmukhi UI ++ Noto Sans Kannada UI ++ Noto Sans Khmer UI ++ Noto Sans Lao UI ++ Noto Sans Malayalam UI ++ Noto Sans Myanmar UI ++ Noto Sans Oriya UI ++ Noto Sans Sinhala UI ++ Noto Sans Tamil UI ++ Noto Sans Telugu UI ++ Noto Sans Thai UI ++ Leelawadee UI ++ Nirmala UI ++ Yu Gothic UI ++ Meiryo UI ++ MS UI Gothic ++ Khmer UI ++ Lao UI ++ Microsoft YaHei UI ++ Microsoft JhengHei UI ++ ++ ++ ++ +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 \ diff --git a/fontconfig-remove-uuid.patch b/fontconfig-remove-uuid.patch new file mode 100644 index 0000000..16c0d04 --- /dev/null +++ b/fontconfig-remove-uuid.patch @@ -0,0 +1,67 @@ +From c22908828fb2dbfdf38733d119adc1cf5fe00173 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +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 +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 + diff --git a/fontconfig-required-freetype-version.patch b/fontconfig-required-freetype-version.patch deleted file mode 100644 index 6f7aae3..0000000 --- a/fontconfig-required-freetype-version.patch +++ /dev/null @@ -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) diff --git a/fontconfig-stop-cleanup-uuid.patch b/fontconfig-stop-cleanup-uuid.patch deleted file mode 100644 index 9972cd2..0000000 --- a/fontconfig-stop-cleanup-uuid.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 5f12f564f8748deaa603adb7a4b8f616b6390ad4 Mon Sep 17 00:00:00 2001 -From: Keith Packard -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 ---- - 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 -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 - diff --git a/fontconfig-test-delay.patch b/fontconfig-test-delay.patch deleted file mode 100644 index 2a344cb..0000000 --- a/fontconfig-test-delay.patch +++ /dev/null @@ -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; diff --git a/fontconfig-use-rachana.patch b/fontconfig-use-rachana.patch deleted file mode 100644 index e4fadcc..0000000 --- a/fontconfig-use-rachana.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 13b4ba91353a4ead4623d0133f6eb0283e91b15a Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -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 @@ - Lohit Sindhi - Lohit Punjabi - Lohit Tamil -- Meera -+ Rachana - Lohit Malayalam - Lohit Kannada - Lohit Telugu --- -2.19.1 - diff --git a/fontconfig.spec b/fontconfig.spec index a752b47..f476c0d 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -4,38 +4,44 @@ Summary: Font configuration and customization library Name: fontconfig -Version: 2.13.1 -Release: 4%{?dist} +Version: 2.15.0 +Release: 7%{?dist} # src/ftglue.[ch] is in Public Domain # 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 # otherwise MIT -License: MIT and Public Domain and UCD -Source: http://fontconfig.org/release/%{name}-%{version}.tar.bz2 +License: HPND AND LicenseRef-Fedora-Public-Domain AND Unicode-DFS-2016 +Source: http://fontconfig.org/release/%{name}-%{version}.tar.xz URL: http://fontconfig.org +Source1: 25-no-bitmap-fedora.conf Source2: fc-cache # https://bugzilla.redhat.com/show_bug.cgi?id=140335 Patch0: %{name}-sleep-less.patch -Patch1: %{name}-required-freetype-version.patch -Patch2: %{name}-stop-cleanup-uuid.patch -Patch3: %{name}-use-rachana.patch -Patch4: %{name}-test-delay.patch -Patch5: %{name}-fix-fcvalidate.patch +Patch4: %{name}-drop-lang-from-pkgkit-format.patch +Patch5: %{name}-disable-network-required-test.patch +Patch6: %{name}-lower-nonlatin-conf.patch +Patch7: %{name}-remove-uuid.patch +Patch9: %{name}-fix-SAST.patch -BuildRequires: expat-devel +BuildRequires: libxml2-devel BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: fontpackages-devel -BuildRequires: libuuid-devel -BuildRequires: autoconf automake libtool gettext itstool +BuildRequires: autoconf automake libtool gettext BuildRequires: gperf +BuildRequires: docbook-utils docbook-utils-pdf +BuildRequires: make -Requires: fontpackages-filesystem freetype -Requires(pre): freetype >= 2.9.1 -Requires(post): grep coreutils /sbin/ldconfig -Requires(postun): /sbin/ldconfig +Requires: fonts-filesystem freetype +# Register DTD system-wide to make validation work by default +# (used by fonts-rpm-macros) +Requires(pre): xml-common +Requires(postun): xml-common +PreReq: freetype >= 2.9.1-6 +Requires(post): grep coreutils Requires: font(:lang=en) -Suggests: dejavu-sans-fonts +Suggests: font(notosans) %description Fontconfig is designed to locate fonts within the @@ -44,7 +50,6 @@ applications. %package devel Summary: Font configuration and customization library -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: freetype-devel >= %{freetype_version} Requires: pkgconfig @@ -59,7 +64,6 @@ will use fontconfig. %package devel-doc Summary: Development Documentation files for fontconfig library -Group: Documentation BuildArch: noarch Requires: %{name}-devel = %{version}-%{release} @@ -74,8 +78,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. export HASDOCBOOK=no +for i in doc/*.fncs; do + touch -r $i ${i//.fncs/.sgml} +done autoreconf %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 make %{?_smp_mflags} @@ -85,16 +93,27 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" 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}/ +# 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 # in the right place mv $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 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 %find_lang %{name} @@ -102,11 +121,9 @@ install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fc-cache cat %{name}-conf.lang >> %{name}.lang %check -make check +VERBOSE=1 make check %post -%{?ldconfig: %ldconfig} - umask 0022 mkdir -p /usr/lib/fontconfig/cache @@ -121,16 +138,27 @@ if [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache --version 2>&1 | grep -q %{vers HOME=/root /usr/bin/fc-cache -f fi -%ldconfig_postun - %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 %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 +%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 -%doc README AUTHORS +%doc README.md AUTHORS %doc fontconfig-user.txt fontconfig-user.html %doc %{_fontconfig_confdir}/README %license COPYING @@ -166,18 +194,191 @@ HOME=/root /usr/bin/fc-cache -s %doc fontconfig-devel.txt fontconfig-devel %changelog -* Mon Aug 16 2021 Akira TAGOH - 2.13.1-4 -- Return the error code when fc-validate detects missing glyphs. - Resolves: rhbz#1972037 +* Tue Oct 29 2024 Troy Dawson - 2.15.0-7 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Fri Nov 30 2018 Akira TAGOH - 2.13.1-3 +* Thu Aug 1 2024 Akira TAGOH - 2.15.0-6 +- Fix a memory leak and potentially uninitialized values. + Resolves: RHEL-41007, RHEL-41008 + +* Mon Jun 24 2024 Troy Dawson - 2.15.0-5 +- Bump release for June 2024 mass rebuild + +* Sat Feb 10 2024 Akira TAGOH - 2.15.0-4 +- Delete .uuid with fc-cache -f. + Resolves: rhbz#1761885 + +* Wed Jan 24 2024 Fedora Release Engineering - 2.15.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 22 2023 Akira TAGOH - 2.15.0-1 +- New upstream release. + Resolves: rhbz#2255623 + +* Thu Aug 17 2023 Akira TAGOH - 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 - 2.14.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Akira TAGOH - 2.14.2-3 +- Drop 10-sub-pixel-rgb-for-kde.conf + Resolves: rhbz#2212512 + +* Tue Apr 4 2023 Akira TAGOH - 2.14.2-2 +- Migrated license tag to SPDX. + +* Fri Jan 27 2023 Akira TAGOH - 2.14.2-1 +- New upstream release. + +* Thu Jan 19 2023 Fedora Release Engineering - 2.14.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Nov 26 2022 Akira TAGOH - 2.14.1-2 +- Enable RGB stripes layout for sub-pixel rendering on KDE only. + Resolves: rhbz#2137825 + +* Fri Oct 21 2022 Akira TAGOH - 2.14.1-1 +- New upstream release. + +* Wed Sep 28 2022 Akira TAGOH - 2.14.0-3 +- Remap font paths to other place properly. + +* Thu Jul 21 2022 Fedora Release Engineering - 2.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Mar 31 2022 Akira TAGOH - 2.14.0-1 +- New upstream release. + +* Fri Feb 4 2022 Akira TAGOH - 2.13.96-1 +- New upstream release. +- Fix missing a file in the archive. + Resolves: rhbz#2050478 + +* Tue Feb 1 2022 Akira TAGOH - 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 - 2.13.94-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.13.94-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 20 2021 Akira TAGOH - 2.13.94-2 +- Fix the score calculation on matching for multiple values. +- Enable 11-lcdfilter-default.conf. + Resolves: rhbz#1965684 + +* Tue Jun 29 2021 Akira TAGOH - 2.13.94-1 +- New upstream release. + +* Thu Mar 25 2021 Akira TAGOH - 2.13.93-6 +- Fix postun scriptlet to remove the entry from xml catalog. + +* Tue Jan 26 2021 Fedora Release Engineering - 2.13.93-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Dec 23 2020 Akira TAGOH - 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 - 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 - 2.13.93-2 +- Fix file conflicts. + +* Sat Nov 28 2020 Akira TAGOH - 2.13.93-1 +- New upstream release. + +* Mon Jul 27 2020 Fedora Release Engineering - 2.13.92-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Apr 23 2020 Akira TAGOH - 2.13.92-11 +- deal with system caches as always latest on Silverblue. (#1750891) + +* Thu Apr 02 2020 Akira TAGOH - 2.13.92-10 +- Build against libxml2 instead of expat. + +* Sat Mar 28 2020 Nicolas Mailhot - 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 - 2.13.92-8 +- Fix assertion in FcCacheFini() again. + Resolves: rhbz#1815684 + +* Wed Feb 26 2020 Akira TAGOH - 2.13.92-7 +- Fix assertion in FcCacheFini(). + +* Thu Jan 30 2020 Akira TAGOH - 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 - 2.13.92-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 20 2020 Akira TAGOH - 2.13.92-4 +- Drop font(:lang=...) from %%{=pkgkit} format. + Reference: rhbz#1792463 + +* Wed Aug 28 2019 Akira TAGOH - 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 - 2.13.92-2 +- Fix to affect fonthashint property for score on match. + +* Fri Aug 9 2019 Akira TAGOH - 2.13.92-1 +- New upstream release. + +* Wed Jul 31 2019 Akira TAGOH - 2.13.91-4 +- Fix make check fails. + +* Thu Jul 25 2019 Fedora Release Engineering - 2.13.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 16 2019 Tim Landscheidt - 2.13.91-2 +- Remove calls to ldconfig from scriptlets +- Use "PreReq" instead of "Requires(pre)" for freetype + +* Mon Jun 10 2019 Akira TAGOH - 2.13.91-1 +- New upstream release. + +* Fri Feb 22 2019 Akira TAGOH - 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 - 2.13.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Nov 13 2018 Akira TAGOH - 2.13.1-4 +- Use Rachana instead of Meera for serif subsitution. (#1649184) + +* Wed Nov 07 2018 Akira TAGOH - 2.13.1-3 - 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 - 2.13.1-2 -- Remove 25-no-bitmap-fedora.conf. (#1627023) +* Wed Sep 26 2018 Akira TAGOH - 2.13.1-2 +- Add man page for fc-cache-* links to fc-cache. +- Drop unnecessary BR. * Thu Aug 30 2018 Akira TAGOH - 2.13.1-1 - New upstream release. diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index ea86f9d..0000000 --- a/gating.yaml +++ /dev/null @@ -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} diff --git a/sources b/sources index 61cde62..d6adfdc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fontconfig-2.13.1.tar.bz2) = f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100 +SHA512 (fontconfig-2.15.0.tar.xz) = 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d3fa1ed..0000000 --- a/tests/tests.yml +++ /dev/null @@ -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