rpms/fontconfig/devel fontconfig-2.3.93-globaldir.patch, NONE, 1.1 fontconfig-2.3.93-normalize.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 fontconfig.spec, 1.59, 1.60 sources, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	.cvsignore fontconfig.spec sources 
Added Files:
	fontconfig-2.3.93-globaldir.patch 
	fontconfig-2.3.93-normalize.patch 
Log Message:
Newer cvs snapshot


fontconfig-2.3.93-globaldir.patch:
 fccache.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fontconfig-2.3.93-globaldir.patch ---
--- fontconfig-2.3.93/src/fccache.c.globaldir	2006-01-11 16:32:09.000000000 +0100
+++ fontconfig-2.3.93/src/fccache.c	2006-01-11 16:32:57.000000000 +0100
@@ -309,7 +309,7 @@
 	if (strncmp (d->name, dir, strlen(dir)) == 0)
 	{
 	    lseek (cache->fd, d->offset, SEEK_SET);
-	    if (!FcDirCacheConsume (cache->fd, dir, set, config))
+	    if (!FcDirCacheConsume (cache->fd, d->name, set, config))
 		return FcFalse;
             if (strcmp (d->name, dir) == 0)
 		ret = FcTrue;

fontconfig-2.3.93-normalize.patch:
 fc-cache.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fontconfig-2.3.93-normalize.patch ---
--- fontconfig-2.3.93.20060110.orig/fc-cache/fc-cache.c	2006-01-11 13:23:52.000000000 +0100
+++ fontconfig-2.3.93.20060110/fc-cache/fc-cache.c	2006-01-12 12:47:54.000000000 +0100
@@ -122,7 +122,7 @@
      * Now scan all of the directories into separate databases
      * and write out the results
      */
-    while ((dir = FcStrListNext (list)))
+    while ((dir = FcConfigNormalizeFontDir(config, FcStrListNext (list))))
     {
 	if (verbose)
 	{
@@ -275,7 +275,7 @@
 
     if (systemOnly)
 	FcConfigEnableHome (FcFalse);
-    config = FcInitLoadConfig ();
+    config = FcInitLoadConfigAndFonts ();
     if (!config)
     {
 	fprintf (stderr, "%s: Can't init font config library\n", argv[0]);




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Dec 2005 19:57:04 -0000	1.15
+++ .cvsignore	24 Jan 2006 20:52:34 -0000	1.16
@@ -1 +1,2 @@
 fontconfig-2.3.93.tar.gz
+fontconfig-2.3.93.cvs20060124.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- fontconfig.spec	17 Jan 2006 23:16:50 -0000	1.59
+++ fontconfig.spec	24 Jan 2006 20:52:34 -0000	1.60
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.3.93
-Release: 4
+Version: 2.3.93.cvs20060124
+Release: 1
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -13,7 +13,10 @@
 Source2: 50-no-hint-fonts.conf
 
 Patch1: fontconfig-2.3.93-defaultconfig.patch
-Patch2: fontconfig-2.3.91-crosscheck.patch
+# fix globar dir handling (Mike Fabian)
+Patch2: fontconfig-2.3.93-globaldir.patch
+# normalize path in fc-cache (Mike Fabian)
+Patch4: fontconfig-2.3.93-normalize.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -50,7 +53,8 @@
 %setup -q
 
 %patch1 -p1 -b .defaultconfig
-%patch2 -p1 -b .crosscheck
+%patch2 -p1 -b .globaldir
+%patch4 -p1 -b .normalize
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -120,6 +124,7 @@
 %{_sysconfdir}/fonts/fonts.dtd
 %config %{_sysconfdir}/fonts/fonts.conf
 %config %{_sysconfdir}/fonts/conf.d/*.conf
+%dir %{_localstatedir}/cache/fontconfig
 
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -134,6 +139,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060124-1
+- Newer cvs snapshot
+
 * Tue Jan 17 2006 Ray Strode <rstrode at redhat.com> - 2.3.93-4
 - apply patch from Tim Mayberry to correct aliasing and disable
   hinting for the two Chinese font names AR PL ShanHeiSun Uni 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	21 Dec 2005 19:57:05 -0000	1.16
+++ sources	24 Jan 2006 20:52:34 -0000	1.17
@@ -1 +1 @@
-0d80f23213a9ca0ea60dc4879efffec3  fontconfig-2.3.93.tar.gz
+b365d99c503ed19dbe2019f3df90945d  fontconfig-2.3.93.cvs20060124.tar.gz