[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/fontconfig/devel 25-no-hint-fedora.conf, NONE, 1.1 30-aliases-fedora.conf, NONE, 1.1 40-generic-fedora.conf, NONE, 1.1 64-nonlatin-fedora.conf, NONE, 1.1 75-blacklist-fedora.conf, NONE, 1.1 .cvsignore, 1.23, 1.24 fontconfig.spec, 1.90, 1.91 sources, 1.24, 1.25 40-blacklist-fonts.conf, 1.3, NONE 50-no-hint-fonts.conf, 1.4, NONE fontconfig-2.3.95-zysong01.patch, 1.1, NONE fontconfig-2.4-cmap-parsing.patch, 1.1, NONE



Author: besfahbo

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3352

Modified Files:
	.cvsignore fontconfig.spec sources 
Added Files:
	25-no-hint-fedora.conf 30-aliases-fedora.conf 
	40-generic-fedora.conf 64-nonlatin-fedora.conf 
	75-blacklist-fedora.conf 
Removed Files:
	40-blacklist-fonts.conf 50-no-hint-fonts.conf 
	fontconfig-2.3.95-zysong01.patch 
	fontconfig-2.4-cmap-parsing.patch 
Log Message:
* 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 :-(



--- NEW FILE 25-no-hint-fedora.conf ---
<?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>


--- NEW FILE 30-aliases-fedora.conf ---
<?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>


--- NEW FILE 40-generic-fedora.conf ---
<?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>


--- NEW FILE 64-nonlatin-fedora.conf ---
<?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>


--- NEW FILE 75-blacklist-fedora.conf ---
<?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>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	7 Sep 2006 21:40:36 -0000	1.23
+++ .cvsignore	11 Sep 2006 19:48:16 -0000	1.24
@@ -1 +1 @@
-fontconfig-2.3.97.tar.gz
+fontconfig-2.4.0.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- fontconfig.spec	7 Sep 2006 22:46:38 -0000	1.90
+++ fontconfig.spec	11 Sep 2006 19:48:16 -0000	1.91
@@ -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 @@
 %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 @@
 
 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 @@
 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 @@
 %{_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 @@
 %{_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
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	7 Sep 2006 21:41:05 -0000	1.24
+++ sources	11 Sep 2006 19:48:16 -0000	1.25
@@ -1 +1 @@
-c7c7a1866341d73455271ad14d8db54e  fontconfig-2.3.97.tar.gz
+f87eb0e6596510bbf87e57b33a657ec5  fontconfig-2.4.0.tar.gz


--- 40-blacklist-fonts.conf DELETED ---


--- 50-no-hint-fonts.conf DELETED ---


--- fontconfig-2.3.95-zysong01.patch DELETED ---


--- fontconfig-2.4-cmap-parsing.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]