academic/octave: Updated for version 5.1.0.

Signed-off-by: Kyle Guinn <elyk03@gmail.com>

3 files changed, 95 insertions, 5 deletions

diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index ad2f4c5728af2..b0424312d4be8 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=octave
-VERSION=${VERSION:-4.4.1}
+VERSION=${VERSION:-5.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -91,7 +91,8 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-patch -p1 < $CWD/patches/imagemagick.diff
+patch -p1 < $CWD/patches/imagemagick.diff  # https://savannah.gnu.org/bugs/?49653
+patch -p1 < $CWD/patches/qt4opengl.diff    # https://savannah.gnu.org/bugs/?55735
 patch -p1 < $CWD/patches/atlas-lib-rename.diff
 autoreconf -vif
 
diff --git a/academic/octave/octave.info b/academic/octave/octave.info
index 91b44ae74f354..61556bca902c3 100644
--- a/academic/octave/octave.info
+++ b/academic/octave/octave.info
@@ -1,8 +1,8 @@
 PRGNAM="octave"
-VERSION="4.4.1"
+VERSION="5.1.0"
 HOMEPAGE="https://www.gnu.org/software/octave/"
-DOWNLOAD="https://ftp.gnu.org/gnu/octave/octave-4.4.1.tar.lz"
-MD5SUM="e0d9556caafd83e4276af49b06c5c994"
+DOWNLOAD="https://ftp.gnu.org/gnu/octave/octave-5.1.0.tar.lz"
+MD5SUM="2eb0d159b60c3fc2eb9068b2c7395050"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% blas lapack"
diff --git a/academic/octave/patches/qt4opengl.diff b/academic/octave/patches/qt4opengl.diff
new file mode 100644
index 0000000000000..4ed9f03d6b5ee
--- /dev/null
+++ b/academic/octave/patches/qt4opengl.diff
@@ -0,0 +1,89 @@
+
+# HG changeset patch
+# User John W. Eaton <jwe@octave.org>
+# Date 1552335463 0
+# Node ID 4af9840f9ce517ba4b591cfec0907731787a0bbc
+# Parent  6c25c714bec436f70098355ab9d81d3b2fb083af
+make building with Qt4 QGLWidget work again (bug #55735)
+
+* acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Also set and substitute
+QT_OPENGL_CPPFLAGS and QT_OPENGL_LDFLAGS variables.
+(OCTAVE_CHECK_QT_OPENGL_OK, OCTAVE_CHECK_QT_OPENGL_OFFSCREEN):
+Add QT_OPENGL_CPPFLAGS to CPPFLAGS for tests, not QT_CPPFLAGS.
+
+* libgui/graphics/module.mk %canon_reldir%___init_qt___la_CPPFLAGS):
+Use QT_OPENGL_CPPFLAGS instead of QT_CPPFLAGS.
+(%canon_reldir%___init_qt___la_LDFLAGS): Also include
+$(QT_OPENGL_LDFLAGS) in the list.
+
+diff --git a/libgui/graphics/module.mk b/libgui/graphics/module.mk
+--- a/libgui/graphics/module.mk
++++ b/libgui/graphics/module.mk
+@@ -138,7 +138,7 @@
+   $(FONTCONFIG_CPPFLAGS) \
+   $(HDF5_CPPFLAGS) \
+   @OCTGUI_DLL_DEFS@ \
+-  @QT_CPPFLAGS@ \
++  @QT_OPENGL_CPPFLAGS@ \
+   -Ilibgui/graphics -I$(srcdir)/libgui/graphics \
+   -Isrc -I$(srcdir)/libgui/src \
+   -Iliboctave \
+@@ -153,7 +153,9 @@
+   -I$(srcdir)/libinterp/octave-value
+ 
+ %canon_reldir%___init_qt___la_LDFLAGS = \
+-  -avoid-version -module $(NO_UNDEFINED_LDFLAG) $(WARN_LDFLAGS)
++  -avoid-version -module $(NO_UNDEFINED_LDFLAG) \
++  $(QT_OPENGL_LDFLAGS) \
++  $(WARN_LDFLAGS)
+ 
+ DLD_LIBOCTGUI_LIBADD = $(OCT_GUI_LINK_DEPS)
+ 
+diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
+--- a/m4/acinclude.m4
++++ b/m4/acinclude.m4
+@@ -1820,7 +1820,7 @@
+   AC_LANG_PUSH(C++)
+   ac_octave_save_CPPFLAGS="$CPPFLAGS"
+   ac_octave_save_CXXFLAGS="$CXXFLAGS"
+-  CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
++  CPPFLAGS="$QT_OPENGL_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
+   CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
+   AC_CHECK_HEADERS([QOffscreenSurface])
+   AC_CACHE_CHECK([whether Qt supports full offscreen OpenGL rendering],
+@@ -1874,7 +1874,7 @@
+   AC_LANG_PUSH(C++)
+   ac_octave_save_CPPFLAGS="$CPPFLAGS"
+   ac_octave_save_CXXFLAGS="$CXXFLAGS"
+-  CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
++  CPPFLAGS="$QT_OPENGL_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
+   CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
+   AC_CHECK_HEADERS([QOpenGLWidget QGLWidget QGLFunctions_1_1])
+   AC_CACHE_CHECK([whether Qt works with OpenGL and GLU],
+@@ -2009,6 +2009,8 @@
+     QT_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_MODULES | $SED -e 's/^ *$//')"
+     QT_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_MODULES | $SED -e 's/^ *$//')"
+     QT_LIBS="$($PKG_CONFIG --libs-only-l $QT_MODULES | $SED -e 's/^ *$//')"
++    QT_OPENGL_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_OPENGL_MODULE | $SED -e 's/^ *$//')"
++    QT_OPENGL_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_OPENGL_MODULE | $SED -e 's/^ *$//')"
+     QT_OPENGL_LIBS="$($PKG_CONFIG --libs-only-l $QT_OPENGL_MODULE | $SED -e 's/^ *$//')"
+ 
+     case $host_os in
+@@ -2017,6 +2019,7 @@
+         if test -z "$QT_LIBS"; then
+           QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`"
+           QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`"
++          QT_OPENGL_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`"
+           QT_OPENGL_LIBS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`"
+           ## Enabling link_all_deps works around libtool's imperfect handling
+           ## of the -F flag
+@@ -2173,6 +2176,8 @@
+   AC_SUBST(QT_CPPFLAGS)
+   AC_SUBST(QT_LDFLAGS)
+   AC_SUBST(QT_LIBS)
++  AC_SUBST(QT_OPENGL_CPPFLAGS)
++  AC_SUBST(QT_OPENGL_LDFLAGS)
+   AC_SUBST(QT_OPENGL_LIBS)
+ ])
+ dnl
+