New upstream release.

This commit is contained in:
Akira TAGOH 2018-02-15 22:34:39 +09:00
parent 54fea1e356
commit 4b36dd488b

View File

@ -1,12 +1,14 @@
diff -pruN fontconfig-2.12.91.orig/configure.ac fontconfig-2.12.91/configure.ac diff -pruN fontconfig-2.12.93.orig/configure.ac fontconfig-2.12.93/configure.ac
--- fontconfig-2.12.91.orig/configure.ac 2017-12-14 15:44:20.000000000 +0900 --- fontconfig-2.12.93.orig/configure.ac 2018-02-15 22:01:54.000000000 +0900
+++ fontconfig-2.12.91/configure.ac 2017-12-22 16:20:11.556717785 +0900 +++ fontconfig-2.12.93/configure.ac 2018-02-15 22:33:42.353941393 +0900
@@ -314,7 +314,7 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv, @@ -308,8 +308,8 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,
# Checks for FreeType # Checks for FreeType
# #
dnl See http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT for versioning in freetype dnl See http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT for versioning in freetype
-PKG_CHECK_MODULES(FREETYPE, freetype2 >= 21.0.15) -PKG_CHECK_MODULES(FREETYPE, freetype2 >= 21.0.15)
-PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2 >= 21.0.15"
+PKG_CHECK_MODULES(FREETYPE, freetype2 >= 20.0.14) +PKG_CHECK_MODULES(FREETYPE, freetype2 >= 20.0.14)
PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2" +PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2 >= 20.0.14"
AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS)