diff options
| author |   Kyle Guinn <elyk03@gmail.com> | 2022-05-27 17:54:48 -0500 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-06-04 10:37:19 +0700 |
| commit | 2ec10ba0aea6b73e7efde4fa1a24f0cd0549be35 (patch) | |
| tree | 2bb434381647d2819f635f857a3cf1fd022bda13 /academic/octave/patches | |
| parent | ab898a63eedf768f74e99952863050ebb21db509 (diff) | |
| download | slackbuilds-2ec10ba0aea6b73e7efde4fa1a24f0cd0549be35.tar.gz slackbuilds-2ec10ba0aea6b73e7efde4fa1a24f0cd0549be35.tar.xz | |
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>
Diffstat (limited to 'academic/octave/patches')
| -rw-r--r-- | academic/octave/patches/3c3abe6dbe58.diff | 65 | ||||
| -rw-r--r-- | academic/octave/patches/imagemagick.diff | 12 |
2 files changed, 65 insertions, 12 deletions
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: |