Mercurial > mxe-octave

changeset 4835:799eb11f34bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fontconfig update to 2.13.0 * src/fontconfig-1.patch: update match * src/fontconfig.mk: add gettext dep, update version, checksum
author John Donoghue
date Thu, 30 Aug 2018 08:09:09 -0400
parents aa3c39814be9
children f5f47e338665
files src/fontconfig-1.patch src/fontconfig.mk
diffstat 2 files changed, 42 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontconfig-1.patch	Thu Aug 30 08:09:05 2018 -0400
+++ b/src/fontconfig-1.patch	Thu Aug 30 08:09:09 2018 -0400
@@ -1,16 +1,18 @@
 This file is part of MXE. See LICENSE.md for licensing 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
+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 f8dadf1..bde05c8 100644
+index 1111111..2222222 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -160,7 +160,7 @@ AC_TYPE_PID_T
+@@ -169,7 +169,7 @@ AC_TYPE_PID_T
  # Checks for library functions.
  AC_FUNC_VPRINTF
  AC_FUNC_MMAP
@@ -20,10 +22,10 @@
  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
+index 1111111..2222222 100644
 --- a/src/fccompat.c
 +++ b/src/fccompat.c
-@@ -152,8 +152,8 @@ FcMakeTempfile (char *template)
+@@ -155,8 +155,8 @@ FcMakeTempfile (char *template)
  	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
      }
  #  endif
@@ -34,6 +36,33 @@
         return -1;
     fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600);
  #endif
--- 
-1.8.4.5
+
+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)
+ 
--- a/src/fontconfig.mk	Thu Aug 30 08:09:05 2018 -0400
+++ b/src/fontconfig.mk	Thu Aug 30 08:09:09 2018 -0400
@@ -3,12 +3,12 @@
 
 PKG             := fontconfig
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.12.6
-$(PKG)_CHECKSUM := cae963814ba4bc41f3c96876604d33fc3abfc572
+$(PKG)_VERSION  := 2.13.0
+$(PKG)_CHECKSUM := b7bcc5d47211b7bbac35bb221860407db3601f5b
 $(PKG)_SUBDIR   := fontconfig-$($(PKG)_VERSION)
 $(PKG)_FILE     := fontconfig-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://fontconfig.org/release/$($(PKG)_FILE)
-$(PKG)_DEPS     := freetype expat
+$(PKG)_DEPS     := freetype expat gettext
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://fontconfig.org/release/' | \