rpms/fontconfig
6
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream release.

Browse Source 
Resolves: rhbz#2255623
This commit is contained in:
Akira TAGOH 2023-12-22 23:12:42 +09:00
parent 1b1dff0137
commit d72678cc75
4 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -39,3 +39,4 @@ fontconfig-2.8.0.tar.gz
/fontconfig-2.14.0.tar.xz /fontconfig-2.14.0.tar.xz
/fontconfig-2.14.1.tar.xz /fontconfig-2.14.1.tar.xz
/fontconfig-2.14.2.tar.xz /fontconfig-2.14.2.tar.xz
/fontconfig-2.15.0.tar.xz

48
fontconfig-lower-nonlatin-conf.patch
View File

@ -1,7 +1,7 @@
diff -pruN fontconfig-2.14.2.orig/conf.d/65-nonlatin.conf fontconfig-2.14.2/conf.d/65-nonlatin.conf diff -pruN fontconfig-2.15.0.orig/conf.d/65-nonlatin.conf fontconfig-2.15.0/conf.d/65-nonlatin.conf
--- fontconfig-2.14.2.orig/conf.d/65-nonlatin.conf 2020-12-03 20:45:00.000000000 +0900 --- fontconfig-2.15.0.orig/conf.d/65-nonlatin.conf 2023-03-22 20:36:46.000000000 +0900
+++ fontconfig-2.14.2/conf.d/65-nonlatin.conf 1970-01-01 09:00:00.000000000 +0900 +++ fontconfig-2.15.0/conf.d/65-nonlatin.conf 1970-01-01 09:00:00.000000000 +0900
@@ -1,228 +0,0 @@ @@ -1,240 +0,0 @@
-<?xml version="1.0"?> -<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> -<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-<fontconfig> -<fontconfig>
@ -37,6 +37,10 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/65-nonlatin.conf fontconfig-2.14.2/conf
- <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) --> - <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
- <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) --> - <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
- <family>HanyiSong</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>MgOpen Canonica</family>
- <family>Sazanami Mincho</family> - <family>Sazanami Mincho</family>
- <family>IPAMonaMincho</family> - <family>IPAMonaMincho</family>
@ -50,6 +54,7 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/65-nonlatin.conf fontconfig-2.14.2/conf
- <family>NanumMyeongjo</family> <!-- hangul (ko) --> - <family>NanumMyeongjo</family> <!-- hangul (ko) -->
- <family>UnBatang</family> <!-- hangul (ko) --> - <family>UnBatang</family> <!-- hangul (ko) -->
- <family>Baekmuk Batang</family> <!-- hangul (ko) --> - <family>Baekmuk Batang</family> <!-- hangul (ko) -->
- <family>AppleMyungjo</family> <!-- hangul (ko) - macOS -->
- <family>KacstQura</family> - <family>KacstQura</family>
- <family>Frank Ruehl CLM</family> - <family>Frank Ruehl CLM</family>
- <family>Lohit Bengali</family> - <family>Lohit Bengali</family>
@ -107,6 +112,12 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/65-nonlatin.conf fontconfig-2.14.2/conf
- <family>WenQuanYi Bitmap Song</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 ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
- <family>AR PL New Sung</family> <!-- han (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>MgOpen Modata</family>
- <family>VL Gothic</family> - <family>VL Gothic</family>
- <family>IPAMonaGothic</family> - <family>IPAMonaGothic</family>
@ -125,6 +136,7 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/65-nonlatin.conf fontconfig-2.14.2/conf
- <family>UnDotum</family> <!-- hangul (ko) --> - <family>UnDotum</family> <!-- hangul (ko) -->
- <family>Baekmuk Dotum</family> <!-- hangul (ko) --> - <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
- <family>Baekmuk Gulim</family> <!-- hangul (ko) --> - <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
- <family>Apple SD Gothic Neo</family> <!-- hangul (ko) - macOS -->
- <family>KacstQura</family> - <family>KacstQura</family>
- <family>Lohit Bengali</family> - <family>Lohit Bengali</family>
- <family>Lohit Gujarati</family> - <family>Lohit Gujarati</family>
@ -230,10 +242,10 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/65-nonlatin.conf fontconfig-2.14.2/conf
- </alias> - </alias>
- -
-</fontconfig> -</fontconfig>
diff -pruN fontconfig-2.14.2.orig/conf.d/69-nonlatin.conf fontconfig-2.14.2/conf.d/69-nonlatin.conf diff -pruN fontconfig-2.15.0.orig/conf.d/69-nonlatin.conf fontconfig-2.15.0/conf.d/69-nonlatin.conf
--- fontconfig-2.14.2.orig/conf.d/69-nonlatin.conf 1970-01-01 09:00:00.000000000 +0900 --- fontconfig-2.15.0.orig/conf.d/69-nonlatin.conf 1970-01-01 09:00:00.000000000 +0900
+++ fontconfig-2.14.2/conf.d/69-nonlatin.conf 2020-12-03 20:45:00.000000000 +0900 +++ fontconfig-2.15.0/conf.d/69-nonlatin.conf 2023-03-22 20:36:46.000000000 +0900
@@ -0,0 +1,228 @@ @@ -0,0 +1,240 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> +<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig> +<fontconfig>
@ -269,6 +281,10 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/69-nonlatin.conf fontconfig-2.14.2/conf
+ <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) --> + <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+ <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) --> + <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+ <family>HanyiSong</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>MgOpen Canonica</family>
+ <family>Sazanami Mincho</family> + <family>Sazanami Mincho</family>
+ <family>IPAMonaMincho</family> + <family>IPAMonaMincho</family>
@ -282,6 +298,7 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/69-nonlatin.conf fontconfig-2.14.2/conf
+ <family>NanumMyeongjo</family> <!-- hangul (ko) --> + <family>NanumMyeongjo</family> <!-- hangul (ko) -->
+ <family>UnBatang</family> <!-- hangul (ko) --> + <family>UnBatang</family> <!-- hangul (ko) -->
+ <family>Baekmuk Batang</family> <!-- hangul (ko) --> + <family>Baekmuk Batang</family> <!-- hangul (ko) -->
+ <family>AppleMyungjo</family> <!-- hangul (ko) - macOS -->
+ <family>KacstQura</family> + <family>KacstQura</family>
+ <family>Frank Ruehl CLM</family> + <family>Frank Ruehl CLM</family>
+ <family>Lohit Bengali</family> + <family>Lohit Bengali</family>
@ -339,6 +356,12 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/69-nonlatin.conf fontconfig-2.14.2/conf
+ <family>WenQuanYi Bitmap Song</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 ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
+ <family>AR PL New Sung</family> <!-- han (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>MgOpen Modata</family>
+ <family>VL Gothic</family> + <family>VL Gothic</family>
+ <family>IPAMonaGothic</family> + <family>IPAMonaGothic</family>
@ -357,6 +380,7 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/69-nonlatin.conf fontconfig-2.14.2/conf
+ <family>UnDotum</family> <!-- hangul (ko) --> + <family>UnDotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Dotum</family> <!-- hangul (ko) --> + <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Gulim</family> <!-- hangul (ko) --> + <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+ <family>Apple SD Gothic Neo</family> <!-- hangul (ko) - macOS -->
+ <family>KacstQura</family> + <family>KacstQura</family>
+ <family>Lohit Bengali</family> + <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family> + <family>Lohit Gujarati</family>
@ -462,9 +486,9 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/69-nonlatin.conf fontconfig-2.14.2/conf
+ </alias> + </alias>
+ +
+</fontconfig> +</fontconfig>
diff -pruN fontconfig-2.14.2.orig/conf.d/Makefile.am fontconfig-2.14.2/conf.d/Makefile.am diff -pruN fontconfig-2.15.0.orig/conf.d/Makefile.am fontconfig-2.15.0/conf.d/Makefile.am
--- fontconfig-2.14.2.orig/conf.d/Makefile.am 2022-11-28 18:17:51.000000000 +0900 --- fontconfig-2.15.0.orig/conf.d/Makefile.am 2023-08-24 14:14:15.000000000 +0900
+++ fontconfig-2.14.2/conf.d/Makefile.am 2023-08-17 16:56:24.358848001 +0900 +++ fontconfig-2.15.0/conf.d/Makefile.am 2023-12-22 23:08:05.514969924 +0900
@@ -47,7 +47,7 @@ CONF_LINKS = \ @@ -47,7 +47,7 @@ CONF_LINKS = \
60-generic.conf \ 60-generic.conf \
60-latin.conf \ 60-latin.conf \
@ -474,7 +498,7 @@ diff -pruN fontconfig-2.14.2.orig/conf.d/Makefile.am fontconfig-2.14.2/conf.d/Ma
69-unifont.conf \ 69-unifont.conf \
80-delicious.conf \ 80-delicious.conf \
90-synthetic.conf 90-synthetic.conf
@@ -94,7 +94,7 @@ template_DATA = \ @@ -95,7 +95,7 @@ template_DATA = \
60-latin.conf \ 60-latin.conf \
65-fonts-persian.conf \ 65-fonts-persian.conf \
65-khmer.conf \ 65-khmer.conf \

10
fontconfig.spec
View File

@ -4,8 +4,8 @@
Summary: Font configuration and customization library Summary: Font configuration and customization library
Name: fontconfig Name: fontconfig
Version: 2.14.2 Version: 2.15.0
Release: 5%{?dist} Release: 1%{?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 ## https://gitlab.com/fedora/legal/fedora-license-data/-/issues/177
@ -156,7 +156,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
@ -192,6 +192,10 @@ fi
%doc fontconfig-devel.txt fontconfig-devel %doc fontconfig-devel.txt fontconfig-devel
%changelog %changelog
* 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 * Thu Aug 17 2023 Akira TAGOH <tagoh@redhat.com> - 2.14.2-5
- Update 65-nonlatin.conf to 69-nonlatin.conf - Update 65-nonlatin.conf to 69-nonlatin.conf
This basically provides substitutes for certain languages and is helpful This basically provides substitutes for certain languages and is helpful

1
sources
View File

@ -1 +1,2 @@
SHA512 (fontconfig-2.14.2.tar.xz) = 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085 SHA512 (fontconfig-2.14.2.tar.xz) = 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
SHA512 (fontconfig-2.15.0.tar.xz) = 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417