From eb8c9a5972113ede875b9ea882583b56a1462c16 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sun, 18 Sep 2022 20:26:26 -0500 Subject: academic/octave: Updated for version 7.2.0 Signed-off-by: Kyle Guinn Signed-off-by: Willy Sudiarto Raharjo --- academic/octave/octave.SlackBuild | 11 +----- academic/octave/octave.info | 6 +-- academic/octave/patches/3c3abe6dbe58.diff | 65 ------------------------------- 3 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 academic/octave/patches/3c3abe6dbe58.diff diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index 081d555a20..d4ee3118a0 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=octave -VERSION=${VERSION:-7.1.0} +VERSION=${VERSION:-7.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -52,9 +52,6 @@ DOCS="AUTHORS BUGS CITATION COPYING ChangeLog INSTALL* NEWS README" if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" @@ -96,7 +93,6 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . -patch -p1 < $CWD/patches/3c3abe6dbe58.diff # https://savannah.gnu.org/bugs/?62295 patch -p1 < $CWD/patches/atlas-lib-rename.diff autoreconf -vif @@ -107,9 +103,6 @@ autoreconf -vif # timezone, then the docs get rebuilt with your local date. 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=\${prefix}/lib${LIBDIRSUFFIX} \ @@ -119,7 +112,7 @@ find . -name stamp-vti -exec touch {} + --infodir=\${prefix}/info \ --docdir=\${prefix}/doc/$PRGNAM-$VERSION \ --disable-dependency-tracking \ - --with-linux-crypto \ + --with-openssl=auto \ ${MAGICK} \ --build=$ARCH-slackware-linux \ CFLAGS="$SLKCFLAGS" \ diff --git a/academic/octave/octave.info b/academic/octave/octave.info index 0b91e5507d..aa901803a5 100644 --- a/academic/octave/octave.info +++ b/academic/octave/octave.info @@ -1,8 +1,8 @@ PRGNAM="octave" -VERSION="7.1.0" +VERSION="7.2.0" HOMEPAGE="https://www.gnu.org/software/octave/" -DOWNLOAD="https://ftpmirror.gnu.org/gnu/octave/octave-7.1.0.tar.lz" -MD5SUM="5d979773c4a1d1fa67bc555ecf147427" +DOWNLOAD="https://ftpmirror.gnu.org/gnu/octave/octave-7.2.0.tar.lz" +MD5SUM="540a9be9f91d7f4c32b683ab25889a7c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% lapack" diff --git a/academic/octave/patches/3c3abe6dbe58.diff b/academic/octave/patches/3c3abe6dbe58.diff deleted file mode 100644 index 9dd75afbca..0000000000 --- a/academic/octave/patches/3c3abe6dbe58.diff +++ /dev/null @@ -1,65 +0,0 @@ - -# HG changeset patch -# User Markus Mützel -# 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 - -- cgit v1.2.3