diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-09-19 23:22:40 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-19 23:22:40 +0100 |
commit | 4ae4e74a3a13c7c5aaebf61e650538b005204fcb (patch) | |
tree | 4abb4271a26b735b28a4eb8b69206cbcc8e7b4e2 /sci-mathematics/maxima/files | |
parent | b2a3508c3634488d32ec5bbe6b4365ab27185ebd (diff) |
gentoo auto-resync : 19:09:2022 - 23:22:40
Diffstat (limited to 'sci-mathematics/maxima/files')
-rw-r--r-- | sci-mathematics/maxima/files/clozurecl-2.patch | 27 | ||||
-rw-r--r-- | sci-mathematics/maxima/files/dont-hardcode-python.patch | 38 | ||||
-rw-r--r-- | sci-mathematics/maxima/files/ecls-3.patch | 48 | ||||
-rw-r--r-- | sci-mathematics/maxima/files/ecls-4.patch | 16 | ||||
-rw-r--r-- | sci-mathematics/maxima/files/support-new-vtk.patch | 26 |
5 files changed, 0 insertions, 155 deletions
diff --git a/sci-mathematics/maxima/files/clozurecl-2.patch b/sci-mathematics/maxima/files/clozurecl-2.patch deleted file mode 100644 index 5c5189c7e051..000000000000 --- a/sci-mathematics/maxima/files/clozurecl-2.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -r -U1 maxima-5.37.1.orig/configure.ac maxima-5.37.1/configure.ac ---- maxima-5.37.1.orig/configure.ac 2015-09-01 02:28:02.000000000 +0600 -+++ maxima-5.37.1/configure.ac 2015-09-03 18:11:54.335618720 +0600 -@@ -386,3 +386,3 @@ - dnl n.b. openmcl_default_name is hardcoded in "with" message --openmcl_default_name=openmcl -+openmcl_default_name=ccl - AC_ARG_ENABLE(openmcl, -diff -r -U1 maxima-5.37.1.orig/src/Makefile.am maxima-5.37.1/src/Makefile.am ---- maxima-5.37.1.orig/src/Makefile.am 2015-08-11 02:44:21.000000000 +0600 -+++ maxima-5.37.1/src/Makefile.am 2015-09-03 17:26:12.849734012 +0600 -@@ -338,3 +338,3 @@ - --EXECUTEOPENMCL = $(OPENMCL_NAME) -e -+EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e - BUILT_FILES += $(OPENMCL_MAXIMA) -diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in ---- maxima-5.37.1.orig/src/maxima.in 2015-05-22 04:40:03.000000000 +0600 -+++ maxima-5.37.1/src/maxima.in 2015-09-03 17:22:31.841743306 +0600 -@@ -182,5 +182,5 @@ - if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then -- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@" -+ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@" - else -- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$@" -+ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$@" - fi diff --git a/sci-mathematics/maxima/files/dont-hardcode-python.patch b/sci-mathematics/maxima/files/dont-hardcode-python.patch deleted file mode 100644 index 63dea1ea1de7..000000000000 --- a/sci-mathematics/maxima/files/dont-hardcode-python.patch +++ /dev/null @@ -1,38 +0,0 @@ -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-3.patch b/sci-mathematics/maxima/files/ecls-3.patch deleted file mode 100644 index b44dea4d09a8..000000000000 --- a/sci-mathematics/maxima/files/ecls-3.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -r -U3 maxima-5.42.0.orig/src/maxima.in maxima-5.42.0/src/maxima.in ---- maxima-5.42.0.orig/src/maxima.in 2018-09-21 08:21:11.000000000 +0700 -+++ maxima-5.42.0/src/maxima.in 2018-10-01 21:49:23.551633882 +0700 -@@ -236,7 +236,7 @@ - fi - - elif [ "$MAXIMA_LISP" = "ecl" ]; then -- exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -- "$@" -+ exec "$maxima_image_base" --frame-stack 4096 --lisp-stack 65536 $MAXIMA_LISP_OPTIONS -norc -- "$@" - - elif [ "$MAXIMA_LISP" = "sbcl" ]; then - # Use executable image if it exists. -diff -r -U3 maxima-5.42.0.orig/src/maxima.system maxima-5.42.0/src/maxima.system ---- maxima-5.42.0.orig/src/maxima.system 2016-12-04 05:27:40.000000000 +0700 -+++ maxima-5.42.0/src/maxima.system 2018-10-01 22:01:08.068604254 +0700 -@@ -59,6 +59,14 @@ - (c:build-fasl output :lisp-files (list object-output))))) - - #+ecl -+(defun split-ld-flags-for-ecl (string &aux space) -+ (setf string (string-trim '(#\Space) string)) -+ (if (setf space (position #\Space string)) -+ (cons (subseq string 0 space) -+ (split-ld-flags-for-ecl (subseq string (1+ space)))) -+ (cons string nil))) -+ -+#+ecl - (defun build-maxima-lib () - (labels ((list-all-objects (module) - (if (eql (mk::component-type module) :file) -@@ -75,11 +83,16 @@ - ;; 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 ""))) (split-ld-flags-for-ecl x)))) - (c::build-program "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))) -+ (if (and x (not (string= x ""))) (split-ld-flags-for-ecl x))) - :epilogue-code '(progn (require :defsystem) - (cl-user::run))))))) - diff --git a/sci-mathematics/maxima/files/ecls-4.patch b/sci-mathematics/maxima/files/ecls-4.patch deleted file mode 100644 index 7c597c223333..000000000000 --- a/sci-mathematics/maxima/files/ecls-4.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 3296ce276467..000000000000 --- a/sci-mathematics/maxima/files/support-new-vtk.patch +++ /dev/null @@ -1,26 +0,0 @@ -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) - "") )) |