From 0891da489f3e0661255403d7ea007684b49d8bd3 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 13 Jan 2013 15:19:49 +1100 Subject: update package fontconfig --- index.html | 2 +- src/fontconfig-1-fix_mktemp_s.patch | 29 +++++++++++++++++++++++++++++ src/fontconfig.mk | 3 ++- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 src/fontconfig-1-fix_mktemp_s.patch diff --git a/index.html b/index.html index 62838fd..23b6c5a 100644 --- a/index.html +++ b/index.html @@ -1078,7 +1078,7 @@ USE_OSGPLUGIN(<plugin2>) fontconfig - 2.10.2 + 2.10.91 fontconfig diff --git a/src/fontconfig-1-fix_mktemp_s.patch b/src/fontconfig-1-fix_mktemp_s.patch new file mode 100644 index 0000000..b0f7460 --- /dev/null +++ b/src/fontconfig-1-fix_mktemp_s.patch @@ -0,0 +1,29 @@ +This file is part of MXE. +See index.html for further information. + +diff -ur fontconfig-2.10.91.orig/configure.ac fontconfig-2.10.91/configure.ac +--- fontconfig-2.10.91.orig/configure.ac 2013-01-10 19:57:12.000000000 +1100 ++++ fontconfig-2.10.91/configure.ac 2013-01-13 14:40:45.000000000 +1100 +@@ -141,7 +141,7 @@ + # Checks for library functions. + AC_FUNC_VPRINTF + AC_FUNC_MMAP +-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp _mktemp_s strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat]) ++AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp _mktemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r 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 -ur fontconfig-2.10.91.orig/src/fccompat.c fontconfig-2.10.91/src/fccompat.c +--- fontconfig-2.10.91.orig/src/fccompat.c 2013-01-08 18:21:19.000000000 +1100 ++++ fontconfig-2.10.91/src/fccompat.c 2013-01-13 14:41:13.000000000 +1100 +@@ -95,8 +95,8 @@ + 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); + #else diff --git a/src/fontconfig.mk b/src/fontconfig.mk index 918fd6a..57a105b 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -3,7 +3,7 @@ PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_CHECKSUM := f20e4165d7706857fb9614a195c27434e2eb1fc5 +$(PKG)_CHECKSUM := 39aeb881c422fa0f0cd5e044ed05c94835fd89c4 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE) @@ -16,6 +16,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + cd '$(1)' && autoreconf -fi cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ -- cgit v0.12