diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2018-06-17 12:10:06 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2018-06-17 12:12:55 (GMT) |
| commit | 7a21a11ef3c7e26d40c968f8905bfd8a323ac37d (patch) | |
| tree | dab16fdfd2a66ecdaea90dc8dc9b8bb1e399633c | |
| parent | c40e62265457b35547ed845a19ae22cedd57b800 (diff) | |
| download | mxe-7a21a11ef3c7e26d40c968f8905bfd8a323ac37d.zip mxe-7a21a11ef3c7e26d40c968f8905bfd8a323ac37d.tar.gz mxe-7a21a11ef3c7e26d40c968f8905bfd8a323ac37d.tar.bz2 | |
update fontconfig
| -rw-r--r-- | src/fontconfig-1-fixes.patch | 36 | ||||
| -rw-r--r-- | src/fontconfig.mk | 4 |
2 files changed, 35 insertions, 5 deletions
diff --git a/src/fontconfig-1-fixes.patch b/src/fontconfig-1-fixes.patch index 7b01ebb..7bf07ac 100644 --- a/src/fontconfig-1-fixes.patch +++ b/src/fontconfig-1-fixes.patch @@ -5,14 +5,14 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "fix@me" <fix@me> Date: Tue, 5 Jul 2016 21:56:34 +0300 -Subject: [PATCH 1/1] fix mktemp_s +Subject: [PATCH 1/2] fix mktemp_s diff --git a/configure.ac b/configure.ac index 1111111..2222222 100644 --- a/configure.ac +++ b/configure.ac -@@ -160,7 +160,7 @@ AC_TYPE_PID_T +@@ -169,7 +169,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP @@ -25,7 +25,7 @@ diff --git a/src/fccompat.c b/src/fccompat.c index 1111111..2222222 100644 --- a/src/fccompat.c +++ b/src/fccompat.c -@@ -152,8 +152,8 @@ FcMakeTempfile (char *template) +@@ -155,8 +155,8 @@ FcMakeTempfile (char *template) fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); } # endif @@ -36,3 +36,33 @@ index 1111111..2222222 100644 return -1; fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600); #endif + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <akira@tagoh.org> +Date: Fri, 9 Mar 2018 11:55:43 +0900 +Subject: [PATCH 2/2] Fix the build issue again on MinGW with enabling nls + +Taken from https://cgit.freedesktop.org/fontconfig/patch/?id=07bd14c5c7fed103020dc9b630d6a254861ada07 + +diff --git a/src/Makefile.am b/src/Makefile.am +index 1111111..2222222 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -82,7 +82,7 @@ AM_CPPFLAGS = \ + -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ + -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \ + -DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"' +-LDADD = $(INTLLIBS) ++LDADD = $(LIBINTL) + + EXTRA_DIST += makealias + +@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la + libfontconfig_la_LDFLAGS = \ + -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols) + +-libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS) ++libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL) + + libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency) + diff --git a/src/fontconfig.mk b/src/fontconfig.mk index c9f5885..c640aa3 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -3,8 +3,8 @@ PKG := fontconfig $(PKG)_WEBSITE := https://fontconfig.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 2.12.6 -$(PKG)_CHECKSUM := cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017 +$(PKG)_VERSION := 2.13.0 +$(PKG)_CHECKSUM := 91dde8492155b7f34bb95079e79be92f1df353fcc682c19be90762fd3e12eeb9 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://fontconfig.org/release/$($(PKG)_FILE) |