academic/octave: Updated for version 7.1.0

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 90 insertions, 32 deletions

diff --git a/academic/octave/README b/academic/octave/README
index d5c51fca32..a0f531e127 100644
--- a/academic/octave/README
+++ b/academic/octave/README
@@ -20,9 +20,9 @@ detect/use alternate implementations.
 
 These optional dependencies will be used if found (see INSTALL.OCTAVE,
 in the Octave source, for a description of what each dependency
-offers): amd, camd, colamd, ccolamd, cholmod, umfpack, cxsparse, glpk,
-arpack-ng, qrupdate, sundials, qhull, hdf5, fltk, ftgl, gl2ps, jdk,
-GraphicsMagick, portaudio.
+offers): amd, camd, colamd, ccolamd, cholmod, umfpack, spqr, cxsparse,
+glpk, arpack-ng, qrupdate, sundials, qhull, hdf5, fltk, ftgl, gl2ps,
+jdk, GraphicsMagick, portaudio, rapidjson.
 
 Octave can use ImageMagick (part of Slackware) or GraphicsMagick
 (available from SBo) for image-reading functionality.  If both
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index 162ebf1629..71051d747a 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=octave
-VERSION=${VERSION:-6.4.0}
+VERSION=${VERSION:-7.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -67,13 +67,17 @@ else
 fi
 
 # Use GraphicsMagick by default.  Fall back on ImageMagick from the full
-# Slackware install if it's not present.  Requires a patch for this bug:
-# https://savannah.gnu.org/bugs/?49653
+# Slackware install if it's not present.
 #
 # GraphicsMagick is default due to the fact that the Octave devs mainly test
 # with that, and went several releases before noticing ImageMagick was broken.
 # If ImageMagick doesn't work, install GraphicsMagick, or set MAGICK="".
-MAGICK=${MAGICK-GraphicsMagick}
+#
+# TODO: ImageMagick may no longer be compatible.  The --with-magick argument
+# should be the name of a pkg-config file.  Documentation suggests
+# "ImageMagick++" which does not exist.  "ImageMagick" and "Magick++" exist;
+# the former does not pass configure checks, the latter fails at compile time.
+MAGICK=${MAGICK-GraphicsMagick++}
 if [ -n "$MAGICK" ] && ! pkg-config --exists $MAGICK; then
   MAGICK=ImageMagick
 fi
@@ -92,7 +96,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-patch -p1 < $CWD/patches/imagemagick.diff  # https://savannah.gnu.org/bugs/?49653
+patch -p1 < $CWD/patches/3c3abe6dbe58.diff  # https://savannah.gnu.org/bugs/?62295
 patch -p1 < $CWD/patches/atlas-lib-rename.diff
 autoreconf -vif
 
@@ -101,21 +105,21 @@ autoreconf -vif
 # If you live far enough east or west that the date contained in version.texi
 # does not match that file's timestamp when printed accounting for your
 # timezone, then the docs get rebuilt with your local date.
-#
-# The TeX environment in Slackware 14.1 fails to build the DVI and PDF
-# targets in Octave 3.8.1.  Maybe it works with a recent version of TeXLive?
 find . -name stamp-vti -exec touch {} +
 
+# TODO: Re-enable --with-openssl=auto in a future release once
+# https://savannah.gnu.org/bugs/?62416 is fixed.
+
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=\${prefix}/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --mandir=\${prefix}/man \
+  --infodir=\${prefix}/info \
+  --docdir=\${prefix}/doc/$PRGNAM-$VERSION \
   --disable-dependency-tracking \
-  --with-openssl=auto \
+  --with-linux-crypto \
   ${MAGICK} \
   --build=$ARCH-slackware-linux \
   CFLAGS="$SLKCFLAGS" \
@@ -123,7 +127,8 @@ find . -name stamp-vti -exec touch {} +
   FFLAGS="$SLKCFLAGS" \
 
 make
-make check
+# TODO: May fail if not all optional deps are installed (gl2ps in particular).
+#make check
 make install-strip DESTDIR=$PKG
 
 find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete
diff --git a/academic/octave/octave.info b/academic/octave/octave.info
index 37218af730..0b91e5507d 100644
--- a/academic/octave/octave.info
+++ b/academic/octave/octave.info
@@ -1,8 +1,8 @@
 PRGNAM="octave"
-VERSION="6.4.0"
+VERSION="7.1.0"
 HOMEPAGE="https://www.gnu.org/software/octave/"
-DOWNLOAD="https://ftpmirror.gnu.org/gnu/octave/octave-6.4.0.tar.lz"
-MD5SUM="10ff993735afadcf0fcf1bd68e9e1fb3"
+DOWNLOAD="https://ftpmirror.gnu.org/gnu/octave/octave-7.1.0.tar.lz"
+MD5SUM="5d979773c4a1d1fa67bc555ecf147427"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% lapack"
diff --git a/academic/octave/patches/3c3abe6dbe58.diff b/academic/octave/patches/3c3abe6dbe58.diff
new file mode 100644
index 0000000000..9dd75afbca
--- /dev/null
+++ b/academic/octave/patches/3c3abe6dbe58.diff
@@ -0,0 +1,65 @@
+
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1649850892 -7200
+# Node ID 3c3abe6dbe5803ac3faa0d3c81f07a8ae28933ae
+# Parent  f67d2ce5d6d42d94220d24c95698eef6815ac947
+Don't leak build directories in installed directories (bug #62295).
+
+* test/mk-bc-overloads-tst.sh: Remove absolute output directory from file paths.
+Use correct name when referencing itself.
+
+diff --git a/test/mk-bc-overloads-tst.sh b/test/mk-bc-overloads-tst.sh
+--- a/test/mk-bc-overloads-tst.sh
++++ b/test/mk-bc-overloads-tst.sh
+@@ -48,16 +48,16 @@
+   shift
+   case "$1" in
+     --list-files)
+-      echo $output_dir/tbcover.m
+-      echo $output_dir/bc-overloads.tst
++      echo tbcover.m
++      echo bc-overloads.tst
+       for class in $CLASSES; do
+-        echo $output_dir/@$class/tbcover.m
++        echo @$class/tbcover.m
+       done
+       exit
+     ;;
+     --list-dirs)
+       for class in $CLASSES; do
+-        echo $output_dir/@$class
++        echo @$class
+       done
+       exit
+     ;;
+@@ -70,16 +70,16 @@
+     ;;
+   esac
+ else
+-  echo "usage: build-bc-overload-tests.sh output_dir option" 1>&2
++  echo "usage: mk-bc-overload-tst.sh output_dir option" 1>&2
+   exit 1
+ fi
+ 
+ for class in $CLASSES; do
+-  DIR="$output_dir/@$class"
++  DIR="@$class"
+   test -d $DIR || mkdir $DIR || { echo "error: could not create $DIR"; exit; }
+   cat > $DIR/tbcover.m << EOF
+ % !!! DO NOT EDIT !!!
+-% generated automatically by build-bc-overload-tests.sh
++% generated automatically by mk-bc-overload-tst.sh
+ function s = tbcover (x, y)
+   s = '$class';
+ EOF
+@@ -87,7 +87,7 @@
+ 
+ cat > $output_dir/tbcover.m << EOF
+ % !!! DO NOT EDIT !!!
+-% generated automatically by build-bc-overload-tests.sh
++% generated automatically by mk-bc-overload-tst.sh
+ function s = tbcover (x, y)
+   s = 'none';
+ EOF
+
diff --git a/academic/octave/patches/imagemagick.diff b/academic/octave/patches/imagemagick.diff
deleted file mode 100644
index 7a15122a18..0000000000
--- a/academic/octave/patches/imagemagick.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libinterp/corefcn/__magick_read__.cc b/libinterp/corefcn/__magick_read__.cc
---- a/libinterp/corefcn/__magick_read__.cc
-+++ b/libinterp/corefcn/__magick_read__.cc
-@@ -42,6 +42,8 @@
- #include <Magick++.h>
- #include <clocale>
- 
-+using Magick::Quantum;  // https://savannah.gnu.org/bugs/?49653
-+
- // In theory, it should be enough to check the class:
- // Magick::ClassType
- // PseudoClass: