sagemath · mkoeppe · Sep 15, 2023 · Dec 13, 2023 · Dec 13, 2023 · Dec 13, 2023
diff --git a/build/pkgs/gmp/checksums.ini b/build/pkgs/gmp/checksums.ini
@@ -1,5 +1,5 @@
 tarball=gmp-VERSION.tar.xz
-sha1=0578d48607ec0e272177d175fd1807c30b00fdf2
-md5=0b82665c4a92fd2ade7440c13fcaa42b
-cksum=1546558141
+sha1=b4043dd2964ab1a858109da85c44de224384f352
+md5=956dc04e864001a9c22429f761f2c283
+cksum=1735788654
 upstream_url=https://gmplib.org/download/gmp/gmp-VERSION.tar.xz
diff --git a/build/pkgs/gmp/package-version.txt b/build/pkgs/gmp/package-version.txt
@@ -1 +1 @@
-6.2.1
+6.3.0
diff --git a/build/pkgs/gmpy2/SPKG.rst b/build/pkgs/gmpy2/SPKG.rst
@@ -4,10 +4,20 @@ gmpy2: Python interface to GMP/MPIR, MPFR, and MPC
 Description
 -----------
 
-GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x
+GMP/MPIR, MPFR, and MPC interface to Python
 
 gmpy2 is a C-coded Python extension module that supports
 multiple-precision arithmetic. In addition to supporting GMP or MPIR for
 multiple-precision integer and rational arithmetic, gmpy2 adds support
 for the MPFR (correctly rounded real floating-point arithmetic) and MPC
 (correctly rounded complex floating-point arithmetic) libraries.
+
+License
+-------
+
+LGPL-3.0+
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/gmpy2/
diff --git a/build/pkgs/gmpy2/checksums.ini b/build/pkgs/gmpy2/checksums.ini
@@ -1,5 +1,5 @@
 tarball=gmpy2-VERSION.tar.gz
-sha1=8280f6c68c57dd4a2fce149162c080c1dac86eb0
-md5=bb21846e99800e04d5b330b76c23ba10
-cksum=3835762323
+sha1=700ef438964acd286d52e973a833cd57ae9a7ad7
+md5=72b93048015b28efcf92ed702014a61c
+cksum=3542820546
 upstream_url=https://pypi.io/packages/source/g/gmpy2/gmpy2-VERSION.tar.gz
diff --git a/build/pkgs/gmpy2/install-requires.txt b/build/pkgs/gmpy2/install-requires.txt
@@ -1 +1 @@
-gmpy2 >=2.1.0
+gmpy2 ~= 2.2.0a1
diff --git a/build/pkgs/gmpy2/package-version.txt b/build/pkgs/gmpy2/package-version.txt
@@ -1 +1 @@
-2.1.2
+2.2.0a1
diff --git a/build/pkgs/mpc/checksums.ini b/build/pkgs/mpc/checksums.ini
@@ -1,4 +1,5 @@
 tarball=mpc-VERSION.tar.gz
-sha1=b019d9e1d27ec5fb99497159d43a3164995de2d0
-md5=4125404e41e482ec68282a2e687f6c73
-cksum=3987925640
+sha1=bac1c1fa79f5602df1e29e4684e103ad55714e02
+md5=5c9bc658c9fd0f940e8e3e0f09530c62
+cksum=3202795598
+upstream_url=https://ftp.gnu.org/gnu/mpc/mpc-VERSION.tar.gz
diff --git a/build/pkgs/mpc/distros/repology.txt b/build/pkgs/mpc/distros/repology.txt
@@ -1 +1,2 @@
+gnumpc
 libmpc
