Drop the font unification which causes a lot of problems.

Resolves: rhbz#2186711, rhbz#2144373, rhbz#2096153, rhbz#517789
This commit is contained in:
Akira TAGOH 2023-05-10 15:54:00 +09:00
parent f697828cd7
commit 523652f88f
18 changed files with 276 additions and 132 deletions

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>monospace</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Mono</string>
</edit>
</match>
<alias>
<family>Droid Sans Mono</family>
<default>
<family>monospace</family>
</default>
</alias>
</fontconfig>

View File

@ -1,13 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- SPDX-License-Identifier: MIT -->
<fontconfig>
<group>
<target>Droid Sans Mono</target>
<like>
<family>Noto Sans Mono</family>
<family>monospace</family>
</like>
</group>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans</string>
</edit>
</match>
<alias>
<family>Droid Sans</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -1,82 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- SPDX-License-Identifier: MIT -->
<fontconfig>
<group>
<target>Droid Sans</target>
<match>
<family>Droid Sans Hebrew</family>
<good-lang>he</good-lang>
<good-lang>yi</good-lang>
</match>
<match>
<family>Droid Sans Armenian</family>
<good-lang>hy</good-lang>
</match>
<match>
<family>Droid Sans Georgian</family>
<good-lang>ka</good-lang>
</match>
<match>
<family>Droid Sans Ethiopic</family>
<good-lang>am</good-lang>
<good-lang>byn</good-lang>
<good-lang>gez</good-lang>
<good-lang>sid</good-lang>
<good-lang>ti-er</good-lang>
<good-lang>ti-et</good-lang>
<good-lang>tig</good-lang>
<good-lang>wal</good-lang>
</match>
<match>
<family>Droid Sans Devanagari</family>
<good-lang>bh</good-lang>
<good-lang>bho</good-lang>
<good-lang>brx</good-lang>
<good-lang>doi</good-lang>
<good-lang>hi</good-lang>
<good-lang>hne</good-lang>
<good-lang>kok</good-lang>
<good-lang>mai</good-lang>
<good-lang>mr</good-lang>
<good-lang>ne</good-lang>
<good-lang>sa</good-lang>
<good-lang>sat</good-lang>
</match>
<match>
<family>Droid Sans Tamil</family>
<good-lang>ta</good-lang>
</match>
<match>
<family>Droid Sans Thai</family>
<good-lang>th</good-lang>
</match>
<match>
<family>Droid Arabic Kufi</family>
<good-lang>ar</good-lang>
<good-lang>az-ir</good-lang>
<good-lang>fa</good-lang>
<good-lang>ku-iq</good-lang>
<good-lang>ku-ir</good-lang>
<good-lang>lah</good-lang>
<good-lang>ota</good-lang>
<good-lang>pa-pk</good-lang>
<good-lang>ps-af</good-lang>
<good-lang>ps-pk</good-lang>
<good-lang>sd</good-lang>
<good-lang>ug</good-lang>
<good-lang>ur</good-lang>
</match>
<match>
<family>Droid Sans Japanese</family>
<good-lang>ja</good-lang>
</match>
<family>Droid Sans Fallback</family>
<like>
<family>Droid Sans Arabic</family>
<family>Open Sans</family>
<family>sans-serif</family>
</like>
</group>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Serif</string>
</edit>
</match>
<alias>
<family>Droid Serif</family>
<default>
<family>serif</family>
</default>
</alias>
</fontconfig>

View File

@ -1,30 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- SPDX-License-Identifier: MIT -->
<fontconfig>
<group>
<target>Droid Serif</target>
<match>
<family>Droid Arabic Naskh</family>
<good-lang>ar</good-lang>
<good-lang>az-ir</good-lang>
<good-lang>fa</good-lang>
<good-lang>ku-iq</good-lang>
<good-lang>ku-ir</good-lang>
<good-lang>lah</good-lang>
<good-lang>ota</good-lang>
<good-lang>pa-pk</good-lang>
<good-lang>ps-af</good-lang>
<good-lang>ps-pk</good-lang>
<good-lang>sd</good-lang>
<good-lang>ug</good-lang>
<good-lang>ur</good-lang>
</match>
<like>
<family>Noto Serif</family>
<family>Droid Naskh Shift Alt</family>
<family>serif</family>
</like>
</group>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Arabic Kufi</string>
</edit>
</match>
<alias>
<family>Droid Arabic Kufi</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Arabic Naskh</string>
</edit>
</match>
<alias>
<family>Droid Arabic Naskh</family>
<default>
<family>serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Armenian</string>
</edit>
</match>
<alias>
<family>Droid Sans Armenian</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Devanagari</string>
</edit>
</match>
<alias>
<family>Droid Sans Devanagari</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Ethiopic</string>
</edit>
</match>
<alias>
<family>Droid Sans Ethiopic</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Fallback</string>
</edit>
</match>
<alias>
<family>Droid Sans Fallback</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Georgian</string>
</edit>
</match>
<alias>
<family>Droid Sans Georgian</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Hebrew</string>
</edit>
</match>
<alias>
<family>Droid Sans Hebrew</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Japanese</string>
</edit>
</match>
<alias>
<family>Droid Sans Japanese</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Tamil</string>
</edit>
</match>
<alias>
<family>Droid Sans Tamil</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<match>
<test name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Droid Sans Thai</string>
</edit>
</match>
<alias>
<family>Droid Sans Thai</family>
<default>
<family>sans-serif</family>
</default>
</alias>
</fontconfig>

