You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
2.5 KiB
69 lines
2.5 KiB
This file is part of MXE. See LICENSE.md for licensing information.
|
|
|
|
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/2] fix mktemp_s
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 1111111..2222222 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -169,7 +169,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 1111111..2222222 100644
|
|
--- a/src/fccompat.c
|
|
+++ b/src/fccompat.c
|
|
@@ -155,8 +155,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
|
|
|
|
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)
|
|
|