diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-27 06:06:27 +0000 |
commit | 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch) | |
tree | 4d26462d027b14926335894749d2e01d982234d0 /sci-mathematics/maxima/files | |
parent | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff) |
gentoo resync : 27.03.2021
Diffstat (limited to 'sci-mathematics/maxima/files')
-rw-r--r-- | sci-mathematics/maxima/files/dont-hardcode-python.patch | 38 | ||||
-rw-r--r-- | sci-mathematics/maxima/files/ecls-4.patch | 16 | ||||
-rw-r--r-- | sci-mathematics/maxima/files/support-new-vtk.patch | 26 |
3 files changed, 80 insertions, 0 deletions
diff --git a/sci-mathematics/maxima/files/dont-hardcode-python.patch b/sci-mathematics/maxima/files/dont-hardcode-python.patch new file mode 100644 index 000000000000..63dea1ea1de7 --- /dev/null +++ b/sci-mathematics/maxima/files/dont-hardcode-python.patch @@ -0,0 +1,38 @@ +From a640c5e357ce2aafb6edcba9b6c641cbc7753880 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 24 Mar 2021 20:57:44 -0400 +Subject: [PATCH 1/1] doc/info/build_html.sh.in: use @PYTHON@ for the python + interpreter. + +Maxima's ./configure script already detects (or is prodded to use) a +certain python interpreter. The build_html.sh script, however, is +still using a hard-coded "python" command. On many systems, "python" +will be different from the python interpreter that we want to use; for +example when "python" is python-2.7.x and "python3" is what we want to +use with Maxima. + +This commit tweaks doc/info/build_html.sh.in to use the value of the +$PYTHON variable instead. + +Maxima-Bug: https://sourceforge.net/p/maxima/bugs/3754 +Gentoo-Bug: https://bugs.gentoo.org/766291 +--- + doc/info/build_html.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/info/build_html.sh.in b/doc/info/build_html.sh.in +index 37930e9..c10e38d 100755 +--- a/doc/info/build_html.sh.in ++++ b/doc/info/build_html.sh.in +@@ -46,7 +46,7 @@ do + echo "filenamebase = \"$filenamebase\"" + cat $f + done | @AWK@ '!/^@c / && !/^@c$/ && (/^@deffn/ || /^@defvr/ || /^@end deffn/ || /^@end defvr/ || /@category/ || /@node/ || /^filenamebase/)' | @SED@ -f @abs_srcdir@/extract_categories1.sed | @AWK@ -f @abs_srcdir@/extract_categories1.awk > make-categories.py +-python make-categories.py ++@PYTHON@ make-categories.py + @SED@ -e 's/^@bye/@node Documentation Categories, , Function and Variable Index\n@chapter Documentation Categories/' @abs_srcdir@/maxima.texi > maxima.texi + ( for f in Category-*.texi; do echo '@include' $f; done ; echo @bye ) >> maxima.texi + +-- +2.26.2 + diff --git a/sci-mathematics/maxima/files/ecls-4.patch b/sci-mathematics/maxima/files/ecls-4.patch new file mode 100644 index 000000000000..7c597c223333 --- /dev/null +++ b/sci-mathematics/maxima/files/ecls-4.patch @@ -0,0 +1,16 @@ +diff --git a/src/maxima.system b/src/maxima.system +index ee7ca0f..85ec36f 100644 +--- a/src/maxima.system ++++ b/src/maxima.system +@@ -75,6 +75,11 @@ + ;; Convert dir/foo.fas to dir/foo.o + (make-pathname :type "o" :defaults p)) + files))) ++ (c::build-fasl "binary-ecl/maxima" :lisp-files obj ++ :ld-flags ++ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" ++ (find-package "MAXIMA"))))) ++ (if (and x (not (string= x ""))) (list x)))) + (c::build-program "binary-ecl/maxima" :lisp-files obj + :ld-flags + (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" diff --git a/sci-mathematics/maxima/files/support-new-vtk.patch b/sci-mathematics/maxima/files/support-new-vtk.patch new file mode 100644 index 000000000000..3296ce276467 --- /dev/null +++ b/sci-mathematics/maxima/files/support-new-vtk.patch @@ -0,0 +1,26 @@ +commit c21598340008892173578718afa577f93ebfdd45 +Author: Leo Butler <l_butler@users.sourceforge.net> +Date: Sat Feb 13 16:16:20 2021 -0600 + + Fix SF Bug #3714, Update maxima to use vtk-8.2.0 + + The GlobalImmediateModeRenderingOn method was deprecated in the VTK + codebase in 2017, + + https://github.com/Kitware/VTK/commit/67e054c91063be30e8e991de489fdda3af668e22 + + This commit may change or break draw-vtk user code that relies on + older versions of vtk. + +diff --git a/share/draw/vtk.lisp b/share/draw/vtk.lisp +index 6ff0f9586..1964048d2 100644 +--- a/share/draw/vtk.lisp ++++ b/share/draw/vtk.lisp +@@ -224,7 +224,6 @@ + (defun vtkpolydatamapper-code (mn fn con) + (concatenate 'string + (format nil "~a=vtk.vtkPolyDataMapper()~%" mn) +- (format nil "~a.GlobalImmediateModeRenderingOn()~%" mn) + (if con + (format nil "~a.SetInputConnection(~a.GetOutputPort())~%" mn fn) + "") )) |