Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -4241,7 +4241,7 @@ libcxsparse.so.4 SuiteSparse-6.0.1_1
libspqr.so.4 SuiteSparse-7.2.0_1
libsuitesparseconfig.so.7 SuiteSparse-7.0.1_1
libumfpack.so.6 SuiteSparse-6.0.1_1
libecl.so.24.5 ecl-24.5.10_1
libecl.so.26.3 ecl-26.3.27_1
libecm.so.1 ecm-7.0.4_3
libcliquer.so.1 cliquer-1.22_1
libomalloc-0.9.6.so singular-4.2.1_1
Expand Down
4 changes: 3 additions & 1 deletion srcpkgs/ecl/files/cross_config
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,19 @@ ECL_STACK_DIR=down

### 1.2) Choose an integer datatype which is large enough to host a pointer
if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
CL_FIXNUM_TYPE="long long int"
CL_FIXNUM_TYPE=long
CL_FIXNUM_BITS=64
CL_FIXNUM_MAX=2305843009213693951LL
CL_FIXNUM_MIN=-2305843009213693952LL
CL_SHORT_BITS=16
CL_INT_BITS=32
CL_LONG_BITS=64
else
CL_FIXNUM_TYPE=int
CL_FIXNUM_BITS=32
CL_FIXNUM_MAX=536870911L
CL_FIXNUM_MIN=-536870912L
CL_SHORT_BITS=16
CL_INT_BITS=32
CL_LONG_BITS=32
fi
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/ecl/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'ecl'
pkgname=ecl
version=24.5.10
version=26.3.27
revision=1
build_style=gnu-configure
configure_args="--enable-gmp=system --enable-boehm=system
Expand All @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
homepage="https://ecl.common-lisp.dev/"
changelog="https://gitlab.com/embeddable-common-lisp/ecl/-/raw/develop/CHANGELOG"
distfiles="https://ecl.common-lisp.dev/static/files/release/ecl-${version}.tgz"
checksum=e4ea65bb1861e0e495386bfa8bc673bd014e96d3cf9d91e9038f91435cbe622b
checksum=416d5707bf11d2b3d8d33d6791419a786e4cc59ac0cc3ec505ee59b51a9f5c9a

if [ "$CROSS_BUILD" ]; then
# Depend on system ecl
Expand Down
28 changes: 6 additions & 22 deletions srcpkgs/maxima/template
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Template file for 'maxima'
pkgname=maxima
version=5.47.0
revision=4
version=5.49.0
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable clisp) $(vopt_enable sbcl) $(vopt_enable ecl)
makeinfo_found=true"
configure_args="$(vopt_enable clisp) $(vopt_enable sbcl) $(vopt_enable ecl)"
hostmakedepends="texinfo"
makedepends="$(vopt_if clisp clisp) $(vopt_if sbcl sbcl) $(vopt_if ecl ecl)"
depends="$(vopt_if clisp clisp) rlwrap"
checkdepends="gnuplot"
Expand All @@ -14,7 +14,7 @@ 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=9104021b24fd53e8c03a983509cb42e937a925e8c0c85c335d7709a14fd40f7a
checksum=6d401a4aa307cd3a5a9cadca4fa96c4ef0e24ff95a18bb6a8f803e3d2114adee
nocross=yes

# maxima-sbcl is nopie and should NOT be stripped or it won't work
Expand Down Expand Up @@ -43,22 +43,6 @@ esac

vopt_conflict clisp sbcl

