Mercurial > mxe-octave

changeset 4837:8dce91eb4b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge heads
author John Donoghue
date Thu, 30 Aug 2018 08:10:29 -0400
parents f5f47e338665 (diff) eeb5b98e87ee (current diff)
children ff90a3bdf9d2
files
diffstat 7 files changed, 54 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontconfig-1.patch	Wed Aug 29 18:36:26 2018 -0400
+++ b/src/fontconfig-1.patch	Thu Aug 30 08:10:29 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	Wed Aug 29 18:36:26 2018 -0400
+++ b/src/fontconfig.mk	Thu Aug 30 08:10:29 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/' | \
--- a/src/freetds.mk	Wed Aug 29 18:36:26 2018 -0400
+++ b/src/freetds.mk	Thu Aug 30 08:10:29 2018 -0400
@@ -3,8 +3,8 @@
 
 PKG             := freetds
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.00.80
-$(PKG)_CHECKSUM := 8e959e31d0168e25129e00bd5587789ff46f3270
+$(PKG)_VERSION  := 1.00.97
+$(PKG)_CHECKSUM := 07445d6902c6904bcddc41bdea734cceb6689911
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)
--- a/src/gdcm.mk	Wed Aug 29 18:36:26 2018 -0400
+++ b/src/gdcm.mk	Thu Aug 30 08:10:29 2018 -0400
@@ -18,8 +18,10 @@
 endif
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package gdcm.' >&2;
-    echo $(gdcm_VERSION)
+    $(WGET) -q -O- 'http://sourceforge.net/projects/gdcm/files/gdcm 2.x/' | \
+    $(SED) -n 's,.*title=\"GDCM \([0-9.]*\)\".*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
 ifeq ($(MXE_SYSTEM),msvc)
--- a/src/libgpg_error.mk	Wed Aug 29 18:36:26 2018 -0400
+++ b/src/libgpg_error.mk	Thu Aug 30 08:10:29 2018 -0400
@@ -3,8 +3,8 @@
 
 PKG             := libgpg_error
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.27
-$(PKG)_CHECKSUM := a428758999ff573e62d06892e3d2c0b0f335787c
+$(PKG)_VERSION  := 1.32
+$(PKG)_CHECKSUM := e310718c7737c816cb1313a2f3baf60fd6a6d5d3
 $(PKG)_SUBDIR   := libgpg-error-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgpg-error-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE)
--- a/src/pdflib_lite.mk	Wed Aug 29 18:36:26 2018 -0400
+++ b/src/pdflib_lite.mk	Thu Aug 30 08:10:29 2018 -0400
@@ -11,9 +11,8 @@
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.pdflib.com/download/free-software/pdflib-lite-7/' | \
-    $(SED) -n 's,.*PDFlib-Lite-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    head -1
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
 endef
 
 define $(PKG)_BUILD
--- a/src/qscintilla.mk	Wed Aug 29 18:36:26 2018 -0400
+++ b/src/qscintilla.mk	Thu Aug 30 08:10:29 2018 -0400
@@ -3,8 +3,8 @@
 
 PKG             := qscintilla
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.10.3
-$(PKG)_CHECKSUM := 8e5274013b3ca47c1f55a9021b2da3da3a1ca4d9
+$(PKG)_VERSION  := 2.10.7
+$(PKG)_CHECKSUM := bbbc09e98e580e51598c1173766a2f47dbcf2ba8
 $(PKG)_SUBDIR   := QScintilla_gpl-$($(PKG)_VERSION)
 $(PKG)_FILE     := QScintilla_gpl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-$($(PKG)_VERSION)/$($(PKG)_FILE)