diff --git a/srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch b/srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch deleted file mode 100644 index e1ac1e5f608671..00000000000000 --- a/srcpkgs/maxima/patches/a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit a0d7a43e5234305bd6f1de5909d4ce5d7e1ea864 -Author: Robert Dodier -Date: Mon Oct 11 22:40:13 2021 -0700 - - Apply patch #80: "Build a FASL library, needed by SageMath" - - This modifies maxima.system for ECL only. - -diff --git a/src/maxima.system b/src/maxima.system -index d954bc2b9..525fb778e 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/srcpkgs/maxima/template b/srcpkgs/maxima/template index 69e85ec833e8cc..f67b469e3dda34 100644 --- a/srcpkgs/maxima/template +++ b/srcpkgs/maxima/template @@ -1,19 +1,21 @@ # Template file for 'maxima' pkgname=maxima -version=5.45.1 -revision=4 +version=5.46.0 +revision=1 build_style=gnu-configure configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)" -hostmakedepends="python3 perl emacs texinfo patchelf" +hostmakedepends="python3 perl texinfo patchelf $(vopt_if ecl ecl)" makedepends="$(vopt_if clisp clisp) $(vopt_if sbcl sbcl) $(vopt_if ecl ecl)" depends="$(vopt_if clisp clisp) rlwrap" checkdepends="gnuplot" short_desc="Computer Algebra System" -maintainer="Bosco Garcia " +maintainer="Gonzalo TornarĂ­a " license="GPL-2.0-only" homepage="http://maxima.sourceforge.net" +changelog="https://sourceforge.net/p/maxima/code/ci/master/tree/changelogs/ChangeLog-${version%.*}.md?format=raw" distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz" -checksum=fe9016276970bef214a1a244348558644514d7fdfaa4fc8b9d0e87afcbb4e7dc +checksum=7390f06b48da65c9033e8b2f629b978b90056454a54022db7de70e2225aa8b07 +nocross=yes # maxima-sbcl is nopie and should NOT be stripped or it won't work nostrip_files=/usr/lib/maxima/$version/binary-sbcl/maxima @@ -32,7 +34,7 @@ build_options_default="ecl" # sbcl is only available for these architectures case "$XBPS_TARGET_MACHINE" in - i686|x86_64*|armv7l|aarch64|ppc64le*) + i686|x86_64*|armv7l|ppc64le*) build_options_default+=" sbcl" ;; esac @@ -113,11 +115,9 @@ maxima-src_package() { } maxima-emacs_package() { - short_desc+=" - Emacs interface" + short_desc+=" - transitional dummy package" depends="${sourcepkg}-${version}_${revision} virtual?emacs" - pkg_install() { - vmove usr/share/emacs - } + build_style=meta } xmaxima_package() {