- Update to 2.4.0
- Rename/order our configuration stuff to match the new scheme. Breaks
expected :-(
This commit is contained in:
besfahbo
parent
03a037eb68
commit
31433cb147
@ -1 +1 @@
|
||||
fontconfig-2.3.97.tar.gz
|
||||
fontconfig-2.4.0.tar.gz
|
||||
|
||||
243
25-no-hint-fedora.conf
Normal file
243
25-no-hint-fedora.conf
Normal file
@ -0,0 +1,243 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
|
||||
<fontconfig>
|
||||
|
||||
<!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
|
||||
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Kochi Mincho</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
<edit name="embeddedbitmap" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Kochi Gothic</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
<edit name="embeddedbitmap" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Sazanami Mincho</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
<edit name="embeddedbitmap" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Sazanami Gothic</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
<edit name="embeddedbitmap" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Baekmuk Batang</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Baekmuk Dotum</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Baekmuk Gulim</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Baekmuk Headline</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>AR PL Mingti2L Big5</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>AR PL ShanHeiSun Uni</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
<edit name="embeddedbitmap" mode="assign">
|
||||
<bool>true</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>AR PL KaitiM Big5</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>AR PL ZenKai Uni</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>AR PL SungtiL GB</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>AR PL KaitiM GB</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>ZYSong18030</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!--
|
||||
We also need to turn off hinting for Indic fonts with a joined baseline.
|
||||
-->
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Mukti Narrow</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Lohit Hindi</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Lohit Bengali</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Lohit Punjabi</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!--
|
||||
Gujarti fonts are distorted when hinting is enabled. Turn it off.
|
||||
-->
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Lohit Gujarati</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!--
|
||||
Disabling hinting for newly added Indic fonts (kn/or/ml/te)
|
||||
-->
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Lohit Kannada</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Lohit Oriya</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Lohit Malayalam</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>Lohit Telugu</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!--
|
||||
And Sinhala
|
||||
-->
|
||||
<match target="font">
|
||||
<test name="family" compare="eq">
|
||||
<string>LKLUG</string>
|
||||
</test>
|
||||
<edit name="hinting" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
</fontconfig>
|
||||
44
30-aliases-fedora.conf
Normal file
44
30-aliases-fedora.conf
Normal file
@ -0,0 +1,44 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
<!-- conf.d/sub-pixel.conf -->
|
||||
<fontconfig>
|
||||
<alias>
|
||||
<family>Courier</family>
|
||||
<accept>
|
||||
<family>Courier New</family>
|
||||
</accept>
|
||||
</alias>
|
||||
<alias>
|
||||
<family>Helvetica</family>
|
||||
<accept>
|
||||
<family>Arial</family>
|
||||
</accept>
|
||||
</alias>
|
||||
<alias>
|
||||
<family>Times</family>
|
||||
<accept>
|
||||
<family>Times New Roman</family>
|
||||
</accept>
|
||||
</alias>
|
||||
<alias>
|
||||
<family>Thorndale</family>
|
||||
<accept>
|
||||
<family>Thorndale AMT</family>
|
||||
<family>Times New Roman</family>
|
||||
</accept>
|
||||
</alias>
|
||||
<alias>
|
||||
<family>Albany</family>
|
||||
<accept>
|
||||
<family>Albany AMT</family>
|
||||
<family>Arial</family>
|
||||
</accept>
|
||||
</alias>
|
||||
<alias>
|
||||
<family>Cumberland</family>
|
||||
<accept>
|
||||
<family>Cumberland AMT</family>
|
||||
<family>Courier New</family>
|
||||
</accept>
|
||||
</alias>
|
||||
</fontconfig>
|
||||
35
40-generic-fedora.conf
Normal file
35
40-generic-fedora.conf
Normal file
@ -0,0 +1,35 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
<fontconfig>
|
||||
<!--
|
||||
Mark families with their generics so we'll get
|
||||
something reasonable
|
||||
-->
|
||||
|
||||
<!--
|
||||
Serif faces
|
||||
-->
|
||||
<alias>
|
||||
<family>Sazanami Mincho</family>
|
||||
<family>AR PL ZenKai Uni</family>
|
||||
<family>ZYSong18030</family>
|
||||
<default><family>serif</family></default>
|
||||
</alias>
|
||||
<!--
|
||||
Sans-serif faces
|
||||
-->
|
||||
<alias>
|
||||
<family>Sazanami Gothic</family>
|
||||
<family>AR PL ShanHeiSun Uni</family>
|
||||
<family>ZYSong18030</family>
|
||||
<default><family>sans-serif</family></default>
|
||||
</alias>
|
||||
<!--
|
||||
Monospace faces
|
||||
-->
|
||||
<alias>
|
||||
<family>Cumberland</family>
|
||||
<family>ZYSong18030</family>
|
||||
<default><family>monospace</family></default>
|
||||
</alias>
|
||||
</fontconfig>
|
||||
67
64-nonlatin-fedora.conf
Normal file
67
64-nonlatin-fedora.conf
Normal file
@ -0,0 +1,67 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
<fontconfig>
|
||||
<alias>
|
||||
<family>serif</family>
|
||||
<prefer>
|
||||
<family>KacstQura</family>
|
||||
<family>Frank Ruehl CLM</family>
|
||||
<family>Lohit Bengali</family>
|
||||
<family>Lohit Gujarati</family>
|
||||
<family>Lohit Hindi</family>
|
||||
<family>Lohit Punjabi</family>
|
||||
<family>Lohit Tamil</family>
|
||||
<family>Lohit Malayalam</family>
|
||||
<family>Lohit Kannada</family>
|
||||
<family>Lohit Telugu</family>
|
||||
<family>Lohit Oriya</family>
|
||||
<family>LKLUG</family>
|
||||
<family>Sazanami Mincho</family>
|
||||
<family>AR PL Zenkai Uni</family>
|
||||
<family>ZYSong18030</family>
|
||||
</prefer>
|
||||
</alias>
|
||||
<alias>
|
||||
<family>sans-serif</family>
|
||||
<prefer>
|
||||
<family>KacstQura</family>
|
||||
<family>Lohit Bengali</family>
|
||||
<family>Lohit Gujarati</family>
|
||||
<family>Lohit Hindi</family>
|
||||
<family>Lohit Punjabi</family>
|
||||
<family>Lohit Tamil</family>
|
||||
<family>Lohit Malayalam</family>
|
||||
<family>Lohit Kannada</family>
|
||||
<family>Lohit Telugu</family>
|
||||
<family>Lohit Oriya</family>
|
||||
<family>LKLUG</family>
|
||||
<family>Sazanami Gothic</family>
|
||||
<family>AR PL ShanHeiSun Uni</family>
|
||||
<family>AR PL SungtiL GB</family>
|
||||
<family>AR PL Mingti2L Big5</family>
|
||||
<family>ZYSong18030</family>
|
||||
<family>Baekmuk Gulim</family>
|
||||
</prefer>
|
||||
</alias>
|
||||
<alias>
|
||||
<family>monospace</family>
|
||||
<prefer>
|
||||
<family>Lohit Bengali</family>
|
||||
<family>Lohit Gujarati</family>
|
||||
<family>Lohit Hindi</family>
|
||||
<family>Lohit Punjabi</family>
|
||||
<family>Lohit Tamil</family>
|
||||
<family>Lohit Malayalam</family>
|
||||
<family>Lohit Kannada</family>
|
||||
<family>Lohit Telugu</family>
|
||||
<family>Lohit Oriya</family>
|
||||
<family>LKLUG</family>
|
||||
<family>Sazanami Gothic</family>
|
||||
<family>AR PL ShanHeiSun Uni</family>
|
||||
<family>AR PL SungtiL GB</family>
|
||||
<family>AR PL Mingti2L Big5</family>
|
||||
<family>ZYSong18030</family>
|
||||
<family>Baekmuk Gulim</family>
|
||||
</prefer>
|
||||
</alias>
|
||||
</fontconfig>
|
||||
54
75-blacklist-fedora.conf
Normal file
54
75-blacklist-fedora.conf
Normal file
@ -0,0 +1,54 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
|
||||
<!-- Blacklist certain fonts that freetype can't handle -->
|
||||
|
||||
<fontconfig>
|
||||
<selectfont>
|
||||
<rejectfont>
|
||||
<pattern>
|
||||
<patelt name="family"><string>Hershey-Gothic-English</string></patelt>
|
||||
</pattern>
|
||||
</rejectfont>
|
||||
<rejectfont>
|
||||
<pattern>
|
||||
<patelt name="family"><string>Hershey-Plain-Duplex-Italic</string></patelt>
|
||||
</pattern>
|
||||
</rejectfont>
|
||||
<rejectfont>
|
||||
<pattern>
|
||||
<patelt name="family"><string>Hershey-Plain-Duplex</string></patelt>
|
||||
</pattern>
|
||||
</rejectfont>
|
||||
<rejectfont>
|
||||
<pattern>
|
||||
<patelt name="family"><string>Hershey-Script-Simplex</string></patelt>
|
||||
</pattern>
|
||||
</rejectfont>
|
||||
<rejectfont>
|
||||
<pattern>
|
||||
<patelt name="family"><string>Hershey-Plain-Triplex</string></patelt>
|
||||
</pattern>
|
||||
</rejectfont>
|
||||
<rejectfont>
|
||||
<pattern>
|
||||
<patelt name="family"><string>Hershey-Plain-Triplex-Italic</string></patelt>
|
||||
</pattern>
|
||||
</rejectfont>
|
||||
<rejectfont>
|
||||
<pattern>
|
||||
<patelt name="family"><string>Hershey-Script-Complex</string></patelt>
|
||||
</pattern>
|
||||
</rejectfont>
|
||||
<rejectfont>
|
||||
<pattern>
|
||||
<patelt name="family"><string>Hershey-Gothic-Italian</string></patelt>
|
||||
</pattern>
|
||||
</rejectfont>
|
||||
<rejectfont>
|
||||
<pattern>
|
||||
<patelt name="family"><string>Hershey-Gothic-German</string></patelt>
|
||||
</pattern>
|
||||
</rejectfont>
|
||||
</selectfont>
|
||||
</fontconfig>
|
||||
@ -2,19 +2,21 @@
|
||||
|
||||
Summary: Font configuration and customization library
|
||||
Name: fontconfig
|
||||
Version: 2.3.97
|
||||
Release: 3%{?dist}
|
||||
Version: 2.4.0
|
||||
Release: 1%{?dist}
|
||||
License: MIT
|
||||
Group: System Environment/Libraries
|
||||
Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
|
||||
URL: http://fontconfig.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
Source1: 40-blacklist-fonts.conf
|
||||
Source2: 50-no-hint-fonts.conf
|
||||
Source1: 25-no-hint-fedora.conf
|
||||
Source2: 30-aliases-fedora.conf
|
||||
Source3: 40-generic-fedora.conf
|
||||
Source4: 64-nonlatin-fedora.conf
|
||||
Source5: 75-blacklist-fedora.conf
|
||||
|
||||
Patch1: fontconfig-2.3.97-defaultconfig.patch
|
||||
# ppc64 architecture signature
|
||||
Patch2: fontconfig-2.3.97-ppc64.patch
|
||||
Patch3: fontconfig-2.4-cmap-parsing.patch
|
||||
|
||||
BuildRequires: freetype-devel >= %{freetype_version}
|
||||
BuildRequires: expat-devel
|
||||
@ -50,9 +52,7 @@ will use fontconfig.
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch1 -p1 -b .defaultconfig
|
||||
%patch2 -p1 -b .ppc64
|
||||
%patch3 -p1 -b .cmap-parsing
|
||||
|
||||
%build
|
||||
%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
|
||||
@ -74,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
|
||||
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
|
||||
install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
|
||||
install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
|
||||
install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
|
||||
|
||||
# move installed doc files back to build directory to package themm
|
||||
# in the right place
|
||||
@ -97,14 +100,16 @@ rm -rf $RPM_BUILD_ROOT
|
||||
umask 0022
|
||||
|
||||
mkdir -p %{_localstatedir}/cache/fontconfig
|
||||
# Remove stale caches
|
||||
rm -f %{_localstatedir}/cache/fontconfig/????????????????????????????????.cache-2
|
||||
rm -f %{_localstatedir}/cache/fontconfig/stamp
|
||||
|
||||
# Force regeneration of all fontconfig cache files
|
||||
# The check for existance is needed on dual-arch installs (the second
|
||||
# copy of fontconfig might install the binary instead of the first)
|
||||
# The redirect is because fc-cache is giving warnings about ~/fonts.cache-1
|
||||
# The HOME setting is to avoid problems if HOME hasn't been reset
|
||||
if [ -x /usr/bin/fc-cache ] ; then
|
||||
HOME=/root /usr/bin/fc-cache -f 2>/dev/null
|
||||
HOME=/root /usr/bin/fc-cache -f
|
||||
fi
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
@ -119,10 +124,13 @@ fi
|
||||
%{_bindir}/fc-match
|
||||
%{_bindir}/fc-cat
|
||||
%dir %{_sysconfdir}/fonts
|
||||
%dir %{_sysconfdir}/fonts/conf.avail
|
||||
%dir %{_sysconfdir}/fonts/conf.d
|
||||
%dir %{_datadir}/fonts
|
||||
%{_sysconfdir}/fonts/fonts.dtd
|
||||
%config %{_sysconfdir}/fonts/fonts.conf
|
||||
%doc %{_sysconfdir}/fonts/conf.avail/README
|
||||
%config %{_sysconfdir}/fonts/conf.avail/*.conf
|
||||
%config %{_sysconfdir}/fonts/conf.d/*.conf
|
||||
%dir %{_localstatedir}/cache/fontconfig
|
||||
|
||||
@ -138,6 +146,11 @@ fi
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Mon Sep 11 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.0-1
|
||||
- Update to 2.4.0
|
||||
- Rename/order our configuration stuff to match the new scheme.
|
||||
Breaks expected :-(
|
||||
|
||||
* Thu Sep 07 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.3.97-3
|
||||
- Add missing file. Previous update didn't go through
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user