Mercurial > mxe-octave

changeset 4266:472c440a678b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fontconfig: update to 2.12.1 * src/fontconfig-1.patch: updated patch * src/fontconfig.mk: update version, checksum * src/mingw-fontconfig-ln_s.patch: removed * dist-files.mk: removed mingw-fontconfig-ln_s.patch
author John D
date Wed, 14 Dec 2016 08:09:59 -0500
parents eeeff365b6f9
children e3f9496a54fa
files dist-files.mk src/fontconfig-1.patch src/fontconfig.mk src/mingw-fontconfig-ln_s.patch
diffstat 4 files changed, 40 insertions(+), 105 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Tue Dec 13 11:03:39 2016 -0500
+++ b/dist-files.mk	Wed Dec 14 08:09:59 2016 -0500
@@ -312,7 +312,6 @@
   mingw-cairo-1-ssize-t-defined.patch \
   mingw-cfitsio-1-fixes.patch \
   mingw-epstool-1-fixes.patch \
-  mingw-fontconfig-ln_s.patch \
   mingw-glib-1-fixes.patch \
   mingw-glib-2-fixes.patch \
   mingw-hdf5-1.patch \
--- a/src/fontconfig-1.patch	Tue Dec 13 11:03:39 2016 -0500
+++ b/src/fontconfig-1.patch	Wed Dec 14 08:09:59 2016 -0500
@@ -1,73 +1,39 @@
-diff -u fontconfig-2.11.0.orig/Makefile.in fontconfig-2.11.0/Makefile.in
---- fontconfig-2.11.0.orig/Makefile.in	2014-02-01 14:30:40.000000000 -0500
-+++ fontconfig-2.11.0/Makefile.in	2014-02-01 14:30:58.000000000 -0500
-@@ -997,7 +997,7 @@
- 	mv $@.tmp $@
+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
+
+
+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])
  
