upgrade to flint3

build/pkgs/e_antic/dependencies

@@ -1,4 +1,4 @@
-$(MP_LIBRARY) flint arb antic boost_cropped
+$(MP_LIBRARY) flint boost_cropped
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/flint/SPKG.rst

@@ -4,8 +4,8 @@ flint: Fast Library for Number Theory
 Description
 -----------
 
-FLINT is a C library for doing number theory, maintained by William
-Hart.
+FLINT is a C library for doing number theory, maintained by
+Fredrik Johansson.
 
 Website: http://www.flintlib.org
 
@@ -20,4 +20,4 @@ Upstream Contact
 
 -  flint-devel Gougle Group
    (http://groups.google.co.uk/group/flint-devel)
--  William Hart
+-  Fredrik Johansson

build/pkgs/flint/checksums.ini

@@ -1,5 +1,5 @@
 tarball=flint-VERSION.tar.gz
-sha1=d17a245bddec753c6eb5841b28d0322ba0c9e2b6
-md5=484e62dd7326a4af6e2072f4edbc769f
-cksum=1002348409
+sha1=4574283d65c8e1a69733be2e8126746ef88464ac
+md5=5d6421c3c17e62dbe321c1f03fd75160
+cksum=1625514091
 upstream_url=http://flintlib.org/flint-VERSION.tar.gz

build/pkgs/flint/package-version.txt

@@ -1 +1 @@
-2.8.4
+3.0.0-alpha1

build/pkgs/flint/patches/0001-fix-detection-of-ntl.patch

@@ -0,0 +1,27 @@
+From 39d5924982e54a20b923df49d4b6a3abe079040f Mon Sep 17 00:00:00 2001
+From: Marc Mezzarobba <[email protected]>
+Date: Thu, 29 Jun 2023 14:50:06 +0200
+Subject: [PATCH] fix detection of ntl
+
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 02c76ee01..d2b26950d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -653,8 +653,10 @@ fi
+
+ if test "$with_ntl" = "yes";
+ then
++    AC_LANG_PUSH([C++])
+     AC_CHECK_HEADER([NTL/ZZ.h],,
+                     AC_MSG_ERROR([Could not find NTL/ZZ.h!]))
++    AC_LANG_POP([C++])
+ fi
+
+ ################################################################################
+-- 
+2.40.1
+

build/pkgs/flint/spkg-build.in

@@ -0,0 +1,4 @@
+cd src
+./bootstrap.sh
+sdh_configure --with-ntl=yes
+sdh_make

build/pkgs/flint/spkg-configure.m4

@@ -1,8 +1,8 @@
 SAGE_SPKG_CONFIGURE([flint], [
     SAGE_SPKG_DEPCHECK([mpfr ntl], [
         AC_CHECK_HEADER(flint/flint.h, [
-          dnl fmpz_mod_ctx_init appears in Flint 2.6.0
-          AC_SEARCH_LIBS([fmpz_mod_ctx_init], [flint], [
+          dnl gr_get_fexpr appears in Flint 3.0
+          AC_SEARCH_LIBS([gr_get_fexpr], [flint], [
             dnl check that NTL is linked in
             AC_SEARCH_LIBS([fmpz_poly_get_ZZX], [flint], [
 

build/pkgs/flint/spkg-install.in

@@ -1,36 +1,2 @@
-###############################################################################
-#
-# FLINT Sage install script
-#
-###############################################################################
-if [ "$SAGE_DEBUG" = "yes" ]; then
-    echo "Building a debug version of FLINT."
-    FLINT_TUNE=" $FLINT_TUNE"; export FLINT_TUNE
-    FLINT_CONFIGURE="--enable-assert $FLINT_CONFIGURE"
-fi
-
 cd src
-
-echo "Configuring FLINT."
-# Trac #29607: We must always supply --with-gmp, --with-mpfr,
-# --with-ntl because otherwise FLINT's configure script uses
-# /usr/local, which is always wrong.
-# This is why we do not use $SAGE_CONFIGURE_GMP etc. here.
-# The value $SAGE_LOCAL is always a safe choice even if the library
-# is coming from the system and is found using what is in
-# LIBRARY_PATH or LDFLAGS etc.
-./configure \
-    --disable-static \
-    --prefix="$SAGE_LOCAL" \
-    --with-gmp="$SAGE_LOCAL" \
-    --with-mpfr="$SAGE_LOCAL" \
-    --with-ntl="$SAGE_LOCAL" \
-    $FLINT_CONFIGURE || sdh_die "Error: Failed to configure FLINT."
-
-sdh_make verbose
-
-echo "Deleting old FLINT files."
-rm -f $SAGE_LOCAL/lib/libflint*
-rm -rf $SAGE_LOCAL/include/flint
-
 sdh_make_install

build/pkgs/sagelib/dependencies

@@ -1,4 +1,4 @@
-FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
+FORCE $(SCRIPTS) boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/symengine/dependencies

@@ -1,4 +1,4 @@
-$(MP_LIBRARY) arb ecm flint mpc mpfr | cmake
+$(MP_LIBRARY) ecm flint mpc mpfr | cmake
 
 ----------
 All lines of this file are ignored except the first.