# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1479135504 18000
# Node ID 366dc3466a3a54c835d2a42e2348a57936005230
# Parent  1c7f628ee3ca92a6eec8c070eb3959d3e2d444fa# Parent  a40ff07ce9878bfc235276369f7a443905d44fda
merge away extra head

diff -r a40ff07ce987 -r 366dc3466a3a .hgtags
--- a/.hgtags	Mon Nov 14 05:06:13 2016 -0500
+++ b/.hgtags	Mon Nov 14 09:58:24 2016 -0500
@@ -1,2 +1,3 @@
 1cab2860069ea9401ff3f28f1fd9654bc777026b release-4-0-0
 a047bc8d7910849a3ddcb4d1856ce3dd2b912aa4 octave-4.0.1-binary
+e622765c49c736f6e8e4627310a59f1c49fae283 octave-release-4.2.0
diff -r a40ff07ce987 -r 366dc3466a3a src/octave.mk
--- a/src/octave.mk	Mon Nov 14 05:06:13 2016 -0500
+++ b/src/octave.mk	Mon Nov 14 09:58:24 2016 -0500
@@ -3,8 +3,8 @@
 
 PKG             := octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.2.0-rc3
-$(PKG)_CHECKSUM := 78521a5010351bf5c33459c79d823299122db2bb
+$(PKG)_VERSION  := 4.2.0-rc4
+$(PKG)_CHECKSUM := a96a143a2f49306b259535454389d16393853fc4
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
 $(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
diff -r a40ff07ce987 -r 366dc3466a3a src/stable-octave-1-docinstall.patch
--- a/src/stable-octave-1-docinstall.patch	Mon Nov 14 05:06:13 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -ur a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in
---- a/doc/interpreter/Makefile.in	2013-12-27 17:01:52.000000000 -0500
-+++ b/doc/interpreter/Makefile.in	2014-01-21 12:47:59.618865568 -0500
-@@ -2435,8 +2435,10 @@
- 	  if test -d "$$d2"; then \
- 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
- 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
--	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
--	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
-+	    for htm in "$$d2"/*; do \
-+	      echo " $(INSTALL_DATA) '$$htm' '$(DESTDIR)$(htmldir)/$$f'"; \
-+	      $(INSTALL_DATA) "$$htm" "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
-+	    done; \
- 	  else \
- 	    list2="$$list2 $$d2"; \
- 	  fi; \
diff -r a40ff07ce987 -r 366dc3466a3a src/stable-octave-1-fixes.patch
--- a/src/stable-octave-1-fixes.patch	Mon Nov 14 05:06:13 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- a/libgnu/unistd.in.h	2013-11-26 03:43:39.000000000 -0500
-+++ b/libgnu/unistd.in.h	2014-02-16 16:21:36.254338221 -0500
-@@ -714,7 +714,7 @@
-    Null terminate it if the name is shorter than LEN.
-    If the host name is longer than LEN, set errno = EINVAL and return -1.
-    Return 0 if successful, otherwise set errno and return -1.  */
--# if @UNISTD_H_HAVE_WINSOCK2_H@
-+# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef gethostname
- #   define gethostname rpl_gethostname
diff -r a40ff07ce987 -r 366dc3466a3a src/stable-octave-1-gnulib.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-1-gnulib.patch	Mon Nov 14 09:58:24 2016 -0500
@@ -0,0 +1,12 @@
+diff -uNr a/libgnu/unistd.in.h b/libgnu/unistd.in.h
+--- a/libgnu/unistd.in.h	2016-06-18 18:47:32.000000000 -0400
++++ b/libgnu/unistd.in.h	2016-06-23 18:45:42.410781867 -0400
+@@ -734,7 +734,7 @@
+    Null terminate it if the name is shorter than LEN.
+    If the host name is longer than LEN, set errno = EINVAL and return -1.
+    Return 0 if successful, otherwise set errno and return -1.  */
+-# if @UNISTD_H_HAVE_WINSOCK2_H@
++# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+ #   undef gethostname
+ #   define gethostname rpl_gethostname
diff -r a40ff07ce987 -r 366dc3466a3a src/stable-octave.mk
--- a/src/stable-octave.mk	Mon Nov 14 05:06:13 2016 -0500
+++ b/src/stable-octave.mk	Mon Nov 14 09:58:24 2016 -0500
@@ -3,15 +3,22 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.0.3
-$(PKG)_CHECKSUM := c798346a8271e0141d9dbe5610584dabb8311277
+$(PKG)_VERSION  := 4.2.0
+$(PKG)_CHECKSUM := de2977e8b242cb655ec326b8f7718d43a15135a9
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
-$(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.xz
+$(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
-$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qrupdate qscintilla readline suitesparse texinfo zlib
+
+ifeq ($(ENABLE_QT5),yes)
+    $(PKG)_DEPS += qt5
+else
+    $(PKG)_DEPS += qt
+endif
+
 ifeq ($(MXE_WINDOWS_BUILD),no)
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
     $(PKG)_DEPS += x11 xext
@@ -51,6 +58,15 @@
   RCC=$(MXE_RCC) \
   LRELEASE=$(MXE_LRELEASE)
 
+ifeq ($(ENABLE_QT5),yes)
+  #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
+  $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
+  $(PKG)_QTDIR := $(HOST_PREFIX)/qt5
+else
+  $(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
+  $(PKG)_QTDIR := $(HOST_PREFIX)
+endif
+
 ifneq ($(ENABLE_DOCS),yes)
   $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --disable-docs
 endif
@@ -86,13 +102,17 @@
 else
   $(PKG)_PREFIX := '$(HOST_PREFIX)'
   $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
-    LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
+    LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
 endif
 
 ifeq ($(MXE_SYSTEM),mingw)
   $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
 endif
 
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  $(PKG)_EXTRA_CONFIGURE_OPTIONS += ac_cv_search_tputs=-ltermcap
+endif
+
 # if want binary packages and are cross compiling, then we need cross tools enabled
 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
   ifeq ($(MXE_NATIVE_BUILD),no)
@@ -137,7 +157,7 @@
         $($(PKG)_QT_CONFIGURE_OPTIONS) \
         $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' \
-        PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
+        PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \
         && $(CONFIGURE_POST_HOOK)
 
     ## We want both of these install steps so that we install in the