diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-07-07 02:46:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 02:46:45 (GMT) |
| commit | 00ac153c906ac4b551ab51dda265fc618e140902 (patch) | |
| tree | 53c92948c5ac3cfa4aa343d31d6449a1a4eaa4b3 | |
| parent | ee39f732c63d22b6fa9acbb3d911603a329a9e27 (diff) | |
| parent | be13247f6144eef4f05aa3f0248ff9db666eff96 (diff) | |
| download | mxe-00ac153c906ac4b551ab51dda265fc618e140902.zip mxe-00ac153c906ac4b551ab51dda265fc618e140902.tar.gz mxe-00ac153c906ac4b551ab51dda265fc618e140902.tar.bz2 | |
Merge pull request #1424 from tehnick/update-fontconfig
fontconfig: update from 2.11.1 to 2.12.0
| -rw-r--r-- | src/fontconfig-1-fixes.patch (renamed from src/fontconfig-1-fix_mktemp_s.patch) | 12 | ||||
| -rw-r--r-- | src/fontconfig.mk | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/fontconfig-1-fix_mktemp_s.patch b/src/fontconfig-1-fixes.patch index 88520a3..e3218c4 100644 --- a/src/fontconfig-1-fix_mktemp_s.patch +++ b/src/fontconfig-1-fixes.patch @@ -2,21 +2,21 @@ This file is part of MXE. See index.html for further information. From da6c9bfc3d57f3aa192972717cb5c84a56e1c422 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Fri, 29 Mar 2013 10:21:29 +0100 +From: MXE +Date: Tue, 05 Jul 2016 21:56:34 +0300 Subject: [PATCH] fix mktemp_s diff --git a/configure.ac b/configure.ac -index 1086a9a..d9fa572 100644 +index f8dadf1..bde05c8 100644 --- a/configure.ac +++ b/configure.ac -@@ -150,7 +150,7 @@ AC_TYPE_PID_T +@@ -160,7 +160,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP --AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink regcomp regerror regexec regfree fstatvfs fstatfs lstat]) -+AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink regcomp regerror regexec regfree fstatvfs fstatfs lstat]) +-AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat]) ++AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat]) dnl AC_CHECK_FUNCS doesn't check for header files. dnl posix_fadvise() may be not available in older libc. diff --git a/src/fontconfig.mk b/src/fontconfig.mk index e8f2b8e..6b68c92 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -3,8 +3,8 @@ PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11.1 -$(PKG)_CHECKSUM := dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 +$(PKG)_VERSION := 2.12.0 +$(PKG)_CHECKSUM := b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE) |