# HG changeset patch
# User John Donoghue
# Date 1434469396 14400
# Node ID d0d5dacd19419045abdf9ec4ba28265012766975
# Parent  55f3a9ff20b86bf58750081c8f40295f6bbccf41
octave: add msys2 patch

* src/mingw-default-octave-1-msys-fixes.patch: new file

* src/mingw-default-octave-1-msys-fixes.patch: new file

* dist-files.mk: add new patches

* src/default-octave.mk: add ac_cv_search_tputs=-ltermcap configure option for native mingw

* src/octave.mk: add ac_cv_search_tputs=-ltermcap configure option for native mingw

diff -r 55f3a9ff20b8 -r d0d5dacd1941 dist-files.mk
--- a/dist-files.mk	Mon Jun 15 20:59:37 2015 -0400
+++ b/dist-files.mk	Tue Jun 16 11:43:16 2015 -0400
@@ -313,6 +313,7 @@
   mdbtools.mk \
   mingw-cairo-1-ssize-t-defined.patch \
   mingw-cfitsio-1-fixes.patch \
+  mingw-default-octave-1-msys-fixes.patch \
   mingw-epstool-1-fixes.patch \
   mingw-fontconfig-ln_s.patch \
   mingw-glib-1-fixes.patch \
@@ -320,6 +321,7 @@
   mingw-hdf5-1.patch \
   mingw-libgcrypt-1-fixes.patch \
   mingw-libmng-1-noundefines.patch \
+  mingw-octave-1-msys-fixes.patch \
   mingw-openssl-3-libdeps.patch \
   mingw-osmesa-1-fixes.patch \
   mingw-pango-1-fixes.patch \
diff -r 55f3a9ff20b8 -r d0d5dacd1941 src/default-octave.mk
--- a/src/default-octave.mk	Mon Jun 15 20:59:37 2015 -0400
+++ b/src/default-octave.mk	Tue Jun 16 11:43:16 2015 -0400
@@ -91,6 +91,10 @@
   $(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)
diff -r 55f3a9ff20b8 -r d0d5dacd1941 src/mingw-default-octave-1-msys-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mingw-default-octave-1-msys-fixes.patch	Tue Jun 16 11:43:16 2015 -0400
@@ -0,0 +1,47 @@
+Changes required for octave to compile under msys2
+
+diff -ur octave-4.0.0.orig/libinterp/corefcn/syscalls.cc octave-4.0.0/libinterp/corefcn/syscalls.cc
+--- octave-4.0.0.orig/libinterp/corefcn/syscalls.cc	2015-06-14 08:00:55.195888300 -0400
++++ octave-4.0.0/libinterp/corefcn/syscalls.cc	2015-06-14 08:50:10.755418300 -0400
+@@ -30,6 +30,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <ctime>
+ #include <cstdio>
+ #include <cstring>
+ 
+diff -ur octave-4.0.0.orig/liboctave/system/file-stat.cc octave-4.0.0/liboctave/system/file-stat.cc
+--- octave-4.0.0.orig/liboctave/system/file-stat.cc	2015-06-14 08:00:26.881838600 -0400
++++ octave-4.0.0/liboctave/system/file-stat.cc	2015-06-14 08:49:10.992967600 -0400
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <ctime>
+ #include <cerrno>
+ #include <cstring>
+ 
+diff -ur octave-4.0.0.orig/liboctave/system/oct-syscalls.cc octave-4.0.0/liboctave/system/oct-syscalls.cc
+--- octave-4.0.0.orig/liboctave/system/oct-syscalls.cc	2015-06-14 08:00:26.913038700 -0400
++++ octave-4.0.0/liboctave/system/oct-syscalls.cc	2015-06-14 08:49:37.309661500 -0400
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <ctime>
+ #include <cerrno>
+ #include <cstdlib>
+ 
+diff -ur octave-4.0.0.orig/libinterp/corefcn/oct-tex-lexer.cc octave-4.0.0/libinterp/corefcn/oct-tex-lexer.cc
+--- octave-4.0.0.orig/libinterp/corefcn/oct-tex-lexer.cc	2015-06-14 14:15:46.436310300 -0400
++++ octave-4.0.0/libinterp/corefcn/oct-tex-lexer.cc	2015-06-14 14:24:23.464145100 -0400
+@@ -3,7 +3,7 @@
+ #include <config.h>
+ #endif
+ 
+-
++#include <ctime>
+ 
+ 
+ #line 10 "corefcn/oct-tex-lexer.cc"
diff -r 55f3a9ff20b8 -r d0d5dacd1941 src/mingw-octave-1-msys-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mingw-octave-1-msys-fixes.patch	Tue Jun 16 11:43:16 2015 -0400
@@ -0,0 +1,47 @@
+Changes required for octave to compile under msys2
+
+diff -ur octave-4.0.0.orig/libinterp/corefcn/syscalls.cc octave-4.0.0/libinterp/corefcn/syscalls.cc
+--- octave-4.0.0.orig/libinterp/corefcn/syscalls.cc	2015-06-14 08:00:55.195888300 -0400
++++ octave-4.0.0/libinterp/corefcn/syscalls.cc	2015-06-14 08:50:10.755418300 -0400
+@@ -30,6 +30,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <ctime>
+ #include <cstdio>
+ #include <cstring>
+ 
+diff -ur octave-4.0.0.orig/liboctave/system/file-stat.cc octave-4.0.0/liboctave/system/file-stat.cc
+--- octave-4.0.0.orig/liboctave/system/file-stat.cc	2015-06-14 08:00:26.881838600 -0400
++++ octave-4.0.0/liboctave/system/file-stat.cc	2015-06-14 08:49:10.992967600 -0400
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <ctime>
+ #include <cerrno>
+ #include <cstring>
+ 
+diff -ur octave-4.0.0.orig/liboctave/system/oct-syscalls.cc octave-4.0.0/liboctave/system/oct-syscalls.cc
+--- octave-4.0.0.orig/liboctave/system/oct-syscalls.cc	2015-06-14 08:00:26.913038700 -0400
++++ octave-4.0.0/liboctave/system/oct-syscalls.cc	2015-06-14 08:49:37.309661500 -0400
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <ctime>
+ #include <cerrno>
+ #include <cstdlib>
+ 
+diff -ur octave-4.0.0.orig/libinterp/corefcn/oct-tex-lexer.cc octave-4.0.0/libinterp/corefcn/oct-tex-lexer.cc
+--- octave-4.0.0.orig/libinterp/corefcn/oct-tex-lexer.cc	2015-06-14 14:15:46.436310300 -0400
++++ octave-4.0.0/libinterp/corefcn/oct-tex-lexer.cc	2015-06-14 14:24:23.464145100 -0400
+@@ -3,7 +3,7 @@
+ #include <config.h>
+ #endif
+ 
+-
++#include <ctime>
+ 
+ 
+ #line 10 "corefcn/oct-tex-lexer.cc"
diff -r 55f3a9ff20b8 -r d0d5dacd1941 src/octave.mk
--- a/src/octave.mk	Mon Jun 15 20:59:37 2015 -0400
+++ b/src/octave.mk	Tue Jun 16 11:43:16 2015 -0400
@@ -88,6 +88,10 @@
   $(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)