fontconfig: Branch 'master' - 3 commits

 README                  |   33 +++++++++++++++++++++++++++++++--
 configure.ac            |    4 ++--
 fontconfig/fontconfig.h |    2 +-
 src/Makefile.am         |    7 ++++++-
 4 files changed, 40 insertions(+), 6 deletions(-)

New commits:
commit 01085e07857cddf382db736a9e061f92f50397d6
Author: Akira TAGOH <[email protected]>
Date:   Wed Jul 5 17:37:26 2017 +0900

    Bump version to 2.12.4

diff --git a/README b/README
index 0827464..3a7390d 100644
--- a/README
+++ b/README
@@ -1,12 +1,41 @@
                               Fontconfig
              Font configuration and customization library
-                            Version 2.12.3
-                              2017-05-31
+                            Version 2.12.4
+                              2017-07-05
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.12.4
+
+Akira TAGOH (5):
+      Force regenerate fcobjshash.h when updating Makefile
+      Fix the build failure when srcdir != builddir and have gperf 3.1 or later installed
+      Add a testcase for Bug#131804
+      Update libtool revision
+      Fix distcheck error
+
+Florent Rougon (6):
+      FcCharSetHash(): use the 'numbers' values to compute the hash
+      fc-lang: gracefully handle the case where the last language initial is < 'z'
+      Fix an off-by-one error in FcLangSetIndex()
+      Fix erroneous test on language id in FcLangSetPromote()
+      FcLangSetCompare(): fix bug when two charsets come from different "buckets"
+      FcCharSetFreezeOrig(), FcCharSetFindFrozen(): use all buckets of freezer->orig_hash_table
+
+Helmut Grohne (1):
+      fix cross compilation
+
+Jan Alexander Steffens (heftig) (1):
+      Fix testing PCF_CONFIG_OPTION_LONG_FAMILY_NAMES (CFLAGS need to be right)
+
+Josselin Mouette (1):
+      Treat C.UTF-8 and C.utf8 locales as built in the C library.
+
+Masamichi Hosoda (1):
+      Bug 99360 - Fix cache file update on MinGW
+
 2.12.3
 
 Akira TAGOH (1):
diff --git a/configure.ac b/configure.ac
index 12e4c3d..74b6795 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
-AC_INIT([fontconfig], [2.12.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.12.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
 AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 6822953..2e35b6b 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -52,7 +52,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	12
-#define FC_REVISION	3
+#define FC_REVISION	4
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit 047b42fccab0dc99726356a9c8c7c50aea806f60
Author: Akira TAGOH <[email protected]>
Date:   Wed Jul 5 17:35:28 2017 +0900

    Fix distcheck error

diff --git a/src/Makefile.am b/src/Makefile.am
index bd5ac1f..e5c1942 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -202,7 +202,12 @@ stamp-fcstdint: $(top_builddir)/config.status
 	@touch $@
 
 CLEANFILES = $(ALIAS_FILES) fontconfig.def
-DISTCLEANFILES = stamp-fcstdint fcstdint.h stamp-fcobjshash.gperf
+DISTCLEANFILES = 	\
+	stamp-fcstdint	\
+	fcstdint.h	\
+	stamp-fcobjshash.gperf	\
+	fcobjshash.h	\
+	fcobjshash.gperf
 
 fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
 	echo Generating $@
commit c35e8df46dc041596674083772e59d5934635ae2
Author: Akira TAGOH <[email protected]>
Date:   Wed Jul 5 17:20:00 2017 +0900

    Update libtool revision

diff --git a/configure.ac b/configure.ac
index 50ab113..12e4c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ 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=10
-LIBT_REVISION=3
+LIBT_REVISION=4
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
 LIBT_AGE=9
_______________________________________________
Fontconfig mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/fontconfig