Skip to content
Closed
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
4 changes: 2 additions & 2 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -4191,7 +4191,7 @@ liblinbox.so.0 linbox-1.6.3_1
libpari-gmp-tls.so.8 pari-2.15.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
libplanarity.so.0 planarity-3.0.1.1_1
libgap.so.8 gap-4.12.0_1
libgap.so.9 gap-4.13.0_1
libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
libxcvt.so.0 libxcvt-0.1.1_1
libgf2x.so.3 gf2x-1.3.0_1
Expand Down Expand Up @@ -4240,7 +4240,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.23.9 ecl-23.9.9_1
libecl.so.24.5 ecl-24.5.10_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: 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=23.9.9
version=24.5.10
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=c51bdab4ca6c1173dd3fe9cfe9727bcefb97bb0a3d6434b627ca6bdaeb33f880
checksum=e4ea65bb1861e0e495386bfa8bc673bd014e96d3cf9d91e9038f91435cbe622b

if [ "$CROSS_BUILD" ]; then
# Depend on system ecl
Expand Down
11 changes: 11 additions & 0 deletions srcpkgs/eclib/patches/fix-32bit-Euler.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/libsrc/interface.cc
+++ b/libsrc/interface.cc
@@ -103,7 +103,7 @@ void Compute_Euler(RR& y)

l = RR::precision();

- x = 1 + static_cast<long>((0.25 * (l - 3)) * (NTL_BITS_PER_LONG * LOG2));
+ x = 1 + static_cast<long>((0.25 * (l - 3)) * (64 * LOG2));
n = 1 + static_cast<long>(3.591 * x);

a=x;
6 changes: 3 additions & 3 deletions srcpkgs/eclib/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'eclib'
pkgname=eclib
version=20231212
revision=2
version=20240408
revision=1
build_style=gnu-configure
configure_args="--with-flint --with-boost"
makedepends="pari-devel ntl-devel flintlib-devel boost-devel"
Expand All @@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/JohnCremona/eclib"
changelog="https://github.com/JohnCremona/eclib/releases"
distfiles="https://github.com/JohnCremona/eclib/releases/download/v${version}/eclib-${version}.tar.bz2"
checksum=32d116a3e359b0de4f6486c2bb6188bb8b553c8b833f618cc2596484e8b6145a
checksum=3ba908e2019de53fcba141449caa6fa82f03605bf83bf9da8092df538adabe7c

