README | 7 ++++++-
configure.ac | 15 ++++++++++++---
fontconfig/fontconfig.h | 2 +-
test/Makefile.am | 10 +++++++---
4 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit 690f822a1b26b089d86e9843746cab80f3c07fe3
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed May 31 20:10:00 2017 +0900
Bump version to 2.12.3
diff --git a/README b/README
index c2ee151..0827464 100644
--- a/README
+++ b/README
@@ -1,12 +1,17 @@
Fontconfig
Font configuration and customization library
- Version 2.12.2
+ Version 2.12.3
2017-05-31
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+2.12.3
+
+Akira TAGOH (1):
+ Fix make check fail with freetype-2.7.1 and 2.8 with PCF_CONFIG_OPTION_LONG_FAMILY_NAMES enabled.
+
2.12.2
Akira TAGOH (8):
diff --git a/configure.ac b/configure.ac
index d5b1410..15633ec 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.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.12.3], [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 2c784a8..6822953 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 2
+#define FC_REVISION 3
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
commit d33be230293978ad3f94b184f2c2770c108269c2
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed May 31 18:25:01 2017 +0900
Fix make check fail with freetype-2.7.1 and 2.8 with PCF_CONFIG_OPTION_LONG_FAMILY_NAMES enabled.
diff --git a/configure.ac b/configure.ac
index 5b3c45d..d5b1410 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,8 +307,17 @@ dnl The outcome of the family property has been changed in freetype-2.7.1.
dnl Our test cases relies on it and need to update the dependency to get it success.
dnl However it isn't exactly required to run fontconfig itself.
dnl so adding another test here for compatibility. it might be simplified in the future.
-PKG_CHECK_EXISTS([freetype2 >= 19.0.13], [have_freetype_2_7_1=yes], [have_freetype_2_7_1=no])
-AM_CONDITIONAL(FREETYPE_2_7_1, test "x$have_freetype_2_7_1" = xyes)
+PKG_CHECK_EXISTS([freetype2 = 19.0.13], [have_freetype_2_7_1=yes], [have_freetype_2_7_1=no])
+PKG_CHECK_EXISTS([freetype2 >= 20.0.14],
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <ft2build.h>
+ #include FT_CONFIG_OPTIONS_H
+ #ifndef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+ # error "No pcf long family names support"
+ #endif
+ ]])], [have_pcf_long_family_names=yes], [have_pcf_long_family_names=no])],
+ [have_pcf_long_family_names=no])
+AM_CONDITIONAL(FREETYPE_PCF_LONG_FAMILY_NAMES, test "x$have_freetype_2_7_1" = xyes -o "x$have_pcf_long_family_names" = xyes)
AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS)
diff --git a/test/Makefile.am b/test/Makefile.am
index 92e92be..df12587 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,8 @@
+if FREETYPE_PCF_LONG_FAMILY_NAMES
+check_SCRIPTS=run-test271.sh
+else
check_SCRIPTS=run-test.sh
+endif
TEST_EXTENSIONS = \
.sh \
$(NULL)
@@ -10,13 +14,13 @@ AM_TESTS_ENVIRONMENT= \
SH_LOG_COMPILER = sh
-if FREETYPE_2_7_1
+if FREETYPE_PCF_LONG_FAMILY_NAMES
TESTS=run-test271.sh
else
TESTS=run-test.sh
endif
-TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
+TESTDATA=4x6.pcf 8x16.pcf out.expected out271.expected fonts.conf.in
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@@ -46,7 +50,7 @@ check_PROGRAMS += test-bz96676
test_bz96676_LDADD = $(top_builddir)/src/libfontconfig.la
TESTS += test-bz96676
-EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA)
+EXTRA_DIST=run-test.sh run-test271.sh $(TESTDATA)
CLEANFILES=
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/fontconfig
