Update to 20240318.a24829267 and fix fmt.patch

3 files changed, 7 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06c6ed876963..040a3e59562e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cado-nfs-git
 	pkgdesc = Implementation of the Number Field Sieve (NFS) algorithm for factoring integers
-	pkgver = 20230731.9d69b04ae
+	pkgver = 20240318.a24829267
 	pkgrel = 1
 	url = http://cado-nfs.gforge.inria.fr/
 	arch = x86_64
@@ -22,6 +22,6 @@ pkgbase = cado-nfs-git
 	source = git+https://gitlab.inria.fr/cado-nfs/cado-nfs.git
 	source = fmt.patch
 	sha384sums = SKIP
-	sha384sums = 496b2b68ed11d3ad7c5febffd900475502b871bb4541307eb909eb23e0faa9f2e45856393b2c8bf45ab54cdf02c40e58
+	sha384sums = 493abdd5b33bb202eb6f159bd399cf947f6c8a082fc23ba4fcf79dadcc07fbc8ef5989b0a5580cdb7537346af713d374
 
 pkgname = cado-nfs-git
diff --git a/PKGBUILD b/PKGBUILD
index 2ee1f21969c5..3c147265ddb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkg=cado-nfs
 pkgname=${_pkg}-git
-pkgver=20230731.9d69b04ae
+pkgver=20240318.a24829267
 pkgrel=1
 pkgdesc="Implementation of the Number Field Sieve (NFS) algorithm for factoring integers"
 arch=('x86_64')
@@ -23,7 +23,7 @@ provides=('cado-nfs')
 source=("git+https://gitlab.inria.fr/cado-nfs/${_pkg}.git"
         fmt.patch)
 sha384sums=('SKIP'
-            '496b2b68ed11d3ad7c5febffd900475502b871bb4541307eb909eb23e0faa9f2e45856393b2c8bf45ab54cdf02c40e58')
+            '493abdd5b33bb202eb6f159bd399cf947f6c8a082fc23ba4fcf79dadcc07fbc8ef5989b0a5580cdb7537346af713d374')
 
 # Need -march for SIMD support. Makes the resulting package less portable.
 _march=native
diff --git a/fmt.patch b/fmt.patch
index 4a5536903255..b80c322d32c6 100644
--- a/fmt.patch
+++ b/fmt.patch
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 983449a7a..7e94e44d6 100644
+index 0c044d19f..18e9b96ac 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -330,7 +330,7 @@ include("${CADO_NFS_SOURCE_DIR}/config/test-rand.cmake")
+@@ -357,7 +357,7 @@ include("${CADO_NFS_SOURCE_DIR}/config/test-rand.cmake")
  include("${CADO_NFS_SOURCE_DIR}/config/strlcpy.cmake")
  include("${CADO_NFS_SOURCE_DIR}/config/linux.cmake")
  include("${CADO_NFS_SOURCE_DIR}/config/hwloc.cmake")
 -include("${CADO_NFS_SOURCE_DIR}/config/fmt.cmake")
 +#include("${CADO_NFS_SOURCE_DIR}/config/fmt.cmake")
+ include("${CADO_NFS_SOURCE_DIR}/config/gf2x.cmake")
  include("${CADO_NFS_SOURCE_DIR}/config/gmpecm.cmake")
  IF (NOT DEFINED ENV{NO_PYTHON_CHECK})
-   include("${CADO_NFS_SOURCE_DIR}/config/python.cmake")