View File

@ -3,7 +3,7 @@ BuildArch: noarch
# No sane versionning upstream, use git clone timestamp
Version: 20200215
Release: 14%{?dist}
Release: 15%{?dist}
License: ASL 2.0
URL: https://android.googlesource.com/
@ -31,7 +31,7 @@ Suggests: font(notosans)
}
%global fonts1 DroidSans*ttf DroidKufi*ttf
%global fontsex1 DroidSansMono*ttf DroidSansFallback.ttf DroidSansHebrew.ttf
%global fontconfngs1 %{SOURCE11}
%global fontconfs1 %{SOURCE11} %{SOURCE14} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
%global fontdescription1 %{expand:
%{common_description}
@ -47,7 +47,7 @@ finalize the font family.}
Suggests: font(notosansmono)
}
%global fonts2 DroidSansMono*ttf
%global fontconfngs2 %{SOURCE12}
%global fontconfs2 %{SOURCE12}
%global fontdescription2 %{expand:
%{common_description}
@ -61,7 +61,7 @@ Suggests: font(notoserif)
}
%global fonts3 DroidSerif*ttf DroidNaskh*ttf
%global fontsex3 DroidNaskhUI-Regular.ttf DroidNaskh-Regular-Shift.ttf
%global fontconfngs3 %{SOURCE13}
%global fontconfs3 %{SOURCE13} %{SOURCE15}
%global fontdescription3 %{expand:
%{common_description}
@ -75,15 +75,28 @@ The Arabic block was designed by Pascal Zoghbi of 29ArabicLetters under the
Droid Naskh name.}
%global archivename google-droid-fonts-%{version}
%global googledroid google-droid
%global googledroidsans %{googledroid}-sans
Source0: %{archivename}.tar.xz
# Brutal script used to pull sources from upstream git
# Needs at least 2 Gib of space in /var/tmp
Source1: getdroid.sh
Source11: 66-%{fontpkgname1}.xml
Source12: 60-%{fontpkgname2}.xml
Source13: 66-%{fontpkgname3}.xml
Source11: 66-%{fontpkgname1}.conf
Source12: 60-%{fontpkgname2}.conf
Source13: 66-%{fontpkgname3}.conf
Source14: 69-%{googledroid}-arabic-kufi-fonts.conf
Source15: 69-%{googledroid}-arabic-naskh-fonts.conf
Source16: 69-%{googledroidsans}-armenian-fonts.conf
Source17: 69-%{googledroidsans}-devanagari-fonts.conf
Source18: 69-%{googledroidsans}-ethiopic-fonts.conf
Source19: 69-%{googledroidsans}-georgian-fonts.conf
Source20: 69-%{googledroidsans}-hebrew-fonts.conf
Source21: 69-%{googledroidsans}-japanese-fonts.conf
Source22: 69-%{googledroidsans}-tamil-fonts.conf
Source23: 69-%{googledroidsans}-thai-fonts.conf
Source24: 69-%{googledroidsans}-fallback-fonts.conf
Name: google-droid-fonts
Summary: A set of general-purpose font families released by Google as part of Android
@ -109,6 +122,10 @@ Summary: A set of general-purpose font families released by Google as part of A
%fontfiles -a
%changelog
* Wed May 10 2023 Akira TAGOH <tagoh@redhat.com> - 20200215-15
- Drop the font unification which causes a lot of problems.
Resolves: rhbz#2186711, rhbz#2144373, rhbz#2096153, rhbz#517789
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20200215-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild