[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]
rpms/fontconfig/devel 40-blacklist-fonts.conf, NONE, 1.1 50-no-hint-fonts.conf, NONE, 1.1 fontconfig-2.3.2-only-parse-conf-files.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 fontconfig.spec, 1.31, 1.32 sources, 1.8, 1.9 fontconfig-0.0.1.020826.1330-blacklist.patch, 1.1, NONE fontconfig-2.1-slighthint.patch, 1.1, NONE fontconfig-2.2.1-notimestamp.patch, 1.1, NONE fontconfig-2.2.3-add-sazanami.patch, 1.1, NONE fontconfig-2.2.3-names.patch, 1.1, NONE fontconfig-2.2.3-ta-pa-orth.patch, 1.1, NONE fontconfig-2.2.3-timestamp.patch, 1.1, NONE

From: fedora-cvs-commits redhat com
To: fedora-cvs-commits redhat com
Subject: rpms/fontconfig/devel 40-blacklist-fonts.conf, NONE, 1.1 50-no-hint-fonts.conf, NONE, 1.1 fontconfig-2.3.2-only-parse-conf-files.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 fontconfig.spec, 1.31, 1.32 sources, 1.8, 1.9 fontconfig-0.0.1.020826.1330-blacklist.patch, 1.1, NONE fontconfig-2.1-slighthint.patch, 1.1, NONE fontconfig-2.2.1-notimestamp.patch, 1.1, NONE fontconfig-2.2.3-add-sazanami.patch, 1.1, NONE fontconfig-2.2.3-names.patch, 1.1, NONE fontconfig-2.2.3-ta-pa-orth.patch, 1.1, NONE fontconfig-2.2.3-timestamp.patch, 1.1, NONE
Date: Mon, 25 Jul 2005 17:18:28 -0400
Author: krh

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

Modified Files:
	.cvsignore fontconfig.spec sources 
Added Files:
	40-blacklist-fonts.conf 50-no-hint-fonts.conf 
	fontconfig-2.3.2-only-parse-conf-files.patch 
Removed Files:
	fontconfig-0.0.1.020826.1330-blacklist.patch 
	fontconfig-2.1-slighthint.patch 
	fontconfig-2.2.1-notimestamp.patch 
	fontconfig-2.2.3-add-sazanami.patch 
	fontconfig-2.2.3-names.patch fontconfig-2.2.3-ta-pa-orth.patch 
	fontconfig-2.2.3-timestamp.patch 
Log Message:
* Fri Jul 22 2005 Kristian Høgsberg <krh redhat com> - 2.3.2-1
- Update to fontconfig-2.3.2.  Drop

        fontconfig-2.1-slighthint.patch,
        fontconfig-2.2.3-timestamp.patch,
        fontconfig-2.2.3-names.patch,
        fontconfig-2.2.3-ta-pa-orth.patch, and
        fontconfig-2.2.3-timestamp.patch,

  as they are now merged upstream.

- Fold fontconfig-2.2.3-add-sazanami.patch into
  fontconfig-2.3.2-defaultconfig.patch and split rules to disable CJK
  hinting out into /etc/fonts/conf.d/50-no-hint-fonts.conf.

- Drop fontconfig-0.0.1.020826.1330-blacklist.patch and use the new
  rejectfont directive to reject those fonts in 40-blacklist-fonts.conf.

- Add fontconfig-2.3.2-only-parse-conf-files.patch to avoid parsing
  .rpmsave files.




--- NEW FILE 40-blacklist-fonts.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">

<!-- Blacklist certain fonts that freetype can't handle -->

<fontconfig>
  <selectfont>
    <rejectfont>*/hrger.pfa</rejectfont>
    <rejectfont>*/hrgrr.pfa</rejectfont>
    <rejectfont>*/hritr.pfa</rejectfont>
    <rejectfont>*/hrpld.pfa</rejectfont>
    <rejectfont>*/hrpldi.pfa</rejectfont>
    <rejectfont>*/hrplt.pfa</rejectfont>
    <rejectfont>*/hrplti.pfa</rejectfont>
    <rejectfont>*/hrscc.pfa</rejectfont>
    <rejectfont>*/hrscs.pfa</rejectfont>
    <rejectfont>*/u003043t.gsf</rejectfont>
    <rejectfont>*/u004006t.gsf</rejectfont>
  </selectfont>
</fontconfig>


--- NEW FILE 50-no-hint-fonts.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>
                <!-- the rh_prefer_bitmaps options (a nonstandard
                     Red Hat extension), controls whether embedded 
                     bitmaps, when available are preferred
                     to antialiased rendering. For Japanese,
                     we prefer antialiased rendering -->
		<edit name="rh_prefer_bitmaps" 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="rh_prefer_bitmaps" 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="rh_prefer_bitmaps" 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="rh_prefer_bitmaps" 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 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 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>

</fontconfig>

fontconfig-2.3.2-only-parse-conf-files.patch:
 doc/fontconfig-user.sgml |    6 +++---
 src/fcxml.c              |    9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE fontconfig-2.3.2-only-parse-conf-files.patch ---
--- fontconfig-2.3.2/src/fcxml.c.only-parse-conf-files	2005-07-25 16:35:36.000000000 -0400
+++ fontconfig-2.3.2/src/fcxml.c	2005-07-25 16:35:48.000000000 -0400
@@ -2264,12 +2264,17 @@
 	
     while (ret && (e = readdir (d)))
     {
+	int d_len;
+#define TAIL	    ".conf"
+#define TAIL_LEN    5
 	/*
-	 * Add all files of the form [0-9]*
+	 * Add all files of the form [0-9]*.conf
 	 */
 	if ('0' <= e->d_name[0] && e->d_name[0] <= '9' &&
-	    strlen (e->d_name) < FC_MAX_FILE_LEN)
+	    (d_len = strlen (e->d_name)) < FC_MAX_FILE_LEN &&
+	    d_len > TAIL_LEN &&
+	    strcmp (e->d_name + d_len - TAIL_LEN, TAIL) == 0)
 	{
 	    strcpy ((char *) base, (char *) e->d_name);
 	    if (!FcStrSetAdd (files, file))

--- fontconfig-2.3.2/doc/fontconfig-user.sgml.only-parse-conf-files	2005/03/01 20:36:48	1.14
+++ fontconfig-2.3.2/doc/fontconfig-user.sgml	2005/07/25 20:39:19	1.15
@@ -3,7 +3,7 @@
 <!ENTITY confdir SYSTEM "confdir.sgml">
 ]>
 <!--
-    $Id: fontconfig-user.sgml,v 1.14 2005/03/01 20:36:48 keithp Exp $
+    $Id: fontconfig-user.sgml,v 1.15 2005/07/25 20:39:19 keithp Exp $
    
     Copyright © 2003 Keith Packard
    
@@ -276,8 +276,8 @@
   </para></refsect2>
   <refsect2><title><sgmltag>include ignore_missing="no"</></title><para>
 This element contains the name of an additional configuration file or
-directory.  If a directory, every file within that directory starting with a
-number will be processed in sorted order.  When
+directory.  If a directory, every file within that directory starting with an
+ASCII digit (U+0030 - U+0039) and ending with the string ``.conf'' will be processed in sorted order.  When
 the XML datatype is traversed by FcConfigParse, the contents of the file(s)
 will also be incorporated into the configuration by passing the filename(s) to
 FcConfigLoadAndParse.  If 'ignore_missing' is set to "yes" instead of the


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Sep 2004 04:54:28 -0000	1.8
+++ .cvsignore	25 Jul 2005 21:18:26 -0000	1.9
@@ -1 +1 @@
-fontconfig-2.2.3.tar.gz
+fontconfig-2.3.2.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fontconfig.spec	19 Apr 2005 20:51:00 -0000	1.31
+++ fontconfig.spec	25 Jul 2005 21:18:26 -0000	1.32
@@ -11,35 +11,25 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.2.3
-Release: 13
+Version: 2.3.2
+Release: 1
 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
 
-Patch1: fontconfig-defaultconfig.patch
-Patch4: fontconfig-2.1-slighthint.patch
-# Blacklist certain fonts that freetype can't handle
-Patch11: fontconfig-0.0.1.020826.1330-blacklist.patch
+Patch1: fontconfig-2.3.2-defaultconfig.patch
 # Ignore .fulldir entries from earlier versions 'dircache' fix.
 Patch13: fontconfig-2.1-fulldir.patch
 # Turn off doc generation since it doesn't work on s390 at the moment
 Patch14: fontconfig-nodocs.patch
-# Remove timestamp from fonts.conf
-# http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=505
-Patch17: fontconfig-2.2.1-notimestamp.patch
-# Backport of name parsing code from the 2.2.9x devel branch
-Patch18: fontconfig-2.2.3-names.patch
-# Add pa, fix ta orthographies
-# http://freedesktop.org/bugzilla/show_bug.cgi?id=1671
-Patch19: fontconfig-2.2.3-ta-pa-orth.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=1982
-Patch20: fontconfig-2.2.3-timestamp.patch
 
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=148748
-Patch30: fontconfig-2.2.3-add-sazanami.patch
+# Make sure we only parse files ending in .conf in conf.d directories.
+# We don't want to parse .rpmsave files.
+Patch15: fontconfig-2.3.2-only-parse-conf-files.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -72,24 +62,15 @@
 %prep
 %setup -q
 