- install-data-local: fonts.conf
--	$(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
-+	$(mkinstalldirs) $(DESTDIR)$(baseconfigdir) #$(DESTDIR)$(fc_cachedir)
- 	if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
- 	  echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
- 	  mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
-diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.am fontconfig-2.11.0/conf.d/Makefile.am
---- fontconfig-2.11.0.orig/conf.d/Makefile.am	2014-02-06 16:51:06 -0500
-+++ fontconfig-2.11.0/conf.d/Makefile.am	2014-02-06 16:53:20 -0500
-@@ -88,9 +88,9 @@
- 	@(echo cd $(DESTDIR)$(configdir);			\
- 	  cd $(DESTDIR)$(configdir);				\
- 	  for i in $(CONF_LINKS); do				\
--	    echo $(RM) $$i";" ln -s $(templatedir)/$$i .;	\
-+	    echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .;	\
- 	    $(RM) $$i;						\
--	    ln -s $(templatedir)/$$i .;				\
-+	    $(LN_S) $(templatedir)/$$i .;				\
- 	  done)
- uninstall-local:
- 	@(echo cd $(DESTDIR)$(configdir);			\
-diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.in fontconfig-2.11.0/conf.d/Makefile.in
---- fontconfig-2.11.0.orig/conf.d/Makefile.in	2014-02-06 16:51:06 -0500
-+++ fontconfig-2.11.0/conf.d/Makefile.in	2014-02-06 16:53:51 -0500
-@@ -632,9 +632,9 @@
- 	@(echo cd $(DESTDIR)$(configdir);			\
- 	  cd $(DESTDIR)$(configdir);				\
- 	  for i in $(CONF_LINKS); do				\
--	    echo $(RM) $$i";" ln -s $(templatedir)/$$i .;	\
-+	    echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .;	\
- 	    $(RM) $$i;						\
--	    ln -s $(templatedir)/$$i .;				\
-+	    $(LN_S) $(templatedir)/$$i .;				\
- 	  done)
- uninstall-local:
- 	@(echo cd $(DESTDIR)$(configdir);			\
+ 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 -ur fontconfig-2.11.0.orig/conf.d/Makefile.am fontconfig-2.11.0/conf.d/Makefile.am
---- fontconfig-2.11.0.orig/conf.d/Makefile.am	2014-02-06 19:41:13 -0500
-+++ fontconfig-2.11.0/conf.d/Makefile.am	2014-02-06 19:54:52 -0500
-@@ -88,9 +88,9 @@
- 	@(echo cd $(DESTDIR)$(configdir);			\
- 	  cd $(DESTDIR)$(configdir);				\
- 	  for i in $(CONF_LINKS); do				\
--	    echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .;	\
-+	    echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .;	\
- 	    $(RM) $$i;						\
--	    $(LN_S) $(templatedir)/$$i .;				\
-+	    $(LN_S) $(DESTDIR)$(templatedir)/$$i .;		\
- 	  done)
- uninstall-local:
- 	@(echo cd $(DESTDIR)$(configdir);			\
-diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.in fontconfig-2.11.0/conf.d/Makefile.in
---- fontconfig-2.11.0.orig/conf.d/Makefile.in	2014-02-06 19:41:13 -0500
-+++ fontconfig-2.11.0/conf.d/Makefile.in	2014-02-06 19:54:00 -0500
-@@ -632,9 +632,9 @@
- 	@(echo cd $(DESTDIR)$(configdir);			\
- 	  cd $(DESTDIR)$(configdir);				\
- 	  for i in $(CONF_LINKS); do				\
--	    echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .;	\
-+	    echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .;	\
- 	    $(RM) $$i;						\
--	    $(LN_S) $(templatedir)/$$i .;				\
-+	    $(LN_S) $(DESTDIR)$(templatedir)/$$i .;				\
- 	  done)
- uninstall-local:
- 	@(echo cd $(DESTDIR)$(configdir);			\
--- a/src/fontconfig.mk	Tue Dec 13 11:03:39 2016 -0500
+++ b/src/fontconfig.mk	Wed Dec 14 08:09:59 2016 -0500
@@ -3,8 +3,8 @@
 
 PKG             := fontconfig
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.11.1
-$(PKG)_CHECKSUM := 08565feea5a4e6375f9d8a7435dac04e52620ff2
+$(PKG)_VERSION  := 2.12.1
+$(PKG)_CHECKSUM := 30d832b754fb10a3b70ebac750a38a0275438ad8
 $(PKG)_SUBDIR   := fontconfig-$($(PKG)_VERSION)
 $(PKG)_FILE     := fontconfig-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://fontconfig.org/release/$($(PKG)_FILE)
@@ -28,5 +28,5 @@
         --disable-docs \
         --with-expat='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' sbin_PROGRAMS= noinst_PROGRAMS=
-    $(MAKE) -C '$(1)' -j 1 install sbin_PROGRAMS= noinst_PROGRAMS= DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j 1 install sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/mingw-fontconfig-ln_s.patch	Tue Dec 13 11:03:39 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.am fontconfig-2.11.0/conf.d/Makefile.am
---- fontconfig-2.11.0.orig/conf.d/Makefile.am	2014-02-22 20:53:48.000000000 -0500
-+++ fontconfig-2.11.0/conf.d/Makefile.am	2014-02-22 20:59:45.000000000 -0500
-@@ -88,9 +88,9 @@
- 	@(echo cd $(DESTDIR)$(configdir);			\
- 	  cd $(DESTDIR)$(configdir);				\
- 	  for i in $(CONF_LINKS); do				\
--	    echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .;	\
-+	    echo $(RM) $$i";" cp $(DESTDIR)$(templatedir)/$$i .;	\
- 	    $(RM) $$i;						\
--	    $(LN_S) $(DESTDIR)$(templatedir)/$$i .;		\
-+	    cp $(DESTDIR)$(templatedir)/$$i .;		\
- 	  done)
- uninstall-local:
- 	@(echo cd $(DESTDIR)$(configdir);			\
-diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.in fontconfig-2.11.0/conf.d/Makefile.in
---- fontconfig-2.11.0.orig/conf.d/Makefile.in	2014-02-22 20:53:48.000000000 -0500
-+++ fontconfig-2.11.0/conf.d/Makefile.in	2014-02-22 21:01:04.000000000 -0500
-@@ -632,9 +632,9 @@
- 	@(echo cd $(DESTDIR)$(configdir);			\
- 	  cd $(DESTDIR)$(configdir);				\
- 	  for i in $(CONF_LINKS); do				\
--	    echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .;	\
-+	    echo $(RM) $$i";" cp $(DESTDIR)$(templatedir)/$$i .;	\
- 	    $(RM) $$i;						\
--	    $(LN_S) $(DESTDIR)$(templatedir)/$$i .;				\
-+	    cp $(DESTDIR)$(templatedir)/$$i .;				\
- 	  done)
- uninstall-local:
- 	@(echo cd $(DESTDIR)$(configdir);			\