pre_build() {
# do not rebuild these files if they exist
touch -c doc/info/*.html
touch -c doc/info/maxima.info*
touch -c doc/info/maxima_toc.html
touch -c doc/info/maxima-index.lisp
touch -c doc/info/maxima-index-html.lisp
touch -c interfaces/xmaxima/doc/xmaxima.info
touch -c interfaces/xmaxima/doc/xmaxima.html
}

post_build() {
# this one needs to be done after building
touch -c interfaces/emacs/imaxima/imaxima.info
}

do_check() {
if [ "$build_option_ecl" ]; then
echo "maxima-ecl: check that maxima.fas works (#34273)"
Expand All @@ -80,7 +64,7 @@ do_check() {
timeout -v 30s ./maxima-local -q -l sbcl --batch-string="
showtime : true $
a : 10^(10^5) $
b : a^1000 $
b : a^600 $
"
echo PASS
fi
Expand Down
615 changes: 615 additions & 0 deletions srcpkgs/sagemath/patches/40679-Update_to_maxima_5.49.patch

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions srcpkgs/sagemath/patches/fix-cypari2-warning.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/src/sage/rings/factorint_pari.pyx b/src/sage/rings/factorint_pari.pyx
index 1774cbf0886..be0a500c2b6 100644
--- a/src/sage/rings/factorint_pari.pyx
+++ b/src/sage/rings/factorint_pari.pyx
@@ -53,8 +53,6 @@ def factor_using_pari(n, int_=False, debug_level=0, proof=None):
sage: from sage.doctest.util import ensure_interruptible_after
sage: with ensure_interruptible_after(0.5): factor(2^1000 - 1, verbose=5)
...
- doctest:warning...
- RuntimeWarning: cypari2 leaked ... bytes on the PARI stack
sage: pari.get_debug_level()
0
"""
diff --git a/src/sage/rings/integer.pyx b/src/sage/rings/integer.pyx
index 358aac0339c..dc4dcc4866e 100644
--- a/src/sage/rings/integer.pyx
+++ b/src/sage/rings/integer.pyx
@@ -7305,10 +7305,11 @@ cdef class Integer(sage.structure.element.EuclideanDomainElement):
check for reliable interrupting, see :issue:`18919`::

sage: from cysignals import AlarmInterrupt
+ sage: from warnings import filterwarnings
+ sage: filterwarnings("ignore", r"cypari2 leaked \d+ bytes on the PARI stack")
sage: for i in [1..10]: # long time (5s) # needs sage.libs.pari
....: with ensure_interruptible_after(i/11):
....: (2^100).binomial(2^22, algorithm='pari')
- doctest:...: RuntimeWarning: cypari2 leaked ... bytes on the PARI stack...
"""
cdef Integer x
cdef Integer mm
12 changes: 12 additions & 0 deletions srcpkgs/sagemath/patches/fix-doctest-ipython-9.12.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/src/sage/doctest/test.py b/src/sage/doctest/test.py
index 8e7ecac8bbe..7831de313cc 100644
--- a/src/sage/doctest/test.py
+++ b/src/sage/doctest/test.py
@@ -469,6 +469,7 @@ Test the ``--debug`` option::
s...: b = 5
s...: a + b
8
+ ...
sage:
<BLANKLINE>
Returning to doctests...
11 changes: 11 additions & 0 deletions srcpkgs/sagemath/patches/fix-doctest-maxima-5.49.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/sage/calculus/calculus.py
+++ b/src/sage/calculus/calculus.py
@@ -1824,7 +1824,7 @@ def laplace(ex, t, s, algorithm='maxima'):
sage: f = exp (2*t + a) * sin(t) * t; f
t*e^(a + 2*t)*sin(t)
sage: L = laplace(f, t, s); L
- 2*(s - 2)*e^a/(s^2 - 4*s + 5)^2
+ 2*(s - 2)*e^a/(s^4 - 8*s^3 + 26*s^2 - 40*s + 25)
sage: inverse_laplace(L, s, t)
t*e^(a + 2*t)*sin(t)

1 change: 1 addition & 0 deletions srcpkgs/sagemath/patches/get_patches
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ get_pr 41346 "Fix execution_count for newer ipython version"
get_pr 41394 "Fix doctest failure with python 3.14"
get_pr 41433 "Fix test failures with scipy 1.17"
get_pr 41469 "Prevent leaking file descriptors"
get_pr 40679 "Update to maxima 5.49"
2 changes: 1 addition & 1 deletion srcpkgs/sagemath/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'sagemath'
pkgname=sagemath
version=10.8
revision=1
revision=2
_pypi_version=${version/.beta/b}
_pypi_version=${_pypi_version/.rc/rc}
build_style=python3-pep517
Expand Down
Loading