From cac736823454dfe653873256c77eb74105657ae2 Mon Sep 17 00:00:00 2001
From: dgsga <181612+dgsga@users.noreply.github.com>
Date: Thu, 14 Mar 2024 19:14:08 +0000
Subject: [PATCH] Temporary workaround to allow building with meson version
 currently provided on Ubuntu 22.04 LTS

---
 .github/workflows/meson.yml |  2 +-
 meson.build                 | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
index e7360958da6..927da4fbea9 100644
--- a/.github/workflows/meson.yml
+++ b/.github/workflows/meson.yml
@@ -58,7 +58,7 @@ jobs:
     name: Ubuntu
     runs-on: ubuntu-22.04
     container:
-      image: ubuntu:mantic
+      image: ubuntu:22.04
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
diff --git a/meson.build b/meson.build
index f4345f88305..0a237054f64 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,9 @@ project(
     version: '3.1.99dev',
     license: 'GPLv2',
     default_options: ['warning_level=3', 'c_std=c11'],
-    meson_version: '>=0.62.0',
+    meson_version: '>=0.61.2',
+    # Reserved for future use:
+    # meson_version: '>=0.62.0',
 )
 
 cc = meson.get_compiler('c')
@@ -844,7 +846,8 @@ cast5_api = run_command(
     check: false,
 ).stdout().strip().contains('cast5')
 
-libgcrypt_version = libgcrypt_config.version().version_compare('>=1.2.3')
+# Reserved for future use:
+# libgcrypt_version = libgcrypt_config.version().version_compare('>=1.2.3')
 
 if not libgcrypt.found()
     have_libgcrypt = false
@@ -852,7 +855,9 @@ if not libgcrypt.found()
         'Libgcrypt library required for DHX2 UAM! Please install version 1.2.3 or later',
     )
 else
-    have_libgcrypt = libgcrypt_version and cast5_api
+    # Reserved for future use:
+    # have_libgcrypt = libgcrypt_version and cast5_api
+    have_libgcrypt = libgcrypt.found() and cast5_api
     if not cast5_api
         have_libgcrypt = false
         error(