From be13247f6144eef4f05aa3f0248ff9db666eff96 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Tue, 5 Jul 2016 21:53:37 +0300
Subject: fontconfig: update from 2.11.1 to 2.12.0

---
 src/fontconfig-1-fix_mktemp_s.patch | 40 -------------------------------------
 src/fontconfig-1-fixes.patch        | 40 +++++++++++++++++++++++++++++++++++++
 src/fontconfig.mk                   |  4 ++--
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 src/fontconfig-1-fix_mktemp_s.patch
 create mode 100644 src/fontconfig-1-fixes.patch

diff --git a/src/fontconfig-1-fix_mktemp_s.patch b/src/fontconfig-1-fix_mktemp_s.patch
deleted file mode 100644
index 88520a3..0000000
--- a/src/fontconfig-1-fix_mktemp_s.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
-Subject: [PATCH] fix mktemp_s
-
-
-diff --git a/configure.ac b/configure.ac
-index 1086a9a..d9fa572 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,7 +150,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])
- 
- dnl AC_CHECK_FUNCS doesn't check for header files.
- dnl posix_fadvise() may be not available in older libc.
-diff --git a/src/fccompat.c b/src/fccompat.c
-index f4f3f5f..68a70ff 100644
---- a/src/fccompat.c
-+++ b/src/fccompat.c
-@@ -152,8 +152,8 @@ FcMakeTempfile (char *template)
- 	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
-     }
- #  endif
--#elif HAVE__MKTEMP_S
--   if (_mktemp_s(template, strlen(template) + 1) != 0)
-+#elif HAVE__MKTEMP
-+   if (_mktemp(template) != 0)
-        return -1;
-    fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600);
- #endif
--- 
-1.8.4.5
-
diff --git a/src/fontconfig-1-fixes.patch b/src/fontconfig-1-fixes.patch
new file mode 100644
index 0000000..e3218c4
--- /dev/null
+++ b/src/fontconfig-1-fixes.patch
@@ -0,0 +1,40 @@
+This file is part of MXE.
+See index.html for further information.
+
+From da6c9bfc3d57f3aa192972717cb5c84a56e1c422 Mon Sep 17 00:00:00 2001
+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 f8dadf1..bde05c8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -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 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/fccompat.c b/src/fccompat.c
+index f4f3f5f..68a70ff 100644
+--- a/src/fccompat.c
++++ b/src/fccompat.c
+@@ -152,8 +152,8 @@ FcMakeTempfile (char *template)
+ 	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+     }
+ #  endif
+-#elif HAVE__MKTEMP_S
+-   if (_mktemp_s(template, strlen(template) + 1) != 0)
++#elif HAVE__MKTEMP
++   if (_mktemp(template) != 0)
+        return -1;
+    fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600);
+ #endif
+-- 
+1.8.4.5
+
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)
-- 
cgit v0.12