eclib-devel_package() {
depends="${sourcepkg}>=${version}_${revision} ntl-devel"
Expand Down
12 changes: 8 additions & 4 deletions srcpkgs/gap/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'gap'
pkgname=gap
version=4.12.2
version=4.13.1
revision=1
build_style=gnu-configure
makedepends="gmp-devel zlib-devel readline-devel"
Expand All @@ -11,11 +11,15 @@ license="GPL-2.0-or-later"
homepage="https://www.gap-system.org/"
changelog="https://raw.githubusercontent.com/gap-system/gap/master/CHANGES.md"
distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"
checksum=672308745eb78a222494ee8dd6786edd5bc331456fcc6456ac064bdb28d587a8
checksum=9794dbdba6fb998e0a2d0aa8ce21fc8848ad3d3f9cc9993b0b8e20be7e1dbeba

if [ "$XBPS_CHECK_PKGS" = full ]; then
# not sure about this -- takes about 25 minutes
make_check_target=teststandard
do_check() {
# disable failing test
rm -f tst/teststandard/testLuxPahlings/example_4.4.18.tst
# about 5 minutes single core
./gap tst/teststandard.g
}
fi

_GAPROOT=/usr/share/gap/
Expand Down
7 changes: 5 additions & 2 deletions srcpkgs/giac/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'giac'
pkgname=giac
version=1.9.0.97
version=1.9.0.995
revision=1
build_style=gnu-configure
configure_args="--disable-micropy --disable-quickjs"
Expand All @@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new"
distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
checksum=fb384d92a5dc54d47df930b010de13c91e0d827a684b70f9673ae6b08be5f48d
checksum=b84b44287d260483ceea6703e12c5efcd67977b0f8f942e4fce20c31f837bcb3

# need more than 4*65536 stack, see try_parse() in gen.cc line 11812
LDFLAGS="-Wl,-z,stack-size=2097152"
Expand All @@ -38,6 +38,9 @@ esac
post_extract() {
# Missing... triggers doc rebuild which fails
touch doc/en/tutoriel.stamp
# remove a binary that works only for a particular host
# the binary will be rebuilt using host compiler
rm src/mkjs
}

pre_configure() {
Expand Down
4 changes: 3 additions & 1 deletion srcpkgs/maxima/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'maxima'
pkgname=maxima
version=5.47.0
revision=3
revision=4
build_style=gnu-configure
configure_args="$(vopt_enable clisp) $(vopt_enable sbcl) $(vopt_enable ecl)
makeinfo_found=true"
Expand All @@ -24,6 +24,8 @@ nopie_files=/usr/lib/maxima/$version/binary-sbcl/maxima
if [ "$build_option_sbcl" ]; then
# binary-sbcl/maxima uses libgmp but this won't show up in objdump
shlib_requires=libgmp.so.10
# build standalone executable
configure_args+=" --enable-sbcl-exec"
fi

build_options="clisp sbcl ecl"
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/python3-conway-polynomials/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'python3-conway-polynomials'
pkgname=python3-conway-polynomials
version=0.9
version=0.10
revision=1
build_style=python3-pep517
make_check_args="--doctest-modules --doctest-glob=README.rst"
Expand All @@ -12,5 +12,5 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="Public Domain, GPL-3.0-or-later"
homepage="https://github.com/sagemath/conway-polynomials"
changelog="https://github.com/sagemath/conway-polynomials/raw/master/NEWS"
distfiles="${PYPI_SITE}/c/conway-polynomials/conway-polynomials-${version}.tar.gz"
checksum=6ed2300609bce79f0175d5b8546858eec02854f8be3237db8d1449ccccc1c581
distfiles="${PYPI_SITE}/c/conway-polynomials/conway_polynomials-${version}.tar.gz"
checksum=4f619f64f81a3eb16c4e26c5a284feeec27a6f4aad647643e79af289801ae0f3
22 changes: 0 additions & 22 deletions srcpkgs/python3-gmpy2/patches/test-optional-mpmath.patch

This file was deleted.

11 changes: 4 additions & 7 deletions srcpkgs/python3-gmpy2/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Template file for 'python3-gmpy2'
pkgname=python3-gmpy2
version=2.2.0a1
# need $version > 2.2.0a1 which we shipped before by necessity
version=2.2.0r
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
Expand All @@ -12,14 +13,10 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="LGPL-3.0-or-later"
homepage="https://github.com/aleaxit/gmpy"
changelog="https://github.com/aleaxit/gmpy/releases"
distfiles="${PYPI_SITE}/g/gmpy2/gmpy2-${version}.tar.gz"
checksum=3b8acc939a40411a8ad5541ed178ff866dd1759e667ee26fe34c9291b6b350c3
distfiles="${PYPI_SITE}/g/gmpy2/gmpy2-${version%r}.tar.gz"
checksum=e19e62dfeb1e4a57079f0bf51c51dec30633d9fe9e89cb9a083e05e4823afa70

if [ "$XBPS_CHECK_PKGS" = full ]; then
# this would cause a build-time circular dependency
checkdepends+=" python3-mpmath"
fi

do_check() {
( cd test && PYTHONPATH="$(cd ../build/lib* && pwd)" python3 runtests.py )
}
13 changes: 13 additions & 0 deletions srcpkgs/python3-sympy/patches/fix-test.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Upstream at https://github.com/sympy/sympy/pull/26823

--- a/sympy/codegen/tests/test_fnodes.py
+++ b/sympy/codegen/tests/test_fnodes.py
@@ -44,7 +44,7 @@ def test_size_assumed_shape():
'program myprog\n'
'use mod_rms, only: rms\n'
'real*8, dimension(4), parameter :: x = [4, 2, 2, 2]\n'
- 'print *, dsqrt(7d0) - rms(x)\n'
+ 'print "(f7.5)", dsqrt(7d0) - rms(x)\n'
'end program\n'
))
], clean=True)
26 changes: 0 additions & 26 deletions srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch

This file was deleted.

9 changes: 3 additions & 6 deletions srcpkgs/python3-sympy/template
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
# Template file for 'python3-sympy'
pkgname=python3-sympy
version=1.12.1
version=1.13.1
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-mpmath"
checkdepends="$depends python3-pytest python3-pytest-xdist gcc-fortran
python3-Cython python3-devel python3-ipython python3-lxml python3-matplotlib
python3-numexpr python3-numpy python3-scipy"
python3-numexpr python3-numpy python3-scipy python3-hypothesis"
short_desc="Computer algebra system for Python3"
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="BSD-3-Clause"
homepage="https://sympy.org/"
changelog="https://github.com/sympy/sympy/wiki/Release-Notes"
distfiles="${PYPI_SITE}/s/sympy/sympy-${version}.tar.gz"
checksum=2877b03f998cd8c08f07cd0de5b767119cd3ef40d09f41c30d722f6686b0fb88

