pool/fontconfig
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 136212 from M17N

Browse Source 
- turn off autohinter for Verdana again, which implies using BCI
  with hintstyle=3 [bnc#737215], [bnc#781631]

- updated to 2.10.0:
  * /etc/fonts/conf.avail is deprecated and is packaged only
    for compatibility reasons; package should install its *.conf 
    files in its data dir and link it into /etc/fonts/conf.d as 
    usual
  * introduced warning -- <alias> should not contain more <family>s 
  * introduced warning -- <test> should not contain more values
  * introduced warning -- reading configurations from ~/.fonts.conf 
    is deprecated; move ~/.fonts.conf into $XDG_CONFIG_HOME/fontconfig/fonts.conf
    (the same for ~/.fonts.conf.d, see 
     http://freedesktop.org/software/fontconfig/fontconfig-user.html)

OBS-URL: https://build.opensuse.org/request/show/136212
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=60
This commit is contained in:
Stephan Kulow 2012-10-03 05:13:09 +00:00 committed by Git OBS Bridge
commit 37ecee8e00
15 changed files with 886 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

419
11-suse-hinting.conf
View File

@ -106,92 +106,305 @@
--> -->
<match target="font"> <match target="font">
<test name="fontformat"> <test name="family"><string>MS Gothic</string></test>
<string>TrueType</string> <edit name="autohint"><bool>true</bool></edit>
</test> </match>
<test name="family"> <match target="font">
<string>Verdana</string> <test name="family"><string>MS PGothic</string></test>
<string>MS Gothic</string> <edit name="autohint"><bool>true</bool></edit>
<string>MS PGothic</string> </match>
<string>MS UI Gothic</string> <match target="font">
<string>MS Mincho</string> <test name="family"><string>MS UI Gothic</string></test>
<string>MS PMincho</string> <edit name="autohint"><bool>true</bool></edit>
<string>HGPSoeiKakupoptai</string> </match>
<string>HGSGothicE</string> <match target="font">
<string>HGSGothicM</string> <test name="family"><string>MS Mincho</string></test>
<string>HGKyokashotai</string> <edit name="autohint"><bool>true</bool></edit>
<string>HGSSoeiKakugothicUB</string> </match>
<string>HGPGothicB</string> <match target="font">
<string>HGPGothicE</string> <test name="family"><string>MS PMincho</string></test>
<string>HGPGothicM</string> <edit name="autohint"><bool>true</bool></edit>
<string>HGSKyokashotai</string> </match>
<string>HGMaruGothicMPRO</string> <match target="font">
<string>HGPSoeiKakugothicUB</string> <test name="family"><string>HGPSoeiKakupoptai</string></test>
<string>HGMinchoL</string> <edit name="autohint"><bool>true</bool></edit>
<string>HGPMinchoL</string> </match>
<string>HGMinchoB</string> <match target="font">
<string>HGPMinchoB</string> <test name="family"><string>HGSGothicE</string></test>
<string>HGSMinchoB</string> <edit name="autohint"><bool>true</bool></edit>
<string>HGMinchoE</string> </match>
<string>HGPMinchoE</string> <match target="font">
<string>HGSMinchoE</string> <test name="family"><string>HGSGothicM</string></test>
<string>HGSoeiKakugothicUB</string> <edit name="autohint"><bool>true</bool></edit>
<string>HGGyoshotai</string> </match>
<string>HGPGyoshotai</string> <match target="font">
<string>HGSGyoshotai</string> <test name="family"><string>HGKyokashotai</string></test>
<string>HGSoeiKakupoptai</string> <edit name="autohint"><bool>true</bool></edit>
<string>HGSSoeiPresenceEB</string> </match>
<string>HGPSoeiPresenceEB</string> <match target="font">
<string>HGGothicB</string> <test name="family"><string>HGSSoeiKakugothicUB</string></test>
<string>HGGothicE</string> <edit name="autohint"><bool>true</bool></edit>
<string>HGGothicM</string> </match>
<string>HGSoeiPresenceEB</string> <match target="font">
<string>HGPKyokashotai</string> <test name="family"><string>HGPGothicB</string></test>
<string>HGSSoeiKakupoptai</string> <edit name="autohint"><bool>true</bool></edit>
<string>HGSeikaishotaiPRO</string> </match>
<string>TLKyokashotai</string> <match target="font">
<string>TLMincho</string> <test name="family"><string>HGPGothicE</string></test>
<string>TLPMincho</string> <edit name="autohint"><bool>true</bool></edit>
<string>TLPGothic</string> </match>
<string>TLPKyokashotai</string> <match target="font">
<string>TLMarugothicM</string> <test name="family"><string>HGPGothicM</string></test>
<string>TLGyoshotai</string> <edit name="autohint"><bool>true</bool></edit>
<string>TLPGyoshotai</string> </match>
<string>TLSGyoshotai</string> <match target="font">
<string>TLPMarugothicM</string> <test name="family"><string>HGSKyokashotai</string></test>
<string>TLSMarugothicM</string> <edit name="autohint"><bool>true</bool></edit>
<string>TLSKyokashotai</string> </match>
<string>TLGothic</string> <match target="font">
<string>UnBatangBold</string> <test name="family"><string>HGMaruGothicMPRO</string></test>
<string>UnBatang</string> <edit name="autohint"><bool>true</bool></edit>
<string>UnBom</string> </match>
<string>UnDinaruBold</string> <match target="font">
<string>UnDinaruLight</string> <test name="family"><string>HGPSoeiKakugothicUB</string></test>
<string>UnDinaru</string> <edit name="autohint"><bool>true</bool></edit>
<string>UnDotumBold</string> </match>
<string>UnDotum</string> <match target="font">
<string>UnGraphicBold</string> <test name="family"><string>HGMinchoL</string></test>
<string>UnGraphic</string> <edit name="autohint"><bool>true</bool></edit>
<string>UnGungseo</string> </match>
<string>UnJamoBatang</string> <match target="font">
<string>UnJamoDotum</string> <test name="family"><string>HGPMinchoL</string></test>
<string>UnJamoNovel</string> <edit name="autohint"><bool>true</bool></edit>
<string>UnJamoSora</string> </match>
<string>UnPenheulim</string> <match target="font">
<string>UnPen</string> <test name="family"><string>HGMinchoB</string></test>
<string>UnPilgia</string> <edit name="autohint"><bool>true</bool></edit>
<string>UnPilgiBold</string> </match>
<string>UnPilgi</string> <match target="font">
<string>UnShinmun</string> <test name="family"><string>HGPMinchoB</string></test>
<string>UnTaza</string> <edit name="autohint"><bool>true</bool></edit>
<string>UnVada</string> </match>
<string>UnYetgul</string> <match target="font">
</test> <test name="family"><string>HGSMinchoB</string></test>
<edit name="autohint"> <edit name="autohint"><bool>true</bool></edit>
<bool>true</bool> </match>
</edit> <match target="font">
<test name="family"><string>HGMinchoE</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGPMinchoE</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGSMinchoE</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGSoeiKakugothicUB</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGGyoshotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGPGyoshotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGSGyoshotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGSoeiKakupoptai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGSSoeiPresenceEB</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGPSoeiPresenceEB</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGGothicB</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGGothicE</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGGothicM</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGSoeiPresenceEB</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGPKyokashotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGSSoeiKakupoptai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>HGSeikaishotaiPRO</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLKyokashotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLMincho</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLPMincho</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLPGothic</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLPKyokashotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLMarugothicM</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLGyoshotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLPGyoshotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLSGyoshotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLPMarugothicM</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLSMarugothicM</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLSKyokashotai</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>TLGothic</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnBatangBold</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnBatang</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnBom</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnDinaruBold</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnDinaruLight</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnDinaru</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnDotumBold</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnDotum</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnGraphicBold</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnGraphic</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnGungseo</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnJamoBatang</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnJamoDotum</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnJamoNovel</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnJamoSora</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnPenheulim</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnPen</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnPilgia</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnPilgiBold</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnPilgi</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnShinmun</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnTaza</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnVada</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match>
<match target="font">
<test name="family"><string>UnYetgul</string></test>
<edit name="autohint"><bool>true</bool></edit>
</match> </match>
<!-- <!--
The following rule sets up black and white rendering with The following rule sets up black and white rendering with
@ -206,7 +419,6 @@
with non-zero pixelsize limit. Using '18' as the pixelsize with non-zero pixelsize limit. Using '18' as the pixelsize
limit is a good choice if you have the fonts in this list installed limit is a good choice if you have the fonts in this list installed
and like a bitmap look and feel. and like a bitmap look and feel.
-->
<match target="font"> <match target="font">
<test name="family"> <test name="family">
<string>Andale Mono</string> <string>Andale Mono</string>
@ -241,6 +453,7 @@
<bool>false</bool> <bool>false</bool>
</edit> </edit>
</match> </match>
-->
<!-- <!--
@ -262,14 +475,14 @@
--> -->
<match target="font"> <match target="font">
<test name="family"> <test name="family"><string>MingLiU</string></test>
<string>MingLiU</string> <edit name="autohint"><bool>false</bool></edit>
<string>PMingLiU</string>
</test>
<edit name="autohint">
<bool>false</bool>
</edit>
</match> </match>
<match target="font">
<test name="family"><string>PMingLiU</string></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<!-- <!--
Hinting for CJK fonts in freetype doesn't yet work as well as for Latin fonts. Hinting for CJK fonts in freetype doesn't yet work as well as for Latin fonts.
@ -278,17 +491,19 @@ Recently the autohinter in in freetype has been improved for CJK fonts
a lot but it is still not perfect. Therefore one might want to switch a lot but it is still not perfect. Therefore one might want to switch
off the autohinter for CJK fonts. off the autohinter for CJK fonts.
This can be achieved by using the following rule: This can be achieved by using the following rules:
<match target="font"> <match target="font">
<test name="lang" compare="contains"> <test name="lang" compare="contains"><string>ja</string></test>
<string>ja</string> <edit name="autohint"><bool>false</bool></edit>
<string>zh</string> </match>
<string>ko</string> <match target="font">
</test> <test name="lang" compare="contains"><string>zh</string></test>
<edit name="autohint"> <edit name="autohint"><bool>false</bool></edit>
<bool>false</bool> </match>
</edit> <match target="font">
<test name="lang" compare="contains"><string>ko</string></test>
<edit name="autohint"><bool>false</bool></edit>
</match> </match>
--> -->

68
16-suse-hintstyle.conf
View File

@ -127,24 +127,56 @@ exceptions:
47 and 48 of referred bug. --> 47 and 48 of referred bug. -->
<match target="font"> <match target="font">
<test name="fullname"> <test name="fullname"><string>IPAexGothic</string></test>
<string>IPAexGothic</string> <edit name="hintstyle"><const>hintnone</const></edit>
<string>IPAexMincho</string> </match>
<string>IPAGothic BoldItalic</string> <match target="font">
<string>IPAGothic Bold</string> <test name="fullname"><string>IPAexMincho</string></test>
<string>IPAGothic Italic</string> <edit name="hintstyle"><const>hintnone</const></edit>
<string>IPAGothic</string> </match>
<string>IPAMincho</string> <match target="font">
<string>IPAPGothic BoldItalic</string> <test name="fullname"><string>IPAGothic BoldItalic</string></test>
<string>IPAPGothic Bold</string> <edit name="hintstyle"><const>hintnone</const></edit>
<string>IPAPGothic Italic</string> </match>
<string>IPAPGothic</string> <match target="font">
<string>IPAPMincho</string> <test name="fullname"><string>IPAGothic Bold</string></test>
<string>IPAUIGothic</string> <edit name="hintstyle"><const>hintnone</const></edit>
</test> </match>
<edit name="hintstyle"> <match target="font">
<const>hintnone</const> <test name="fullname"><string>IPAGothic Italic</string></test>
</edit> <edit name="hintstyle"><const>hintnone</const></edit>
</match>
<match target="font">
<test name="fullname"><string>IPAGothic</string></test>
<edit name="hintstyle"><const>hintnone</const></edit>
</match>
<match target="font">
<test name="fullname"><string>IPAMincho</string></test>
<edit name="hintstyle"><const>hintnone</const></edit>
</match>
<match target="font">
<test name="fullname"><string>IPAPGothic BoldItalic</string></test>
<edit name="hintstyle"><const>hintnone</const></edit>
</match>
<match target="font">
<test name="fullname"><string>IPAPGothic Bold</string></test>
<edit name="hintstyle"><const>hintnone</const></edit>
</match>
<match target="font">
<test name="fullname"><string>IPAPGothic Italic</string></test>
<edit name="hintstyle"><const>hintnone</const></edit>
</match>
<match target="font">
<test name="fullname"><string>IPAPGothic</string></test>
<edit name="hintstyle"><const>hintnone</const></edit>
</match>
<match target="font">
<test name="fullname"><string>IPAPMincho</string></test>
<edit name="hintstyle"><const>hintnone</const></edit>
</match>
<match target="font">
<test name="fullname"><string>IPAUIGothic</string></test>
<edit name="hintstyle"><const>hintnone</const></edit>
</match> </match>
</fontconfig> </fontconfig>

38
18-suse-bitmaps-misc.conf
View File

@ -13,18 +13,32 @@
pixels again. pixels again.
--> -->
<match target="font"> <match target="font">
<test name="family"> <test name="family"><string>IPAMincho</string></test>
<string>IPAMincho</string> <edit name="embeddedbitmap"><bool>false</bool></edit>
<string>IPAGothic</string> </match>
<string>IPAPMincho</string> <match target="font">
<string>IPAPGothic</string> <test name="family"><string>IPAGothic</string></test>
<string>IPAUIGothic</string> <edit name="embeddedbitmap"><bool>false</bool></edit>
<string>IPAexMincho</string> </match>
<string>IPAexGothic</string> <match target="font">
</test> <test name="family"><string>IPAPMincho</string></test>
<edit name="embeddedbitmap"> <edit name="embeddedbitmap"><bool>false</bool></edit>
<bool>false</bool> </match>
</edit> <match target="font">
<test name="family"><string>IPAPGothic</string></test>
<edit name="embeddedbitmap"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>IPAUIGothic</string></test>
<edit name="embeddedbitmap"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>IPAexMincho</string></test>
<edit name="embeddedbitmap"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>IPAexGothic</string></test>
<edit name="embeddedbitmap"><bool>false</bool></edit>
</match> </match>
</fontconfig> </fontconfig>

327
suse-pre-user.conf → 50-suse-pre-user.conf
View File

@ -16,13 +16,13 @@
--> -->
<match target="scan" > <match target="scan" >
<test compare="contains" name="family" > <test compare="contains" name="family" ><string>Luxi Mono</string></test>
<string>Luxi Mono</string> <edit mode="assign_replace" name="spacing"><const>mono</const></edit>
<string>Nimbus Mono L</string> </match>
</test>
<edit mode="assign_replace" name="spacing"> <match target="scan" >
<const>mono</const> <test compare="contains" name="family" ><string>Nimbus Mono L</string></test>
</edit> <edit mode="assign_replace" name="spacing"><const>mono</const></edit>
</match> </match>
<!-- <!--
@ -34,22 +34,27 @@
--> -->
<match target="font"> <match target="font">
<test name="lang" compare="contains"> <test name="lang" compare="contains"><string>ja</string></test>
<string>ja</string> <test name="spacing" compare="eq"><const>dual</const></test>
<string>zh</string> <edit name="spacing"><const>proportional</const></edit>
<string>ko</string> <edit name="globaladvance" binding="strong"><bool>false</bool></edit>
</test>
<test name="spacing" compare="eq">
<const>dual</const>
</test>
<edit name="spacing">
<const>proportional</const>
</edit>
<edit name="globaladvance" binding="strong">
<bool>false</bool>
</edit>
</match> </match>
<match target="font">
<test name="lang" compare="contains"><string>zh</string></test>
<test name="spacing" compare="eq"><const>dual</const></test>
<edit name="spacing"><const>proportional</const></edit>
<edit name="globaladvance" binding="strong"><bool>false</bool></edit>
</match>
<match target="font">
<test name="lang" compare="contains"><string>ko</string></test>
<test name="spacing" compare="eq"><const>dual</const></test>
<edit name="spacing"><const>proportional</const></edit>
<edit name="globaladvance" binding="strong"><bool>false</bool></edit>
</match>
<!-- <!--
There is a similar problem with dual width bitmap fonts. They don't There is a similar problem with dual width bitmap fonts. They don't
have spacing=dual, therefore they are not handled by the above rule have spacing=dual, therefore they are not handled by the above rule
@ -59,24 +64,46 @@
--> -->
<match target="font"> <match target="font">
<test name="lang" compare="contains"> <test name="lang" compare="contains"><string>ja</string></test>
<string>ja</string> <test name="outline" compare="eq"><bool>false</bool></test>
<string>zh</string> <test name="spacing" compare="eq"><const>mono</const></test>
<string>ko</string> <edit name="spacing"><const>proportional</const></edit>
</test> <edit name="globaladvance" binding="strong"><bool>false</bool></edit>
<test name="outline" compare="eq"> </match>
<bool>false</bool> <match target="font">
</test> <test name="lang" compare="contains"><string>ja</string></test>
<test name="spacing" compare="eq"> <test name="outline" compare="eq"><bool>false</bool></test>
<const>mono</const> <test name="spacing" compare="eq"><const>mono</const></test>
<const>charcell</const> <edit name="spacing"><const>charcell</const></edit>
</test> <edit name="globaladvance" binding="strong"><bool>false</bool></edit>
<edit name="spacing"> </match>
<const>proportional</const> <match target="font">
</edit> <test name="lang" compare="contains"><string>zh</string></test>
<edit name="globaladvance" binding="strong"> <test name="outline" compare="eq"><bool>false</bool></test>
<bool>false</bool> <test name="spacing" compare="eq"><const>mono</const></test>
</edit> <edit name="spacing"><const>proportional</const></edit>
<edit name="globaladvance" binding="strong"><bool>false</bool></edit>
</match>
<match target="font">
<test name="lang" compare="contains"><string>zh</string></test>
<test name="outline" compare="eq"><bool>false</bool></test>
<test name="spacing" compare="eq"><const>mono</const></test>
<edit name="spacing"><const>charcell</const></edit>
<edit name="globaladvance" binding="strong"><bool>false</bool></edit>
</match>
<match target="font">
<test name="lang" compare="contains"><string>ko</string></test>
<test name="outline" compare="eq"><bool>false</bool></test>
<test name="spacing" compare="eq"><const>mono</const></test>
<edit name="spacing"><const>proportional</const></edit>
<edit name="globaladvance" binding="strong"><bool>false</bool></edit>
</match>
<match target="font">
<test name="lang" compare="contains"><string>ko</string></test>
<test name="outline" compare="eq"><bool>false</bool></test>
<test name="spacing" compare="eq"><const>mono</const></test>
<edit name="spacing"><const>charcell</const></edit>
<edit name="globaladvance" binding="strong"><bool>false</bool></edit>
</match> </match>
<!-- ************************************************************ --> <!-- ************************************************************ -->
@ -320,7 +347,227 @@
<!-- assigning families to generic names --> <!-- assigning families to generic names -->
<!-- ************************************************************ --> <!-- ************************************************************ -->
<include ignore_missing="yes">/etc/fonts/suse-generic-names.conf</include> <!--
Serif faces
-->
<alias>
<family>Georgia</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>Bell MT</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>Thorndale AMT</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>SUSE Serif</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>FreeSerif</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>DejaVu Serif</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>Droid Serif</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>Liberation Serif</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>HGMinchoL</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>HGPMinchoL</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>HGPMinchoB</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>HGSMinchoB</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>HGMinchoE</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>HGPMinchoE</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>HGSMinchoE</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>IPAMincho</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>IPAPMincho</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>IPAexMincho</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>Sazanami Mincho</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>STIXGeneral</family>
<default><family>serif</family></default>
</alias>
<alias>
<family>Tinos</family>
<default><family>serif</family></default>
</alias>
<!--
Sans-serif faces
-->
<alias>
<family>Trebuchet</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>Segoe</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>Andale Sans</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>Albany AMT</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>SUSE Sans</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>FreeSans</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>DejaVu Sans</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>Droid Sans</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>Liberation Sans</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>Cantarell</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>HGGothicB</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>HGPGothicB</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>HGGothicE</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>HGPGothicE</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>HGSGothicE</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>HGGothicM</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>HGPGothicM</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>HGSGothicM</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>IPAGothic</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>IPAPGothic</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>IPAexGothic</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>Sazanami Gothic</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>Baekmuk Gulim</family>
<default><family>sans-serif</family></default>
</alias>
<alias>
<family>Arimo</family>
<default><family>sans-serif</family></default>
</alias>
<!--
Monospace faces
-->
<alias>
<family>Fixed</family>
<default><family>monospace</family></default>
</alias>
<alias>
<family>Cumberland AMT</family>
<default><family>monospace</family></default>
</alias>
<alias>
<family>SUSE Sans Mono</family>
<default><family>monospace</family></default>
</alias>
<alias>
<family>FreeMono</family>
<default><family>monospace</family></default>
</alias>
<alias>
<family>DejaVu Sans Mono</family>
<default><family>monospace</family></default>
</alias>
<alias>
<family>Droid Sans Mono</family>
<default><family>monospace</family></default>
</alias>
<alias>
<family>Liberation Mono</family>
<default><family>monospace</family></default>
</alias>
<alias>
<family>Cousine</family>
<default><family>monospace</family></default>
</alias>
</fontconfig> </fontconfig>

132
suse-post-user.conf → 58-suse-post-user.conf
View File

@ -179,35 +179,109 @@
--> -->
<match target="font"> <match target="font">
<test name="family"> <test name="family"><string>Andale Mono</string></test>
<string>Andale Mono</string> <test name="antialias"><bool>false</bool></test>
<string>Arial</string> <edit name="autohint"><bool>false</bool></edit>
<string>Comic Sans MS</string> </match>
<string>Georgia</string> <match target="font">
<string>Impact</string> <test name="family"><string>Arial</string></test>
<string>Trebuchet MS</string> <test name="antialias"><bool>false</bool></test>
<string>Verdana</string> <edit name="autohint"><bool>false</bool></edit>
<string>Courier New</string> </match>
<string>Times New Roman</string> <match target="font">
<string>Tahoma</string> <test name="family"><string>Comic Sans MS</string></test>
<string>Webdings</string> <test name="antialias"><bool>false</bool></test>
<string>Albany AMT</string> <edit name="autohint"><bool>false</bool></edit>
<string>Thorndale AMT</string> </match>
<string>Cumberland AMT</string> <match target="font">
<string>Andale Sans</string> <test name="family"><string>Georgia</string></test>
<string>Andy MT</string> <test name="antialias"><bool>false</bool></test>
<string>Bell MT</string> <edit name="autohint"><bool>false</bool></edit>
<string>Monotype Sorts</string> </match>
<string>Lucida Sans Typewriter</string> <match target="font">
<string>Lucida Sans</string> <test name="family"><string>Impact</string></test>
<string>Lucida Bright</string> <test name="antialias"><bool>false</bool></test>
</test> <edit name="autohint"><bool>false</bool></edit>
<test name="antialias"> </match>
<bool>false</bool> <match target="font">
</test> <test name="family"><string>Trebuchet MS</string></test>
<edit name="autohint"> <test name="antialias"><bool>false</bool></test>
<bool>false</bool> <edit name="autohint"><bool>false</bool></edit>
</edit> </match>
<match target="font">
<test name="family"><string>Verdana</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Courier New</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Times New Roman</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Tahoma</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Webdings</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Albany AMT</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Thorndale AMT</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Cumberland AMT</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Andale Sans</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Andy MT</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Bell MT</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Monotype Sorts</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Lucida Sans Typewriter</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Lucida Sans</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Lucida Bright</string></test>
<test name="antialias"><bool>false</bool></test>
<edit name="autohint"><bool>false</bool></edit>
</match> </match>
</fontconfig> </fontconfig>

24
cloexec.patch
View File

@ -1,8 +1,8 @@
Index: configure.in Index: configure.ac
=================================================================== ===================================================================
--- configure.in.orig --- configure.ac.orig
+++ configure.in +++ configure.ac
@@ -57,7 +57,9 @@ dnl ==================================== @@ -58,7 +58,9 @@ dnl ====================================
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
@ -13,21 +13,21 @@ Index: configure.in
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
@@ -119,7 +121,7 @@ AC_TYPE_PID_T @@ -135,7 +137,7 @@ AC_TYPE_PID_T
# Checks for library functions. # Checks for library functions.
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_FUNC_MMAP AC_FUNC_MMAP
-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r]) -AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree posix_fadvise fstatvfs fstatfs])
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r]) +AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree posix_fadvise fstatvfs fstatfs])
# #
# Checks for iconv if test "x$ac_cv_func_fstatvfs" = "xyes"; then
Index: src/fcatomic.c Index: src/fcatomic.c
=================================================================== ===================================================================
--- src/fcatomic.c.orig --- src/fcatomic.c.orig
+++ src/fcatomic.c +++ src/fcatomic.c
@@ -107,10 +107,14 @@ FcAtomicLock (FcAtomic *atomic) @@ -109,10 +109,14 @@ FcAtomicLock (FcAtomic *atomic)
#ifdef HAVE_LINK
strcpy ((char *) atomic->tmp, (char *) atomic->file); strcpy ((char *) atomic->tmp, (char *) atomic->file);
strcat ((char *) atomic->tmp, TMP_NAME); strcat ((char *) atomic->tmp, TMP_NAME);
+#ifdef HAVE_MKOSTEMP +#ifdef HAVE_MKOSTEMP
@ -46,7 +46,7 @@ Index: src/fccache.c
=================================================================== ===================================================================
--- src/fccache.c.orig --- src/fccache.c.orig
+++ src/fccache.c +++ src/fccache.c
@@ -216,7 +216,7 @@ FcDirCacheOpenFile (const FcChar8 *cache @@ -150,7 +150,7 @@ FcDirCacheOpenFile (const FcChar8 *cache
if (FcStat (cache_file, file_stat) < 0) if (FcStat (cache_file, file_stat) < 0)
return -1; return -1;
#endif #endif
@ -55,7 +55,7 @@ Index: src/fccache.c
if (fd < 0) if (fd < 0)
return fd; return fd;
#ifndef _WIN32 #ifndef _WIN32
@@ -963,7 +963,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi @@ -904,7 +904,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi
if (!FcAtomicLock (atomic)) if (!FcAtomicLock (atomic))
goto bail3; goto bail3;

3
fontconfig-2.10.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12c49f2295d2c14eaa2016a96217d88b63ad1923f8702a64d4e62e5df5afe687
size 1409503

3
fontconfig-2.9.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b39e193758e0ade4a93b2e576b1f2e0432f19bfa98d088b8429f9e31534cbe2
size 1399568

3
fontconfig-doc-2.10.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8bc453d969a2ff0dbea32160d62c2088c2b2d861dd7f0a8a2fa11d765b4c0ca
size 97573

3
fontconfig-doc-2.9.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b84f9ec432e74a0192c4aaef6130a8302af29d0cb72fbbd8098f11d8b902d7b
size 85466

21
fontconfig.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Sep 24 10:03:29 UTC 2012 - pgajdos@suse.com
- turn off autohinter for Verdana again, which implies using BCI
with hintstyle=3 [bnc#737215], [bnc#781631]
-------------------------------------------------------------------
Thu Sep 13 15:03:10 UTC 2012 - pgajdos@suse.com
- updated to 2.10.0:
* /etc/fonts/conf.avail is deprecated and is packaged only
for compatibility reasons; package should install its *.conf
files in its data dir and link it into /etc/fonts/conf.d as
usual
* introduced warning -- <alias> should not contain more <family>s
* introduced warning -- <test> should not contain more values
* introduced warning -- reading configurations from ~/.fonts.conf
is deprecated; move ~/.fonts.conf into $XDG_CONFIG_HOME/fontconfig/fonts.conf
(the same for ~/.fonts.conf.d, see
http://freedesktop.org/software/fontconfig/fontconfig-user.html)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 2 15:09:56 UTC 2012 - pgajdos@suse.com Thu Aug 2 15:09:56 UTC 2012 - pgajdos@suse.com

128
fontconfig.spec
View File

@ -16,8 +16,9 @@
# #
Name: fontconfig
%define build_docs 0 %define build_docs 0
Name: fontconfig
BuildRequires: automake BuildRequires: automake
BuildRequires: freetype2-devel BuildRequires: freetype2-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
@ -39,14 +40,14 @@ BuildRequires: opensp
BuildRequires: perl-SGMLS BuildRequires: perl-SGMLS
BuildRequires: sgml-skel BuildRequires: sgml-skel
%endif %endif
Provides: XFree86:/etc/fonts/fonts.dtd Provides: XFree86:%{_sysconfdir}/fonts/fonts.dtd
Url: http://fontconfig.org/ Url: http://fontconfig.org/
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: fontconfig-64bit Obsoletes: fontconfig-64bit
%endif %endif
Requires: bash Requires: bash
Version: 2.9.0 Version: 2.10.0
Release: 0 Release: 0
Summary: Library for Font Configuration Summary: Library for Font Configuration
License: MIT License: MIT
@ -58,25 +59,22 @@ Source1: %name-doc-%version.tar.bz2
Source2: iso639-1 Source2: iso639-1
Source3: iso639-2 Source3: iso639-2
Source4: baselibs.conf Source4: baselibs.conf
Source10: suse-generic-names.conf Source8: local.conf
Source11: suse-pre-user.conf Source9: local.conf.instsys
Source12: suse-post-user.conf Source11: 11-suse-hinting.conf
Source13: 11-suse-hinting.conf Source16: 16-suse-hintstyle.conf
Source14: 16-suse-hintstyle.conf Source18: 18-suse-bitmaps-misc.conf
Source15: 18-suse-bitmaps-misc.conf Source50: 50-suse-pre-user.conf
Source16: local.conf Source58: 58-suse-post-user.conf
Source20: local.conf.instsys
# fixed in next release https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47703
Patch0: simsun-conf.patch
# suse specific because freetype2-bitmap-foundry.patch # suse specific because freetype2-bitmap-foundry.patch
# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704 # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704
Patch1: make-check.patch Patch0: make-check.patch
# suse specific # suse specific
Patch2: usr-share-doc-packages.patch Patch1: usr-share-doc-packages.patch
# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705 # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705
Patch3: cloexec.patch Patch2: cloexec.patch
# to be upstreamed # to be upstreamed
Patch4: metric-croscore.patch Patch3: metric-croscore.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ipa-fonts-config = 003.02 Provides: ipa-fonts-config = 003.02
Obsoletes: ipa-fonts-config <= 003.02 Obsoletes: ipa-fonts-config <= 003.02
@ -119,11 +117,10 @@ accepts font patterns and returns the nearest matching font.
%if %{build_docs} < 1 %if %{build_docs} < 1
tar -xvf %{SOURCE1} tar -xvf %{SOURCE1}
%endif %endif
%patch0 -p1 -b .fonts.conf %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2
%patch3 %patch3
%patch4
%build %build
autoreconf -fiv autoreconf -fiv
@ -132,7 +129,7 @@ autoreconf -fiv
--with-freetype-lib=%_libdir \ --with-freetype-lib=%_libdir \
--with-x \ --with-x \
--enable-libxml2=no \ --enable-libxml2=no \
--with-confdir=/etc/fonts \ --with-confdir=%{_sysconfdir}/fonts \
--with-docdir=%{_defaultdocdir}/%{name} \ --with-docdir=%{_defaultdocdir}/%{name} \
--with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \ --with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \
%if %{build_docs} == 0 %if %{build_docs} == 0
@ -147,46 +144,42 @@ make %{?_smp_mflags} check
unset MALLOC_CHECK_ unset MALLOC_CHECK_
%install %install
make DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig install make DESTDIR=%{buildroot} pkgconfigdir=%{_libdir}/pkgconfig install
mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig rm -f %{buildroot}%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel # package /etc/fonts/conf.avail for compatibility reasons
mkdir %{buildroot}%{_sysconfdir}/fonts/conf.avail
# documentation
mkdir -p %{buildroot}/%{_defaultdocdir}/fontconfig
mkdir -p %{buildroot}/%{_defaultdocdir}/fontconfig-devel
install -m 644 AUTHORS COPYING ChangeLog README $RPM_SOURCE_DIR/iso639-? \ install -m 644 AUTHORS COPYING ChangeLog README $RPM_SOURCE_DIR/iso639-? \
$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} %{buildroot}/%{_defaultdocdir}/%{name}
install -m 644 doc/*.html $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig install -m 644 doc/*.html %{buildroot}/%{_defaultdocdir}/fontconfig
install -m 644 doc/fontconfig-user.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig install -m 644 doc/fontconfig-user.txt %{buildroot}/%{_defaultdocdir}/fontconfig
install -m 644 doc/fontconfig-devel/* $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel install -m 644 doc/fontconfig-devel/* %{buildroot}/%{_defaultdocdir}/fontconfig-devel
install -m 644 doc/fontconfig-devel.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel install -m 644 doc/fontconfig-devel.txt %{buildroot}/%{_defaultdocdir}/fontconfig-devel
for i in 1 3 5 for i in 1 3 5
do do
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man${i}/ mkdir -p %{buildroot}/%{_mandir}/man${i}/
for j in fc-*/*.${i} doc/*.${i} doc/*/*.${i} for j in fc-*/*.${i} doc/*.${i} doc/*/*.${i}
do do
test -f ${j} && install -m 644 ${j} $RPM_BUILD_ROOT/%{_mandir}/man${i}/ test -f ${j} && install -m 644 ${j} %{buildroot}/%{_mandir}/man${i}/
done done
gzip --best $RPM_BUILD_ROOT/%{_mandir}/man${i}/*.${i} gzip --best %{buildroot}/%{_mandir}/man${i}/*.${i}
done done
# install the conf.d README as well, I think it's helpful: install -m 644 conf.d/README %{buildroot}%{_sysconfdir}/fonts/conf.d
install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d # tune links in conf.d
install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/ pushd %{buildroot}%{_sysconfdir}/fonts/conf.d
mv 50-user.conf 56-user.conf
mv 51-local.conf 55-local.conf
rm -f 51-local.conf
popd
for i in $RPM_SOURCE_DIR/[0-9]*.conf; do for i in $RPM_SOURCE_DIR/[0-9]*.conf; do
j=${i##*/} j=${i##*/}
install -m 644 $i $RPM_BUILD_ROOT/etc/fonts/conf.avail/ install -m 644 $i %{buildroot}%{_datadir}/%{name}/conf.avail/
ln -s ../conf.avail/$j $RPM_BUILD_ROOT/etc/fonts/conf.d/$j ln -s ../../..%{_datadir}/%{name}/conf.avail/$j %{buildroot}%{_sysconfdir}/fonts/conf.d/$j
done done
install -m 644 $RPM_SOURCE_DIR/local.conf $RPM_BUILD_ROOT/etc/fonts install -m 644 $RPM_SOURCE_DIR/local.conf %{buildroot}%{_sysconfdir}/fonts
install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/local.conf.instsys %{buildroot}%{_sysconfdir}/fonts/
# tune links in conf.d:
pushd $RPM_BUILD_ROOT/etc/fonts/conf.d
rm -f 50-user.conf
rm -f 51-local.conf
ln -s ../suse-pre-user.conf 50-suse-pre-user.conf
ln -s ../conf.avail/51-local.conf 55-local.conf
ln -s ../conf.avail/50-user.conf 56-user.conf
ln -s ../suse-post-user.conf 58-suse-post-user.conf
popd
# don't package any files in the cache directory, only the directory itself:
rm -f $RPM_BUILD_ROOT/var/cache/fontconfig/*
rm -f %{buildroot}%{_libdir}/*.la
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -194,25 +187,26 @@ rm -f %{buildroot}%{_libdir}/*.la
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc %{_defaultdocdir}/%{name}
%{_bindir}/*
%dir /etc/fonts
%config /etc/fonts/fonts.dtd
%config /etc/fonts/fonts.conf
%config /etc/fonts/suse-generic-names.conf
%config /etc/fonts/suse-pre-user.conf
%config /etc/fonts/suse-post-user.conf
%dir /etc/fonts/conf.avail/
/etc/fonts/conf.avail/*
%dir /etc/fonts/conf.d/
/etc/fonts/conf.d/README
%config(noreplace) /etc/fonts/conf.d/*.conf
%config(noreplace) /etc/fonts/local.conf
%config /etc/fonts/local.conf.instsys
%{_libdir}/libfontconfig.so.* %{_libdir}/libfontconfig.so.*
%{_bindir}/*
%dir %{_sysconfdir}/fonts
%dir %{_sysconfdir}/fonts/conf.d
# packaging /etc/fonts/conf.avail for compatibility reasons
%dir %{_sysconfdir}/fonts/conf.avail
%config %{_sysconfdir}/fonts/fonts.conf
%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf
%config(noreplace) %{_sysconfdir}/fonts/local.conf
%config %{_sysconfdir}/fonts/local.conf.instsys
%{_sysconfdir}/fonts/conf.d/README
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/conf.avail
%{_datadir}/%{name}/conf.avail/*.conf
%dir %{_datadir}/xml/%{name}
%{_datadir}/xml/%{name}/fonts.dtd
%dir /var/cache/fontconfig/
%doc %{_docdir}/%{name}
%{_mandir}/man5/fonts-conf.5.gz %{_mandir}/man5/fonts-conf.5.gz
%{_mandir}/man1/* %{_mandir}/man1/*
%dir /var/cache/fontconfig/
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)

24
metric-croscore.patch
View File

@ -55,27 +55,3 @@ Index: conf.d/30-metric-aliases.conf
<family>Cumberland</family> <family>Cumberland</family>
<default> <default>
<family>Courier New</family> <family>Courier New</family>
@@ -219,6 +244,7 @@
<alias binding="same">
<family>Arial</family>
<accept>
+ <family>Arimo</family>
<family>Liberation Sans</family>
<family>Albany</family>
<family>Albany AMT</family>
@@ -228,6 +254,7 @@
<alias binding="same">
<family>Times New Roman</family>
<accept>
+ <family>Tinos</family>
<family>Liberation Serif</family>
<family>Thorndale</family>
<family>Thorndale AMT</family>
@@ -237,6 +264,7 @@
<alias binding="same">
<family>Courier New</family>
<accept>
+ <family>Cousine</family>
<family>Liberation Mono</family>
<family>Cumberland</family>
<family>Cumberland AMT</family>

26
simsun-conf.patch
View File

@ -1,26 +0,0 @@
Index: fontconfig-2.9.0/conf.d/40-nonlatin.conf
===================================================================
--- fontconfig-2.9.0.orig/conf.d/40-nonlatin.conf
+++ fontconfig-2.9.0/conf.d/40-nonlatin.conf
@@ -89,6 +89,10 @@
<family>FreeSerif</family>
<default><family>serif</family></default>
</alias>
+ <alias>
+ <family>SimSun</family>
+ <default><family>serif</family></default>
+ </alias>
<!--
Sans-serif faces
-->
@@ -153,10 +157,6 @@
<default><family>sans-serif</family></default>
</alias>
<alias>
- <family>SimSun</family>
- <default><family>sans-serif</family></default>
- </alias>
- <alias>
<family>MgOpen Modata</family>
<default><family>sans-serif</family></default>
</alias>

83
suse-generic-names.conf
View File

@ -1,83 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
Mark common families with their generics so we'll get
something reasonable
-->
<!--
Serif faces
-->
<alias>
<family>Georgia</family>
<family>Bell MT</family>
<family>Thorndale AMT</family>
<family>SUSE Serif</family>
<family>FreeSerif</family>
<family>DejaVu Serif</family>
<family>Droid Serif</family>
<family>Liberation Serif</family>
<family>HGMinchoL</family>
<family>HGPMinchoL</family>
<family>HGPMinchoB</family>
<family>HGSMinchoB</family>
<family>HGMinchoE</family>
<family>HGPMinchoE</family>
<family>HGSMinchoE</family>
<family>IPAMincho</family>
<family>IPAPMincho</family>
<family>IPAexMincho</family>
<family>Sazanami Mincho</family>
<family>STIXGeneral</family>
<family>Tinos</family>
<default><family>serif</family></default>
</alias>
<!--
Sans-serif faces
-->
<alias>
<family>Trebuchet</family>
<family>Segoe</family>
<family>Andale Sans</family>
<family>Albany AMT</family>
<family>SUSE Sans</family>
<family>FreeSans</family>
<family>DejaVu Sans</family>
<family>Droid Sans</family>
<family>Liberation Sans</family>
<family>Cantarell</family>
<family>HGGothicB</family>
<family>HGPGothicB</family>
<family>HGGothicE</family>
<family>HGPGothicE</family>
<family>HGSGothicE</family>
<family>HGGothicM</family>
<family>HGPGothicM</family>
<family>HGSGothicM</family>
<family>IPAGothic</family>
<family>IPAPGothic</family>
<family>IPAexGothic</family>
<family>Sazanami Gothic</family>
<family>Baekmuk Gulim</family>
<family>Arimo</family>
<default><family>sans-serif</family></default>
</alias>
<!--
Monospace faces
-->
<alias>
<family>Fixed</family>
<family>Cumberland AMT</family>
<family>SUSE Sans Mono</family>
<family>FreeMono</family>
<family>DejaVu Sans Mono</family>
<family>Droid Sans Mono</family>
<family>Liberation Mono</family>
<family>Cousine</family>
<default><family>monospace</family></default>
</alias>
</fontconfig>