pool/fonts-config
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 135644 from home:pgajdos

Browse Source 
- cooperate with fontconfig 2.10.0 (removed /etc/fonts/conf.avail)

OBS-URL: https://build.opensuse.org/request/show/135644
OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=32
This commit is contained in:
Petr Gajdos 2012-09-24 11:38:35 +00:00 committed by Git OBS Bridge
parent 0285cf00cb
commit b1c0fa383d
4 changed files with 145 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fonts-config
View File

@ -2275,7 +2275,7 @@ sub font_dirs_setup {
} }
######################################################################## ########################################################################
sub hinting_setup { sub hinting_setup {
my $suse_hinting_file = "/etc/fonts/conf.avail/12-suse-hinting-bc.conf"; my $suse_hinting_file = "/usr/share/fonts-config/conf.avail/12-suse-hinting-bc.conf";
my $suse_hinting_template_file = "/usr/share/fonts-config/suse-hinting.conf.template"; my $suse_hinting_template_file = "/usr/share/fonts-config/suse-hinting.conf.template";
my $suse_hinting = ""; my $suse_hinting = "";
my $suse_hinting_template = ""; my $suse_hinting_template = "";
@ -2311,7 +2311,7 @@ sub hinting_setup {
######################################################################## ########################################################################
sub embedded_bitmap_setup { sub embedded_bitmap_setup {
my $suse_bitmaps_file = "/etc/fonts/conf.avail/17-suse-bitmaps.conf"; my $suse_bitmaps_file = "/usr/share/fonts-config/conf.avail/17-suse-bitmaps.conf";
my $suse_bitmaps_template_file = "/usr/share/fonts-config/suse-bitmaps.conf.template"; my $suse_bitmaps_template_file = "/usr/share/fonts-config/suse-bitmaps.conf.template";
my $suse_bitmaps = ""; my $suse_bitmaps = "";
my $suse_bitmaps_template = ""; my $suse_bitmaps_template = "";
@ -2342,17 +2342,13 @@ sub embedded_bitmap_setup {
$suse_bitmaps_template .= " <bool>false</bool>\n"; $suse_bitmaps_template .= " <bool>false</bool>\n";
$suse_bitmaps_template .= " </edit>\n"; $suse_bitmaps_template .= " </edit>\n";
$suse_bitmaps_template .= " </match>\n"; $suse_bitmaps_template .= " </match>\n";
$suse_bitmaps_template .= " <match target=\"font\">\n";
$suse_bitmaps_template .= " <test name=\"lang\" compare=\"contains\">\n";
my @languages = split (":", "$OPT_EBITMAP_LANG"); my @languages = split (":", "$OPT_EBITMAP_LANG");
for my $i (@languages) { for my $i (@languages) {
$suse_bitmaps_template .= " <string>$i</string>\n"; $suse_bitmaps_template .= " <match target=\"font\">\n";
$suse_bitmaps_template .= " <test name=\"lang\" compare=\"contains\"><string>$i</string></test>\n";
$suse_bitmaps_template .= " <edit name=\"embeddedbitmap\" mode=\"assign\"><bool>true</bool></edit>\n";
$suse_bitmaps_template .= " </match>\n";
} }
$suse_bitmaps_template .= " </test>\n";
$suse_bitmaps_template .= " <edit name=\"embeddedbitmap\" mode=\"assign\">\n";
$suse_bitmaps_template .= " <bool>true</bool>\n";
$suse_bitmaps_template .= " </edit>\n";
$suse_bitmaps_template .= " </match>\n";
} }
} }
} }

5
fonts-config.changes
View File

@ -4,6 +4,11 @@ Mon Sep 17 08:44:38 UTC 2012 - coolo@suse.com
- the script requires checkproc and killproc, otherwise it will start - the script requires checkproc and killproc, otherwise it will start
a xfs in buildroot (oops) a xfs in buildroot (oops)
-------------------------------------------------------------------
Fri Sep 14 08:00:41 UTC 2012 - pgajdos@suse.com
- cooperate with fontconfig 2.10.0 (removed /etc/fonts/conf.avail)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 28 14:18:59 UTC 2012 - pgajdos@suse.com Tue Aug 28 14:18:59 UTC 2012 - pgajdos@suse.com

16
fonts-config.spec
View File

