Skip to content

Commit

Permalink
sagemath: patch and rebuild for maxima 5.47.0
Browse files Browse the repository at this point in the history
Also:
 - patch for singular 4.3.2p2
 - patch for numpy 1.25.0
 - patch for setuptools 68.0.0
  • Loading branch information
tornaria committed Jun 25, 2023
1 parent 2f8fb1c commit f090ee0
Show file tree
Hide file tree
Showing 7 changed files with 1,033 additions and 9 deletions.
29 changes: 23 additions & 6 deletions srcpkgs/sagemath/patches/35619-maxima_5.46.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,25 @@ index ee1667aec16..72083337942 100644

sdh_configure $SAGE_CONFIGURE_GMP \
diff --git a/build/pkgs/giac/spkg-configure.m4 b/build/pkgs/giac/spkg-configure.m4
index 5859e35f12e..b677184b7be 100644
index 5859e35f12e..53e3a8301cd 100644
--- a/build/pkgs/giac/spkg-configure.m4
+++ b/build/pkgs/giac/spkg-configure.m4
@@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([giac], [
m4_pushdef([GIAC_MAX_VERSION], [1.9.999])
AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION[, <= ]GIAC_MAX_VERSION, [ac_cv_path_GIAC], [
AC_PATH_PROGS_FEATURE_CHECK([GIAC], [giac], [
- giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -1)
+ giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -n -1)
+ giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -n 1)
AS_IF([test -n "$giac_version"], [
AX_COMPARE_VERSION([$giac_version], [ge], GIAC_MIN_VERSION, [
AX_COMPARE_VERSION([$giac_version], [le], GIAC_MAX_VERSION, [
diff --git a/build/pkgs/info/distros/fedora.txt b/build/pkgs/info/distros/fedora.txt
index 283aa462f74..c0d8f74e0ad 100644
--- a/build/pkgs/info/distros/fedora.txt
+++ b/build/pkgs/info/distros/fedora.txt
@@ -1 +1 @@
-texinfo
+texinfo info
diff --git a/build/pkgs/info/spkg-configure.m4 b/build/pkgs/info/spkg-configure.m4
index 0980a4b8ef8..85fe1ea4731 100644
--- a/build/pkgs/info/spkg-configure.m4
Expand Down Expand Up @@ -108,6 +115,16 @@ index a804c7b831f..0f594389fe6 100644
+md5=3c01f1daa6936e11d8713fef7751d3fe
+cksum=2420393096
upstream_url=https://sourceforge.net/projects/maxima/files/Maxima-source/VERSION-source/maxima-VERSION.tar.gz/download
diff --git a/build/pkgs/maxima/dependencies b/build/pkgs/maxima/dependencies
index fffb89e2050..55c7e0d8d14 100644
--- a/build/pkgs/maxima/dependencies
+++ b/build/pkgs/maxima/dependencies
@@ -1,4 +1,4 @@
-ecl
+ecl info

----------
All lines of this file are ignored except the first.
diff --git a/build/pkgs/maxima/distros/arch.txt b/build/pkgs/maxima/distros/arch.txt
index 6400290f44d..6ac052fa62b 100644
--- a/build/pkgs/maxima/distros/arch.txt
Expand Down Expand Up @@ -198,7 +215,7 @@ index 74db62e7f9f..00000000000
- (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
diff --git a/build/pkgs/maxima/spkg-configure.m4 b/build/pkgs/maxima/spkg-configure.m4
new file mode 100644
index 00000000000..dc54525320e
index 00000000000..86de8c1dfc1
--- /dev/null
+++ b/build/pkgs/maxima/spkg-configure.m4
@@ -0,0 +1,46 @@
Expand All @@ -209,7 +226,7 @@ index 00000000000..dc54525320e
+ dnl we still use pexpect to communicate with it in a few places.
+ AC_CACHE_CHECK([for Maxima >= $SAGE_MAXIMA_MINVER], [ac_cv_path_MAXIMA], [
+ AC_PATH_PROGS_FEATURE_CHECK([MAXIMA], [maxima], [
+ maxima_version=`$ac_path_MAXIMA --version 2>&1 | tail -n -1\
+ maxima_version=`$ac_path_MAXIMA --version 2>&1 | tail -n 1\
+ | $SED -n -e 's/Maxima *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
+ AS_IF([test -n "$maxima_version"], [
+ AX_COMPARE_VERSION([$maxima_version], [ge], [SAGE_MAXIMA_MINVER], [
Expand Down Expand Up @@ -282,15 +299,15 @@ index 3ae6382f9ba..cdb6fbf2069 100644

sdh_make
diff --git a/build/pkgs/tox/spkg-configure.m4 b/build/pkgs/tox/spkg-configure.m4
index 7d8ade4c14b..3de0b9b710d 100644
index 7d8ade4c14b..5a260439cdd 100644
--- a/build/pkgs/tox/spkg-configure.m4
+++ b/build/pkgs/tox/spkg-configure.m4
@@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([tox], [
m4_pushdef([TOX4_MIN_VERSION], [4.0.15])
AC_CACHE_CHECK([for tox 3 >= ]TOX3_MIN_VERSION[ or tox 4 >= ]TOX4_MIN_VERSION, [ac_cv_path_TOX], [
AC_PATH_PROGS_FEATURE_CHECK([TOX], [tox], [
- tox_version=$($ac_path_TOX --version 2> /dev/null | tail -1)
+ tox_version=$($ac_path_TOX --version 2> /dev/null | tail -n -1)
+ tox_version=$($ac_path_TOX --version 2> /dev/null | tail -n 1)
AS_IF([test -n "$tox_version"], [
AX_COMPARE_VERSION([$tox_version], [lt], [4], [
AX_COMPARE_VERSION([$tox_version], [ge], TOX3_MIN_VERSION, [
Expand Down
Loading

0 comments on commit f090ee0

Please sign in to comment.