# slow tests are broken
make_check_args="-m not(slow)"
checksum=9cebf7e04ff162015ce31c9c6c9144daa34a93bd082f54fd8f12deca4f47515f

post_install() {
vman doc/man/isympy.1
Expand Down
76 changes: 76 additions & 0 deletions srcpkgs/sagemath/patches/36641-sympy_1.13.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
diff --git a/build/pkgs/sympy/requirements.txt b/build/pkgs/sympy/requirements.txt
new file mode 100644
index 00000000000..3ef8f90b550
diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
index 7e9eab2ff2e..43365cd645e 100644
--- a/src/sage/doctest/forker.py
+++ b/src/sage/doctest/forker.py
@@ -150,14 +150,15 @@ def init_sage(controller=None):
sage: from sympy.printing.pretty.pretty import PrettyPrinter
sage: s = sympify('+x^'.join(str(i) for i in range(30)))
sage: print(PrettyPrinter(settings={'wrap_line': True}).doprint(s))
- 29 28 27 26 25 24 23 22 21 20 19 18 17
- x + x + x + x + x + x + x + x + x + x + x + x + x +
+ 29 28 27 26 25 24 23 22 21 20 19 18 17 ↪
+ x + x + x + x + x + x + x + x + x + x + x + x + x + ↪
<BLANKLINE>
- 16 15 14 13 12 11 10 9 8 7 6 5 4 3
- x + x + x + x + x + x + x + x + x + x + x + x + x + x + x
+ ↪ 16 15 14 13 12 11 10 9 8 7 6 5 4 3 ↪
+ ↪ x + x + x + x + x + x + x + x + x + x + x + x + x + x + ↪
<BLANKLINE>
- 2
- + x
+ ↪ 2
+ ↪ x + x
+

The displayhook sorts dictionary keys to simplify doctesting of
dictionary output::
diff --git a/src/sage/functions/hypergeometric.py b/src/sage/functions/hypergeometric.py
index 010c61febe0..bbccbd20032 100644
--- a/src/sage/functions/hypergeometric.py
+++ b/src/sage/functions/hypergeometric.py
@@ -124,7 +124,7 @@
sage: maxima(hypergeometric([1, 1, 1], [3, 3, 3], x)) # needs sage.symbolic
hypergeometric([1,1,1],[3,3,3],_SAGE_VAR_x)
sage: hypergeometric((5, 4), (4, 4), 3)._sympy_() # needs sympy sage.symbolic
- hyper((5, 4), (4, 4), 3)
+ hyper((5,), (4,), 3)
sage: hypergeometric((5, 4), (4, 4), 3)._mathematica_init_() # needs sage.symbolic
'HypergeometricPFQ[{5,4},{4,4},3]'

diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx
index a92fe241355..f62311423be 100644
--- a/src/sage/symbolic/expression.pyx
+++ b/src/sage/symbolic/expression.pyx
@@ -1167,7 +1167,7 @@ cdef class Expression(Expression_abc):
sage: unicode_art(SR(13 - I))
13 - ⅈ
sage: unicode_art(SR(1.3 - I))
- 1.3 - ⅈ
+ 1.3 - 1.0⋅ⅈ
sage: unicode_art(cos(I))
cosh(1)

diff --git a/src/sage/typeset/ascii_art.py b/src/sage/typeset/ascii_art.py
index 28024405d27..458fa8724a3 100644
--- a/src/sage/typeset/ascii_art.py
+++ b/src/sage/typeset/ascii_art.py
@@ -44,11 +44,12 @@
sage: shell.run_cell('%display ascii_art')
sage: shell.run_cell("i = var('i')") # needs sage.symbolic
sage: shell.run_cell('sum(factorial(i)*x^i, i, 0, 10)') # needs sage.symbolic
- 10 9 8 7 6 5 4 3
- 3628800*x + 362880*x + 40320*x + 5040*x + 720*x + 120*x + 24*x + 6*x
+ 10 9 8 7 6 5 4 3 >
+ 3628800*x + 362880*x + 40320*x + 5040*x + 720*x + 120*x + 24*x + 6*x >
<BLANKLINE>
- 2
- + 2*x + x + 1
+ > 2
+ > + 2*x + x + 1
+
sage: shell.run_cell('3/(7*x)') # needs sage.symbolic
3
---
Loading