diff --git a/build/pkgs/mpc/package-version.txt b/build/pkgs/mpc/package-version.txt
@@ -1 +1 @@
-1.1.0
+1.3.1
diff --git a/build/pkgs/mpc/spkg-configure.m4 b/build/pkgs/mpc/spkg-configure.m4
@@ -1,8 +1,19 @@
 SAGE_SPKG_CONFIGURE([mpc], [
     SAGE_SPKG_DEPCHECK([mpfr], [
-        AC_CHECK_HEADER(mpc.h, [], [sage_spkg_install_mpc=yes])
-        dnl mpc_cmp_abs appeared in MPC 1.1.0
-        AC_SEARCH_LIBS([mpc_cmp_abs], [mpc], [], [sage_spkg_install_mpc=yes])
+        dnl gmpy2 2.2 needs MPC >= 1.2.1 according https://github.com/aleaxit/gmpy/blob/master/src/gmpy2.h#L86
+        AC_MSG_CHECKING([for MPC >= 1.2.1])
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mpc.h>]], [[
+#if (!defined(MPC_VERSION) || (MPC_VERSION < MPC_VERSION_NUM(1,2,1)))
+#  error "Sage requires MPC 1.2.1 or later (for gmpy2 2.2)."
+#endif
+        ]])], [
+            AC_MSG_RESULT([yes])
+            dnl mpc_sum was added in MPC 1.2.0 according to https://www.multiprecision.org/mpc/olds.html
+            AC_SEARCH_LIBS([mpc_sum], [mpc], [], [sage_spkg_install_mpc=yes])
+        ], [
+            AC_MSG_RESULT([no])
+            sage_spkg_install_mpc=yes
+        ])
     ])
 ], [], [], [
     if test x$sage_spkg_install_mpc = xyes; then

diff --git a/build/pkgs/mpfr/checksums.ini b/build/pkgs/mpfr/checksums.ini
@@ -1,4 +1,5 @@
 tarball=mpfr-VERSION.tar.bz2
-sha1=fcbbafb37c683898e585b926608d540ed037609e
-md5=8c21d8ac7460493b2b9f3ef3cc610454
-cksum=3260550035
+sha1=f9dbe49b092e4c8e0a039e6d46c059696cc2f51c
+md5=7765afa036e4ce7fb0e02bce0fef894b
+cksum=1526077734
+upstream_url=https://www.mpfr.org/mpfr-current/mpfr-VERSION.tar.bz2
diff --git a/build/pkgs/mpfr/package-version.txt b/build/pkgs/mpfr/package-version.txt
@@ -1 +1 @@
-4.0.1.p0
+4.2.1
diff --git a/build/pkgs/mpfr/spkg-configure.m4 b/build/pkgs/mpfr/spkg-configure.m4
@@ -1,8 +1,9 @@
 SAGE_SPKG_CONFIGURE([mpfr], [
     SAGE_SPKG_DEPCHECK([gmp], [
         AC_CHECK_HEADER(mpfr.h, [], [sage_spkg_install_mpfr=yes])
-        dnl mpfr_free_pool appeared in r11922 (Dec 2017) on MPFR svn
-        AC_SEARCH_LIBS([mpfr_free_pool], [mpfr], [], [sage_spkg_install_mpfr=yes])
+        dnl gmpy2 2.2 needs MPFR >= 4.1.0 according https://github.com/aleaxit/gmpy/blob/master/src/gmpy2.h#L86
+        dnl mpfr_cmpabs_ui was added in 4.1.0 according to https://github.com/BrianGladman/mpfr/blob/master/NEWS#L26
+        AC_SEARCH_LIBS([mpfr_cmpabs_ui], [mpfr], [], [sage_spkg_install_mpfr=yes])
     ])
 ], [], [], [
     if test x$sage_spkg_install_mpfr = xyes; then

diff --git a/build/pkgs/mpfrcx/checksums.ini b/build/pkgs/mpfrcx/checksums.ini
@@ -1,4 +1,5 @@
 tarball=mpfrcx-VERSION.tar.gz
-sha1=33fbf3fdbe69fe163fe4f2ebcc79630b11c329e6
-md5=44287784a8ad9a5367c68e9ae636864f
-cksum=1348973008
+sha1=460bc7cb48fae4f8070b73912080fdf0c08c93b6
+md5=45077ba92dccc25488086962d160de6c
+cksum=1142118879
+upstream_url=https://www.multiprecision.org/downloads/mpfrcx-VERSION.tar.gz
diff --git a/build/pkgs/mpfrcx/package-version.txt b/build/pkgs/mpfrcx/package-version.txt
@@ -1 +1 @@
-0.5
+0.6.3