From d2dfbe92e294870fc84189df7158a75f58fdd6e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Fri, 7 Feb 2025 11:30:44 +0000
Subject: [PATCH] Fix compat with older gmp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The gmp_randstate_ptr typedef does not exist in 6.2.0.

Set the min version to 6.2.0 since we don't target any distros with
older versions.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 meson.build  | 2 +-
 src/dhtest.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 61ae9ea..4c73077 100644
--- a/meson.build
+++ b/meson.build
@@ -114,7 +114,7 @@ endif
 glib_min_version = '2.56.0'
 glib_min_version_symbol='GLIB_VERSION_2_56'
 gdk_pixbuf_min_version = '2.36.0'
-gmp_min_version = '6.0.0'
+gmp_min_version = '6.2.0'
 gnutls_min_version = '3.6.0'
 zlib_min_version = '1.2.11'
 libsasl_min_version = '2.1.27'
diff --git a/src/dhtest.c b/src/dhtest.c
index a18145e..a5fb994 100644
--- a/src/dhtest.c
+++ b/src/dhtest.c
@@ -42,7 +42,11 @@ struct DHTestData {
 };
 
 /* Mock this to make test repeatable */
+#if __GNU_MP_VERSION > 6 || (__GNU_MP_VERSION == 6 && __GNU_MP_VERSION_MINOR > 2)
 void mpz_urandomb(mpz_ptr mpi, gmp_randstate_ptr rng G_GNUC_UNUSED, mp_bitcnt_t bits)
+#else
+void mpz_urandomb(mpz_ptr mpi, gmp_randstate_t rng G_GNUC_UNUSED, mp_bitcnt_t bits)
+#endif
 {
     size_t len = bits / 8;
     guchar *data = g_new0(guchar, len);
-- 
GitLab