diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2014-11-12 11:44:29 +0100 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2014-11-12 11:44:29 +0100 |
| commit | 74b6864480b710d9ab399cb69d19f82d6a92e627 (patch) | |
| tree | ed93b47af7de121bfe9a9ff887e85b39f9898cb9 /recipes | |
| parent | d06263b63f6e33558b116660661dc7cfb1caa163 (diff) | |
fontconfig: don't use _mktemp_s that's not available in XP
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/fontconfig.recipe | 1 | ||||
| -rw-r--r-- | recipes/fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/recipes/fontconfig.recipe b/recipes/fontconfig.recipe index 4e7b93bc..fa451dd7 100644 --- a/recipes/fontconfig.recipe +++ b/recipes/fontconfig.recipe @@ -15,6 +15,7 @@ class Recipe(recipe.Recipe): 'fontconfig/0002-Port-to-Android.patch', 'fontconfig/0003-configure-Allow-static-build.patch', 'fontconfig/0001-Do-not-build-tests-on-windows.patch', + 'fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch', ] files_libs = ['libfontconfig'] diff --git a/recipes/fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch b/recipes/fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch new file mode 100644 index 00000000..bac1fa81 --- /dev/null +++ b/recipes/fontconfig/0001-Don-t-use-_mktemp_s-which-is-not-available-in-XP.patch @@ -0,0 +1,41 @@ +From 6f510bf9c9b0f86c40b8f5afa05f409493d8f7b8 Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey <ylatuya@gmail.com> +Date: Wed, 15 Oct 2014 16:14:19 +0200 +Subject: [PATCH] Don't use _mktemp_s which is not available in XP + +--- + configure.ac | 2 +- + src/fccompat.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 135e95a..f014ecf 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.7.10.msysgit.1 + |