# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1641471377 -3600
# Node ID 7f759a309b91ae733bf1c097cf01e4f9062fa71b
# Parent  b84413b95261e8efef8356a27f58f932d02eafe9# Parent  99125d7343bfe3a07bc8fba1ab03fb0f5b54254f
maint: Merge release to default.

diff -r b84413b95261 -r 7f759a309b91 src/build-gcc.mk
--- a/src/build-gcc.mk	Wed Jan 05 16:41:35 2022 -0500
+++ b/src/build-gcc.mk	Thu Jan 06 13:16:17 2022 +0100
@@ -49,10 +49,7 @@
     endef
   endif
 
-  ifneq ($(OCTAVE_TARGET),release-octave)
-    # FIXME: Set unconditionally for the first release candidate of Octave 7.
-    $(PKG)_WINAPI_VERSION_FLAGS := --with-default-win32-winnt=0x0601
-  endif
+  $(PKG)_WINAPI_VERSION_FLAGS := --with-default-win32-winnt=0x0601
 
   ifneq ($(HOST_MSVCRT),ucrt)
     $(PKG)_DEFAULT_MSVCRT := --with-default-msvcrt=msvcrt
diff -r b84413b95261 -r 7f759a309b91 src/mingw-w64.mk
--- a/src/mingw-w64.mk	Wed Jan 05 16:41:35 2022 -0500
+++ b/src/mingw-w64.mk	Thu Jan 06 13:16:17 2022 +0100
@@ -17,10 +17,7 @@
   tail -1
 endef
 
-ifneq ($(OCTAVE_TARGET),release-octave)
-  # FIXME: Set unconditionally for the first release candidate of Octave 7.
-  $(PKG)_WINAPI_VERSION_FLAGS := --with-default-win32-winnt=0x0601
-endif
+$(PKG)_WINAPI_VERSION_FLAGS := --with-default-win32-winnt=0x0601
 
 ifneq ($(HOST_MSVCRT),ucrt)
   $(PKG)_DEFAULT_MSVCRT := --with-default-msvcrt=msvcrt
diff -r b84413b95261 -r 7f759a309b91 src/release-octave.mk
--- a/src/release-octave.mk	Wed Jan 05 16:41:35 2022 -0500
+++ b/src/release-octave.mk	Thu Jan 06 13:16:17 2022 +0100
@@ -34,15 +34,15 @@
 
 PKG             := release-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.4.0
-$(PKG)_CHECKSUM := d8a5577ddd81de987cd0812df38f8c897f34fa9f
+$(PKG)_VERSION  := 7.0.90
+$(PKG)_CHECKSUM := 067ca5a4d3c213247660aba97d4e6d6daade2426
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
-$(PKG)_URL      := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
+$(PKG)_URL      := ftp://alpha.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 pcre portaudio pstoedit qhull qrupdate qscintilla readline sundials-ida suitesparse texinfo zlib
+$(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile pcre portaudio pstoedit qhull qrupdate qscintilla rapidjson readline sundials-ida suitesparse texinfo zlib
 
 ifeq ($(ENABLE_QT5),yes)
     $(PKG)_DEPS += qt5
@@ -138,6 +138,21 @@
   $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := ax_blas_f77_func_ok=yes ax_blas_integer_size=4 octave_cv_sizeof_fortran_integer=4
 endif
 
+ifeq ($(MXE_SYSTEM),mingw)
+  # This is very similar to CONFIGURE_CPPFLAGS and CONFIGURE_LDFLAGS but with
+  # double quoted paths.
+  $(PKG)_CONFIGURE_CPPFLAGS := CPPFLAGS='-I"$(HOST_PREFIX)/include"'
+  ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
+    $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib" -L"$(HOST_PREFIX)/lib64"'
+  else
+    $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib"'
+  endif
+else
+  $(PKG)_CONFIGURE_CPPFLAGS := $(CONFIGURE_CPPFLAGS)
+  $(PKG)_CONFIGURE_LDFLAGS := $(CONFIGURE_LDFLAGS)
+endif
+
+
 ifeq ($(MXE_SYSTEM),msvc)
   $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)'
   # - Enable atomic refcount (required for QtHandles)
@@ -152,8 +167,13 @@
     CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068'
 else
   $(PKG)_PREFIX := '$(HOST_PREFIX)'
-  $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
-    LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
+  ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
+      LDFLAGS='-Wl,-rpath-link,"$(HOST_LIBDIR)" -L"$(HOST_LIBDIR)" -L"$($(PKG)_QTDIR)/lib"'
+  else
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
+      LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
+  endif
 endif
 
 ifeq ($(MXE_SYSTEM),mingw)
@@ -195,7 +215,8 @@
 
     mkdir '$(1)/.build'
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
-        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $($(PKG)_CONFIGURE_CPPFLAGS) \
+        $($(PKG)_CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$($(PKG)_PREFIX)' \
         --disable-silent-rules \
diff -r b84413b95261 -r 7f759a309b91 src/stable-octave.mk
--- a/src/stable-octave.mk	Wed Jan 05 16:41:35 2022 -0500
+++ b/src/stable-octave.mk	Thu Jan 06 13:16:17 2022 +0100
@@ -13,7 +13,7 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.0.1
+$(PKG)_VERSION  := 7.0.91
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz