Merge remote-tracking branch 'origin/released'

13 files changed, 105 insertions, 49 deletions

diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am
index 1738c3329..4e664ffea 100644
--- a/fontconfig/Makefile.am
+++ b/fontconfig/Makefile.am
@@ -26,6 +26,8 @@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \
 	fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
 	conf.d $(DOCSRC) test
 
+AUTOMAKE_OPTIONS = dist-bzip2
+
 EXTRA_DIST = \
         fontconfig.pc.in \
         fonts.conf.in \
diff --git a/fontconfig/README b/fontconfig/README
index 07558b596..b9aabc85f 100644
--- a/fontconfig/README
+++ b/fontconfig/README
@@ -1,12 +1,91 @@
                               Fontconfig
              Font configuration and customization library
-                              Version 2.9
+                       Version 2.9.91 (2.10 RC1)
                               2012-03-11
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.9.91 (2.10 RC1)
+
+Akira TAGOH (60):
+      [doc] Update the path for cache files and the version.
+      [doc] Update for cachedir.
+      Revert "Fix a build fail on some environment."
+      Revert "Fix a build fail on some environment"
+      Fix a build issue due to the use of non-portable variables
+      Get rid of the prerequisites from the sufix rules
+      Bug 39914 - Please tag the cache directory with CACHEDIR.TAG
+      fc-cache: improvement of the fix for Bug#39914.
+      fcmatch: Set FcResultMatch at the end if the return value is valid.
+      Bug 47703 - SimSun default family
+      Bug 17722 - Don't overwrite user's configurations in default config
+      Fix a memory leak in FcDirScanConfig()
+      Bug 17832 - Memory leaks due to FcStrStaticName use for external patterns
+      fcpat: Increase the number of buckets in the shared string hash table
+      Fix the hardcoded cache file suffix
+      Move workaround macros for fat binaries into the separate header file
+      Bug 48020 - Fix for src/makealias on Solaris 10
+      Bug 24729 - [ne_NP] Fix ortho file
+      doc: Add contains and not_contains operators and elements
+      Use AC_HELP_STRING instead of formatting manually
+      Use pkgconfig to check builddeps
+      Bug 29341 - Make some fontconfig paths configurable
+      Bug 22862 - <alias> ignores <match> <test>s
+      Bug 26830 - Add search for libiconv non-default directory
+      Bug 28491 - Allow matching on FC_FILE
+      Bug 48573 - platform without regex do not have also REG_XXX defines
+      Bug 27526 - Compatibility fix for old windows sytems
+      Add --with-expat, --with-expat-includes and --with-expat-lib back.
+      doc: Fix a typo of the environment variable name.
+      Bug 25151 - Move cleanCacheDirectory() from fc-cache.c into
+      Rework to avoid adding the unexpected value to ICONV_CFLAGS and ICONV_LIBS
+      Fix a build issue again when no regex functions available
+      C++11 requires a space between literal and identifier
+      Bug 47721 - Add ChromeOS fonts to 30-metric-aliases.conf
+      Create CACHEDIR.TAG when fc-cache is run or only when the cache directory is created at the runtime.
+      Add --enable-iconv option to configure
+      Bug 27765 - FcMatch() returns style in wrong language
+      Disable iconv support anyway...
+      Bug 39278 - make usage of mmap optional
+      Output more verbose debugging log to show where to insert the element into the value list
+      fonts.conf: keeps same binding for alternatives
+      fcarch.c: get rid of the duplicate definition of FC_MAX
+      Bug 19128 - Handling whitespace in aliases
+      Bug 20411 - fontconfig doesn't match FreeDesktop directories specs
+      Correct the example
+      Bug 33644 - Fontconfig doesn't match correctly in <test>
+      fcatomic: fallback to create a directory with FcAtomicLock
+      Move statfs/statvfs wrapper to fcstat.c and add a test for the mtime broken fs
+      Fix the build fail on Solaris
+      Fix a typo and polish the previous change
+      Fix the wrong estimation for the memory usage information in fontconfig
+      Bug 32853 - Export API to get the default language
+      fcdefault: fallback if the environment variables are empty
+      Add the default language to the pattern prior to do build the substitution
+      fcdefault: no need to set FC_LANG in FcDefaultSubstitute() anymore
+      fcdefault: Add the lang object at FcConfigSubstituteWithPat() only when kind is FcMatchPattern
+      Bug 50525 - superfluous whitespace in the style
+      Bump libtool revision
+      doc: Fix distcheck error again...
+      Generate bzip2-compressed tarball too
+
+Jeremy Huddleston (1):
+      fcarch: Check for architecture signature at compile time rather than configure time
+
+Keith Packard (3):
+      Use posix_fadvise to speed startup
+      Extra ',' in AC_ARG_WITH(arch causes arch to never be autodetected
+      Deal with architectures where ALIGNOF_DOUBLE < 4
+
+Mark Brand (1):
+      fix building for WIN32
+
+Mikhail Gusarov (2):
+      Move FcStat to separate compilation unit
+      Fix cache aging for fonts on FAT filesystem under Linux
+
 2.9
 
 Akira TAGOH (28):
diff --git a/fontconfig/conf.d/20-fix-globaladvance.conf b/fontconfig/conf.d/20-fix-globaladvance.conf
deleted file mode 100644
index c62ba597e..000000000
--- a/fontconfig/conf.d/20-fix-globaladvance.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-<!--
-  Some Asian fonts misadvertise themselves as monospaced when
-  in fact they are dual-spaced (half and full).  This makes
-  FreeType very confused as it forces all widths to match.
-  Undo this magic by disabling the width forcing code -->
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true"><string>GulimChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true"><string>DotumChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true"><string>BatangChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family" compare="eq" ignore-blanks="true"><string>GungsuhChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-</fontconfig>
diff --git a/fontconfig/conf.d/Makefile.am b/fontconfig/conf.d/Makefile.am
index 93bf8d321..7f14920d0 100644
--- a/fontconfig/conf.d/Makefile.am
+++ b/fontconfig/conf.d/Makefile.am
@@ -25,7 +25,6 @@ DOC_FILES= \
 	README
 
 CONF_LINKS = \
-	20-fix-globaladvance.conf \
 	20-unhint-small-vera.conf \
 	30-urw-aliases.conf \
 	30-metric-aliases.conf \
@@ -58,7 +57,6 @@ template_DATA =				\
 	11-lcdfilter-default.conf	\
 	11-lcdfilter-legacy.conf	\
 	11-lcdfilter-light.conf		\
-	20-fix-globaladvance.conf	\
 	20-unhint-small-vera.conf	\
 	25-unhint-nonlatin.conf		\
 	30-urw-aliases.conf		\
diff --git a/fontconfig/configure.in b/fontconfig/configure.in
index f455cb5a5..c06ad8900 100644
--- a/fontconfig/configure.in
+++ b/fontconfig/configure.in
@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h
-AM_INIT_AUTOMAKE(fontconfig, 2.9.0)
+AM_INIT_AUTOMAKE(fontconfig, 2.9.91)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl libtool versioning
@@ -41,11 +41,11 @@ dnl libtool versioning
 dnl bump revision when fixing bugs
 dnl bump current and age, reset revision to zero when adding APIs
 dnl bump current, leave age, reset revision to zero when changing/removing APIS
-LIBT_CURRENT=6
+LIBT_CURRENT=7
 LIBT_REVISION=0
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
-LIBT_AGE=5
+LIBT_AGE=6
 
 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
 AC_SUBST(LIBT_VERSION_INFO)
diff --git a/fontconfig/doc/Makefile.am b/fontconfig/doc/Makefile.am
index e86abe9e3..2e7363cf6 100644
--- a/fontconfig/doc/Makefile.am
+++ b/fontconfig/doc/Makefile.am
@@ -82,9 +82,9 @@ DOC_FUNCS_FNCS =		\
 	fcstrset.fncs		\
 	fcvalue.fncs		\
 	$(NULL)
-SGML_FILES =				\
-	$(srcdir)/fontconfig-user.sgml	\
-	$(srcdir)/fontconfig-devel.sgml	\
+SGML_FILES =			\
+	fontconfig-user.sgml	\
+	fontconfig-devel.sgml	\
 	$(NULL)
 LOCAL_SGML_FILES =			\
 	local-fontconfig-user.sgml	\
@@ -156,7 +156,7 @@ if CROSS_COMPILING
 else
 .fncs.sgml:
 	$(AM_V_GEN) $(RM) $@; \
-	$(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$*.fncs' > $*.sgml
+	$(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$(srcdir)/$*.fncs' > $*.sgml
 endif
 .sgml.txt:
 	$(AM_V_GEN) $(RM) $@; \
@@ -198,13 +198,16 @@ $(HTML_DIR): local-fontconfig-devel.sgml $(DOCS_DEPS)
 	$(AM_V_GEN) $(RM) -r $@; \
 	$(DOC2HTML) -V '%use-id-as-filename%' -o $@ local-fontconfig-devel.sgml
 local-fontconfig-user.sgml: $(srcdir)/fontconfig-user.sgml
-	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@
+	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@;	\
+	[ ! -f $(builddir)/fontconfig-user.sgml ] && cp -a $(srcdir)/fontconfig-user.sgml $(builddir)/fontconfig-user.sgml || :
 local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml
-	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-devel.sgml $@
+	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-devel.sgml $@;	\
+	[ ! -f $(builddir)/fontconfig-devel.sgml ] && cp -a $(srcdir)/fontconfig-devel.sgml $(builddir)/fontconfig-devel.sgml || :
 #
 all-local: $(BUILT_DOCS) $(HTML_DIR)/*
 clean-local:
 	$(RM) -r $(HTML_DIR) devel-man
+	[ "x$(builddir)" != "x$(srcdir)" ] && $(RM) $(builddir)/fontconfig-user.sgml $(builddir)/fontconfig-devel.sgml || :
 else
 htmldoc_DATA += $(srcdir)/$(HTML_DIR)/*
 all-local:
diff --git a/fontconfig/doc/fontconfig-devel.sgml b/fontconfig/doc/fontconfig-devel.sgml
index ab390925d..79cceb1ec 100644
--- a/fontconfig/doc/fontconfig-devel.sgml
+++ b/fontconfig/doc/fontconfig-devel.sgml
@@ -164,7 +164,7 @@ convenience for the application's rendering mechanism.
     verticallayout FC_VERTICAL_LAYOUT     Bool    Use vertical layout
     autohint       FC_AUTOHINT            Bool    Use autohinter instead of
                                                   normal hinter
-    globaladvance  FC_GLOBAL_ADVANCE      Bool    Use font global advance data
+    globaladvance  FC_GLOBAL_ADVANCE      Bool    Use font global advance data (deprecated)
     file           FC_FILE                String  The filename holding the font
     index          FC_INDEX               Int     The index of the font within
                                                   the file
diff --git a/fontconfig/doc/fontconfig-user.sgml b/fontconfig/doc/fontconfig-user.sgml
index f29cfe09b..92d0db8bf 100644
--- a/fontconfig/doc/fontconfig-user.sgml
+++ b/fontconfig/doc/fontconfig-user.sgml
@@ -112,7 +112,7 @@ convenience for the applications' rendering mechanism.
   hintstyle       Int     Automatic hinting style
   verticallayout  Bool    Use vertical layout
   autohint        Bool    Use autohinter instead of normal hinter
-  globaladvance   Bool    Use font global advance data
+  globaladvance   Bool    Use font global advance data (deprecated)
   file            String  The filename holding the font
   index           Int     The index of the font within the file
   ftface          FT_Face Use the specified FreeType face object
diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h
index 21a476a02..238ab650d 100644
--- a/fontconfig/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig/fontconfig.h
@@ -52,7 +52,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	9
-#define FC_REVISION	0
+#define FC_REVISION	91
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
@@ -85,6 +85,7 @@ typedef int		FcBool;
 #define FC_HINT_STYLE	    "hintstyle"		/* Int */
 #define FC_VERTICAL_LAYOUT  "verticallayout"	/* Bool (false) */
 #define FC_AUTOHINT	    "autohint"		/* Bool (false) */
+/* FC_GLOBAL_ADVANCE is deprecated. this is simply ignored on freetype 2.4.5 or later */
 #define FC_GLOBAL_ADVANCE   "globaladvance"	/* Bool (true) */
 #define FC_WIDTH	    "width"		/* Int */
 #define FC_FILE		    "file"		/* String */
diff --git a/fontconfig/src/fcdefault.c b/fontconfig/src/fcdefault.c
index c6b5669ed..8ad1b1e90 100644
--- a/fontconfig/src/fcdefault.c
+++ b/fontconfig/src/fcdefault.c
@@ -32,6 +32,7 @@ static const struct {
     { FC_HINTING_OBJECT,	   FcTrue	},  /* !FT_LOAD_NO_HINTING */
     { FC_VERTICAL_LAYOUT_OBJECT,   FcFalse	},  /* FC_LOAD_VERTICAL_LAYOUT */
     { FC_AUTOHINT_OBJECT,	   FcFalse	},  /* FC_LOAD_FORCE_AUTOHINT */
+    /* XXX: FC_GLOBAL_ADVANCE is deprecated */
     { FC_GLOBAL_ADVANCE_OBJECT,    FcTrue	},  /* !FC_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */
     { FC_EMBEDDED_BITMAP_OBJECT,   FcTrue 	},  /* !FC_LOAD_NO_BITMAP */
     { FC_DECORATIVE_OBJECT,	   FcFalse	},
diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h
index 93f0f2730..0444ea926 100644
--- a/fontconfig/src/fcint.h
+++ b/fontconfig/src/fcint.h
@@ -870,7 +870,7 @@ FcListPatternMatchAny (const FcPattern *p,
 #define FC_HINTING_OBJECT	17
 #define FC_VERTICAL_LAYOUT_OBJECT	18
 #define FC_AUTOHINT_OBJECT	19
-#define FC_GLOBAL_ADVANCE_OBJECT	20
+#define FC_GLOBAL_ADVANCE_OBJECT	20	/* deprecated */
 #define FC_FILE_OBJECT		21
 #define FC_INDEX_OBJECT		22
 #define FC_RASTERIZER_OBJECT	23
diff --git a/fontconfig/src/fcname.c b/fontconfig/src/fcname.c
index d51307bec..6a1fc12e8 100644
--- a/fontconfig/src/fcname.c
+++ b/fontconfig/src/fcname.c
@@ -54,7 +54,7 @@ static const FcObjectType _FcBaseObjectTypes[] = {
     { FC_HINTING,	FcTypeBool, },
     { FC_VERTICAL_LAYOUT,   FcTypeBool, },
     { FC_AUTOHINT,	FcTypeBool, },
-    { FC_GLOBAL_ADVANCE,    FcTypeBool, },
+    { FC_GLOBAL_ADVANCE,    FcTypeBool, },	/* deprecated */
     { FC_FILE,		FcTypeString, },
     { FC_INDEX,		FcTypeInteger, },
     { FC_RASTERIZER,	FcTypeString, },
@@ -442,7 +442,7 @@ static const FcConstant _FcBaseConstants[] = {
     { (FcChar8 *) "hinting",	    "hinting",	    FcTrue },
     { (FcChar8 *) "verticallayout", "verticallayout",	FcTrue },
     { (FcChar8 *) "autohint",	    "autohint",	    FcTrue },
-    { (FcChar8 *) "globaladvance",  "globaladvance",	FcTrue },
+    { (FcChar8 *) "globaladvance",  "globaladvance",	FcTrue }, /* deprecated */
     { (FcChar8 *) "outline",	    "outline",	    FcTrue },
     { (FcChar8 *) "scalable",	    "scalable",	    FcTrue },
     { (FcChar8 *) "minspace",	    "minspace",	    FcTrue },
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c
index 343208617..b8c658d55 100644
--- a/fontconfig/src/fcxml.c
+++ b/fontconfig/src/fcxml.c
@@ -1854,6 +1854,9 @@ FcParseDir (FcConfigParse *parse)
     const FcChar8 *attr;
     FcChar8 *data;
     FcChar8 *prefix = NULL;
+#ifdef _WIN32
+    FcChar8         buffer[1000];
+#endif
 
     attr = FcConfigGetAttribute (parse, "prefix");
     if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0)
@@ -2514,9 +2517,6 @@ FcEndElement(void *userData, const XML_Char *name)
 {
     FcConfigParse   *parse = userData;
     FcChar8	    *data;
-#ifdef _WIN32
-    FcChar8         buffer[1000];
-#endif
 
     if (!parse->pstack)
 	return;