[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Keith Packard]

 src/Makefile.am |    4 +++-
 src/fccharset.c |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
diff-tree c3796ac6061373bcf0276a931036987c01741215 (from 08bef687018f2391c2f2b6fc3849878c121b67dd)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Wed Sep 6 17:45:40 2006 -0700

    Charset hashing depended on uniqueness of leaves.
    
    Charset hashing actually use the value of the leaf pointers, which is
    clearly wrong, especially now that charsets are not shared across multiple
    font directories.

diff --git a/src/fccharset.c b/src/fccharset.c
index 1c2e2ea..5da1312 100644
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -1064,8 +1064,8 @@ FcCharSetHash (FcCharSet *fcs)
     int		i;
 
     /* hash in leaves */
-    for (i = 0; i < fcs->num * (int) (sizeof (FcCharLeaf *) / sizeof (FcChar32)); i++)
-	hash = ((hash << 1) | (hash >> 31)) ^ (FcChar32)(FcCharSetLeaf(fcs, i)->map);
+    for (i = 0; i < fcs->num; i++)
+	hash = ((hash << 1) | (hash >> 31)) ^ FcCharLeafHash (FcCharSetLeaf(fcs,i));
     /* hash in numbers */
     for (i = 0; i < fcs->num; i++)
 	hash = ((hash << 1) | (hash >> 31)) ^ *FcCharSetNumbers(fcs);
diff-tree 08bef687018f2391c2f2b6fc3849878c121b67dd (from 8e0b03f55085d6fd80f6a262b496303f5a74d2ad)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Wed Sep 6 17:43:08 2006 -0700

    Parallel build fix for fcalias.h and fcaliastail.h
    
    These are built from the same script, but creating a single dependency rule
    caused parallel make to run the script twice.

diff --git a/src/Makefile.am b/src/Makefile.am
index 98e353d..126d01a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -121,7 +121,9 @@ PUBLIC_FILES = \
 	$(top_srcdir)/fontconfig/fcfreetype.h \
 	$(top_srcdir)/fontconfig/fcprivate.h
 	
-$(ALIAS_FILES): $(top_srcdir)/src/makealias $(PUBLIC_FILES)
+fcaliastail.h: fcalias.h
+
+fcalias.h: $(top_srcdir)/src/makealias $(PUBLIC_FILES)
 	sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" $(PUBLIC_FILES)
 
 CLEANFILES := $(ALIAS_FILES)