-# Patch first so we don't affect .defaultconfig regeneration
-%patch17 -p1 -b .notimestamp
-
 %patch1 -p1 -b .defaultconfig
-%patch4 -p1 -b .slighthint
-%patch11 -p1 -b .blacklist
 %patch13 -p1 -b .fulldir
 
-%patch18 -p1 -b .names
-%patch19 -p1 -b .ta-pa-orth
-%patch20 -p1 -b .timestamp
-
-%patch30 -p1 -b .sazanami
-
 %if %{disable_docs}
 %patch14 -p1 -b .nodocs
 %endif
 
+%patch15 -p1 -b .only-parse-conf-files
+
 %build
 
 %if %{disable_docs}
@@ -97,7 +78,7 @@
 %endif
 
 %configure --with-add-fonts=/usr/X11R6/lib/X11/fonts/Type1,/usr/X11R6/lib/X11/fonts/OTF
-make
+make PDF=
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -114,13 +95,16 @@
 )
 %endif
 
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT PDF=
+
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 # Install man pages with correct encoding
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,3,5}
-for i in fc-cache fc-list ; do
-  iconv -f iso-8859-1 -t utf-8 < $i/$i.man > $i/$i.man.utf8
-  install -m 0644 $i/$i.man.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/$i.1
+for i in fc-cache fc-list fc-match ; do
+  iconv -f iso-8859-1 -t utf-8 < $i/$i.1 > $i/$i.1.utf8
+  install -m 0644 $i/$i.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/$i.1
 done
 
 %if ! %{disable_docs}
@@ -163,11 +147,14 @@
 %{_libdir}/libfontconfig.so.*
 %{_bindir}/fc-cache
 %{_bindir}/fc-list
+%{_bindir}/fc-match
 %dir %{_sysconfdir}/fonts
+%dir %{_sysconfdir}/fonts/conf.d
 %dir %{_datadir}/fonts
 %{_sysconfdir}/fonts/fonts.dtd
 %config %{_sysconfdir}/fonts/fonts.conf
-%config(noreplace) %{_sysconfdir}/fonts/local.conf
+%config %{_sysconfdir}/fonts/conf.d/*.conf
+
 %{_mandir}/man1/*
 %if ! %{disable_docs}
 %{_mandir}/man5/*
@@ -187,6 +174,27 @@
 %endif
 
 %changelog
+* Fri Jul 22 2005 Kristian Høgsberg <krh redhat com> - 2.3.2-1
+- Update to fontconfig-2.3.2.  Drop
+
+	fontconfig-2.1-slighthint.patch,
+	fontconfig-2.2.3-timestamp.patch,
+	fontconfig-2.2.3-names.patch,
+	fontconfig-2.2.3-ta-pa-orth.patch, and
+	fontconfig-2.2.3-timestamp.patch,
+
+  as they are now merged upstream.
+
+- Fold fontconfig-2.2.3-add-sazanami.patch into
+  fontconfig-2.3.2-defaultconfig.patch and split rules to disable CJK
+  hinting out into /etc/fonts/conf.d/50-no-hint-fonts.conf.
+
+- Drop fontconfig-0.0.1.020826.1330-blacklist.patch and use the new
+  rejectfont directive to reject those fonts in 40-blacklist-fonts.conf.
+
+- Add fontconfig-2.3.2-only-parse-conf-files.patch to avoid parsing
+  .rpmsave files.
+
 * Tue Apr 19 2005 David Zeuthen <davidz redhat com> - 2.2.3-13
 - Add another font family name Sazanami Gothic/Mincho (#148748)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Sep 2004 04:54:28 -0000	1.8
+++ sources	25 Jul 2005 21:18:26 -0000	1.9
@@ -1 +1 @@
-2466a797d645cda5eb466080fdaec416  fontconfig-2.2.3.tar.gz
+7354f9f125ea78a8f2851cb9c31d4866  fontconfig-2.3.2.tar.gz


--- fontconfig-0.0.1.020826.1330-blacklist.patch DELETED ---


--- fontconfig-2.1-slighthint.patch DELETED ---


--- fontconfig-2.2.1-notimestamp.patch DELETED ---


--- fontconfig-2.2.3-add-sazanami.patch DELETED ---


--- fontconfig-2.2.3-names.patch DELETED ---


--- fontconfig-2.2.3-ta-pa-orth.patch DELETED ---


--- fontconfig-2.2.3-timestamp.patch DELETED ---
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]