Makefile.am | 2 +
README | 81 +++++++++++++++++++++++++++++++++++++++++++++++-
configure.in | 6 +--
doc/Makefile.am | 15 +++++---
fontconfig/fontconfig.h | 2 -
src/fcxml.c | 12 +++----
6 files changed, 101 insertions(+), 17 deletions(-)
New commits:
commit 54fb7967de3850cf7176dde12432ed48c628ebea
Author: Akira TAGOH <akira at tagoh.org>
Date: Mon Jun 11 20:15:15 2012 +0900
Bump version to 2.9.91
diff --git a/README b/README
index 07558b5..b9aabc8 100644
--- a/README
+++ b/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/configure.in b/configure.in
index 8cf9476..c06ad89 100644
--- a/configure.in
+++ b/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
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 21a476a..002c9cd 100644
--- a/fontconfig/fontconfig.h
+++ b/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))
commit 0b20bd0281a2247a047ef388ea2c6c58614d7b1a
Author: Mark Brand <mabrand at mabrand.nl>
Date: Mon Jun 11 20:13:02 2012 +0900
fix building for WIN32
8c255fb185d5651b57380b0a9443001e8051b29d moved some code out of switch
but did not declare ''buffer''. Also, replacing the
"break" with
"goto bail" neglected the WIN32 specific code.
diff --git a/src/fcxml.c b/src/fcxml.c
index 5201b3c..d70f70b 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -1850,6 +1850,9 @@ FcParseDir (FcConfigParse *parse)
{
const FcChar8 *attr, *data;
FcChar8 *prefix = NULL;
+#ifdef _WIN32
+ FcChar8 buffer[1000];
+#endif
attr = FcConfigGetAttribute (parse, "prefix");
if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0)
@@ -1886,7 +1889,7 @@ FcParseDir (FcConfigParse *parse)
if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20))
{
FcConfigMessage (parse, FcSevereError, "GetModuleFileName
failed");
- break;
+ goto bail;
}
/*
* Must use the multi-byte aware function to search
@@ -1905,7 +1908,7 @@ FcParseDir (FcConfigParse *parse)
if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20))
{
FcConfigMessage (parse, FcSevereError, "GetModuleFileName
failed");
- break;
+ goto bail;
}
p = _mbsrchr (data, ''\\'');
if (p) *p = ''\0'';
@@ -1919,7 +1922,7 @@ FcParseDir (FcConfigParse *parse)
if (rc == 0 || rc > sizeof (buffer) - 20)
{
FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory
failed");
- break;
+ goto bail;
}
if (data [strlen (data) - 1] != ''\\'')
strcat (data, "\\");
@@ -2510,9 +2513,6 @@ FcEndElement(void *userData, const XML_Char *name)
{
FcConfigParse *parse = userData;
FcChar8 *data;
-#ifdef _WIN32
- FcChar8 buffer[1000];
-#endif
if (!parse->pstack)
return;
commit 101825a129aa1a025e91fd55124e973fcdb31f9e
Author: Akira TAGOH <akira at tagoh.org>
Date: Mon Jun 11 18:43:56 2012 +0900
Generate bzip2-compressed tarball too
diff --git a/Makefile.am b/Makefile.am
index 1738c33..4e664ff 100644
--- a/Makefile.am
+++ b/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 \
commit fdb1155035da677368f762d8fb24ad2f470a9813
Author: Akira TAGOH <akira at tagoh.org>
Date: Mon Jun 11 18:39:37 2012 +0900
doc: Fix distcheck error again...
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e86abe9..328d72b 100644
--- a/doc/Makefile.am
+++ b/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)" != "$(srcdir)" ] && $(RM)
$(builddir)/fontconfig-user.sgml $(builddir)/fontconfig-devel.sgml
else
htmldoc_DATA += $(srcdir)/$(HTML_DIR)/*
all-local:
commit e8f16c9343f64266c3ec0048d867bfe23bdb6ec6
Author: Akira TAGOH <akira at tagoh.org>
Date: Mon Jun 11 17:48:12 2012 +0900
Bump libtool revision
diff --git a/configure.in b/configure.in
index f455cb5..8cf9476 100644
--- a/configure.in
+++ b/configure.in
@@ -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)