More upstream patches, merge conflict fixes for version checks

build/pkgs/fflas_ffpack/spkg-configure.m4

@@ -4,7 +4,7 @@ SAGE_SPKG_CONFIGURE([fflas_ffpack], [
  # the system fflas-ffpack, too. Use pkg-config to find a
  # recentish version, if there is one.
  PKG_CHECK_MODULES([FFLAS_FFPACK],
- [fflas-ffpack >= 2.4.0],dnl The version test is refined in linbox/spkg-configure.m4
+ [fflas-ffpack >= 2.5.0],dnl The version test is refined in linbox/spkg-configure.m4
  [sage_spkg_install_fflas_ffpack=no],
  [sage_spkg_install_fflas_ffpack=yes])
  ])

build/pkgs/givaro/patches/226.patch

@@ -0,0 +1,30 @@
+From 20caba1b549fe46b483f120f8eec6ec4e9f4572d Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 25 Jan 2024 08:29:17 -0500
+Subject: [PATCH] Temporary GCC 14 workaround
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes https://github.com/linbox-team/givaro/issues/226 “GCC 14: No match
+for operator= for Givaro::ZRing<Givaro::Integer>”
+
+Recommended in
+https://github.com/linbox-team/givaro/issues/226#issuecomment-1908853755
+---
+ src/kernel/integer/random-integer.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/kernel/integer/random-integer.h b/src/kernel/integer/random-integer.h
+index f9361d33..ea189a36 100644
+--- a/src/kernel/integer/random-integer.h
++++ b/src/kernel/integer/random-integer.h
+@@ -87,7 +87,6 @@ namespace Givaro
+ if (this != &R) {
+ _bits = R._bits;
+ _integer = R._integer;
+- const_cast<Integer_Domain&>(_ring)=R._ring;
+ }
+ return *this;
+ }
+-- 

build/pkgs/givaro/spkg-configure.m4

@@ -1,6 +1,6 @@
 SAGE_SPKG_CONFIGURE([givaro], [
  PKG_CHECK_MODULES([GIVARO],
- [givaro >= 4.1.1],dnl The version test is refined in linbox/spkg-configure.m4
+ [givaro >= 4.2.0],dnl The version test is refined in linbox/spkg-configure.m4
  [sage_spkg_install_givaro=no],
  [sage_spkg_install_givaro=yes])
 ])

build/pkgs/linbox/patches/310-backport.patch

@@ -0,0 +1,69 @@
+From b8f2d4ccdc0af4418d14f72caf6c4d01969092a3 Mon Sep 17 00:00:00 2001
+From: Jean-Guillaume Dumas <Jean-Guillaume.Dumas@imag.fr>
+Date: Fri, 26 Jan 2024 16:31:56 +0100
+Subject: [PATCH] const_cast missing faster empty init
+
+---
+ linbox/algorithms/gauss/gauss-nullspace.inl | 10 +-
+ .../matrix/sparsematrix/sparse-ell-matrix.h | 8 +-
+ .../matrix/sparsematrix/sparse-ellr-matrix.h | 18 +--
+ linbox/ring/ntl/ntl-lzz_p.h | 11 +-
+ linbox/ring/ntl/ntl-lzz_pe.h | 143 +++++++++---------
+ linbox/ring/ntl/ntl-zz_px.h | 6 +
+ 6 files changed, 104 insertions(+), 92 deletions(-)
+
+diff --git a/linbox/matrix/sparsematrix/sparse-ell-matrix.h b/linbox/matrix/sparsematrix/sparse-ell-matrix.h
+index 59006d6c5f..2604f47b81 100644
+--- a/linbox/matrix/sparsematrix/sparse-ell-matrix.h
++++ b/linbox/matrix/sparsematrix/sparse-ell-matrix.h
+@@ -1210,10 +1210,10 @@ namespace LinBox
+ _colid_beg = iter._colid_beg ;
+ _colid_it = iter._colid_it ;
+ _data_it = iter._data_it ;
+- _data_beg = iter._data_beg ;
+- _data_end = iter._data_end ;
+- _field = iter._field ;
+- _ld = iter._ld ;
++ const_cast<data_it>(_data_beg) = iter._data_beg ;
++ const_cast<data_it>(_data_end) = iter._data_end ;
++ const_cast<Field &>(_field) = iter._field ;
++ const_cast<size_t&>(ld) = iter._ld ;
+ _row = iter._row ;
+
+ return *this;
+diff --git a/linbox/matrix/sparsematrix/sparse-ellr-matrix.h b/linbox/matrix/sparsematrix/sparse-ellr-matrix.h
+index 498a5525db..a60943868b 100644
+--- a/linbox/matrix/sparsematrix/sparse-ellr-matrix.h
++++ b/linbox/matrix/sparsematrix/sparse-ellr-matrix.h
+@@ -1102,11 +1102,11 @@ namespace LinBox
+ _Iterator &operator = (const _Iterator &iter)
+ {
+ _data_it = iter._data_it ;
+- _data_beg = iter._data_beg ;
+- _data_end = iter._data_end ;
+- _field = iter._field ;
+- _rowid = iter._rowid;
+- _ld = iter._ld ;
++ const_cast<element_iterator>(_data_beg) = iter._data_beg ;
++ const_cast<element_iterator>(_data_end)= iter._data_end ;
++ const_cast<Field &>(_field) = iter._field ;
++ const_cast<std::vector<size_t>&>(_rowid) = iter._rowid;
++ const_cast<size_t&>(ld) = iter._ld ;
+ _row = iter._row ;
+
+ return *this;
+@@ -1252,10 +1252,10 @@ namespace LinBox
+ _colid_beg = iter._colid_beg ;
+ _colid_it = iter._colid_it ;
+ _data_it = iter._data_it ;
+- _data_beg = iter._data_beg ;
+- _data_end = iter._data_end ;
+- _field = iter._field ;
+- _ld = iter._ld ;
++ const_cast<data_it>(_data_beg) = iter._data_beg ;
++ const_cast<data_it>(_data_end) = iter._data_end ;
++ const_cast<Field &>(_field) = iter._field ;
++ const_cast<size_t&>(ld)= iter._ld ;
+ _row = iter._row ;
+
+ return *this;

build/pkgs/linbox/spkg-configure.m4

@@ -1,10 +1,10 @@
 SAGE_SPKG_CONFIGURE([linbox], [
  SAGE_SPKG_DEPCHECK([fflas_ffpack flint fplll givaro gmp iml m4ri m4rie mpfr ntl], [
  PKG_CHECK_MODULES([LINBOX],dnl Check for a set of matching old versions
- [linbox >= 1.6.3 linbox <= 1.6.4 fflas-ffpack >= 2.4.0 fflas-ffpack < 2.5.0 givaro >= 4.1.1 givaro < 4.2.0],
+ [linbox >= 1.7.0 linbox < 1.8.0 fflas-ffpack >= 2.5.0 fflas-ffpack < 2.6.0 givaro >= 4.2.0 givaro < 4.3.0],
  [sage_spkg_install_linbox=no],
  [PKG_CHECK_MODULES([LINBOX],dnl Check for a set of matching new versions
- [linbox >= 1.7.0 linbox <= 1.7.0 fflas-ffpack >= 2.5.0 givaro >= 4.2.0 givaro < 4.3.0],
+ [linbox >= 1.8.0 linbox <= 1.9.0 fflas-ffpack >= 2.6.0 givaro >= 4.3.0 givaro < 4.4.0],
  [sage_spkg_install_linbox=no],
  [sage_spkg_install_linbox=yes])])
  ])