@ -66,15 +66,16 @@ pod2man --section 1 --center=" " $RPM_SOURCE_DIR/fonts-config > \
install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \ install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \
%{buildroot}%{_localstatedir}/adm/fillup-templates/ %{buildroot}%{_localstatedir}/adm/fillup-templates/
# #
mkdir -p %{buildroot}%{_fontsconfddir} mkdir %{buildroot}%{_datadir}/%{name}/conf.avail/
mkdir -p %{buildroot}%{_fontsconfavaildir}
sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE6} \ sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE6} \
> %{buildroot}%{_fontsconfavaildir}/12-suse-hinting-bc.conf > %{buildroot}%{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf
sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE7} \ sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE7} \
> %{buildroot}%{_fontsconfavaildir}/17-suse-bitmaps.conf > %{buildroot}%{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf
ln -s ../conf.avail/12-suse-hinting-bc.conf \ #
mkdir -p %{buildroot}%{_fontsconfddir}
ln -s %{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf \
%{buildroot}%{_fontsconfddir}/12-suse-hinting-bc.conf %{buildroot}%{_fontsconfddir}/12-suse-hinting-bc.conf
ln -s ../conf.avail/17-suse-bitmaps.conf \ ln -s %{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf \
%{buildroot}%{_fontsconfddir}/17-suse-bitmaps.conf %{buildroot}%{_fontsconfddir}/17-suse-bitmaps.conf
%post %post
@ -89,7 +90,8 @@ exit 0
%{_datadir}/fonts-config/* %{_datadir}/fonts-config/*
%{_mandir}/man1/fonts-config.1.gz %{_mandir}/man1/fonts-config.1.gz
%{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config %{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config
%{_fontsconfavaildir}/* %dir %{_datadir}/%{name}/conf.avail
%{_datadir}/%{name}/conf.avail/*.conf
%{_fontsconfddir}/* %{_fontsconfddir}/*
%changelog %changelog

157
suse-hinting.conf.template
View File

@ -26,38 +26,131 @@
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></test>
<string>Andale Mono</string> <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<string>Arial</string> <edit name="autohint"><bool>false</bool></edit>
<string>Comic Sans MS</string> <edit name="antialias"><bool>false</bool></edit>
<string>Georgia</string> </match>
<string>Impact</string> <match target="font">
<string>Trebuchet MS</string> <test name="family"><string>Arial</string></test>
<string>Verdana</string> <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<string>Courier New</string> <edit name="autohint"><bool>false</bool></edit>
<string>Times New Roman</string> <edit name="antialias"><bool>false</bool></edit>
<string>Tahoma</string> </match>
<string>Webdings</string>
<string>Albany AMT</string> <match target="font">
<string>Thorndale AMT</string> <test name="family"><string>Comic Sans MS</string></test>
<string>Cumberland AMT</string> <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<string>Andale Sans</string> <edit name="autohint"><bool>false</bool></edit>
<string>Andy MT</string> <edit name="antialias"><bool>false</bool></edit>
<string>Bell MT</string> </match>
<string>Monotype Sorts</string> <match target="font">
<string>Lucida Sans Typewriter</string> <test name="family"><string>Georgia</string></test>
<string>Lucida Sans</string> <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<string>Lucida Bright</string> <edit name="autohint"><bool>false</bool></edit>
</test> <edit name="antialias"><bool>false</bool></edit>
<test name="pixelsize" compare="less_eq"> </match>
<double>_BYTECODE_BW_MAX_PIXEL_</double> <match target="font">
</test> <test name="family"><string>Impact</string></test>
<edit name="autohint"> <test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<bool>false</bool> <edit name="autohint"><bool>false</bool></edit>
</edit> <edit name="antialias"><bool>false</bool></edit>
<edit name="antialias"> </match>
<bool>false</bool> <match target="font">
</edit> <test name="family"><string>Trebuchet MS</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Verdana</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Courier New</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Times New Roman</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Tahoma</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Webdings</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Albany AMT</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Thorndale AMT</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Cumberland AMT</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Andale Sans</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Andy MT</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Bell MT</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Monotype Sorts</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Lucida Sans Typewriter</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Lucida Sans</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match>
<match target="font">
<test name="family"><string>Lucida Bright</string></test>
<test name="pixelsize" compare="less_eq"><double>_BYTECODE_BW_MAX_PIXEL_</double></test>
<edit name="autohint"><bool>false</bool></edit>
<edit name="antialias"><bool>false</bool></edit>
</match> </match>
</fontconfig> </fontconfig>