From bf581284792e69ab472a094f106d41d315da5204 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 10 Sep 2024 15:28:32 +0200
Subject: [PATCH] curl: cleanup version guarded code

---
 releases.json                                 |  1 +
 subprojects/packagefiles/curl/meson.build     |  3 +-
 .../packagefiles/curl/tests/meson.build       | 29 +++++++++----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/releases.json b/releases.json
index 3cd75041c..cfd591f1c 100644
--- a/releases.json
+++ b/releases.json
@@ -524,6 +524,7 @@
       "libcurl"
     ],
     "versions": [
+      "8.9.1-2",
       "8.9.1-1",
       "8.9.0-1",
       "8.8.0-1",
diff --git a/subprojects/packagefiles/curl/meson.build b/subprojects/packagefiles/curl/meson.build
index 4b7d06aba..52e8986b2 100644
--- a/subprojects/packagefiles/curl/meson.build
+++ b/subprojects/packagefiles/curl/meson.build
@@ -4,8 +4,7 @@ project(
   'curl',
   'c',
   version: '8.9.1',
-  # Version gated use of `test(…, verbose: true)` needs `0.62.0`.
-  meson_version: meson.version().version_compare('>=0.62.0') ? '>=0.62.0' : '>=0.60.0',
+  meson_version: '>=0.60.0',
 )
 
 fs = import('fs')
diff --git a/subprojects/packagefiles/curl/tests/meson.build b/subprojects/packagefiles/curl/tests/meson.build
index 4376d461f..61c4fa1f5 100644
--- a/subprojects/packagefiles/curl/tests/meson.build
+++ b/subprojects/packagefiles/curl/tests/meson.build
@@ -91,15 +91,8 @@ if ipv6_opt.disabled()
   _disabled_tests += '!1614'
 endif
 
-_kwargs = {}
-if meson.version().version_compare('>=0.62.0')
-  _kwargs += {'verbose': true}
-endif
-
-test(
-  'runtests',
-  bash_exe,
-  args: [
+_kwargs = {
+  'args': [
     '-c',
     'exec perl "$@"',
     '--',
@@ -118,10 +111,14 @@ test(
     # '-v',
     _disabled_tests,
   ],
-  depends: [curl_exe, libtest_targets, server_targets, unit_targets],
-  env: _env,
-  is_parallel: false,
-  kwargs: _kwargs,
-  timeout: 0,
-  workdir: _builddir,
-)
+  'depends': [curl_exe, libtest_targets, server_targets, unit_targets],
+  'env': _env,
+  'is_parallel': false,
+  'timeout': 0,
+  'workdir': _builddir,
+}
+if meson.version().version_compare('>=0.62.0')
+  test('runtests', bash_exe, kwargs: _kwargs + {'verbose': true})
+else
+  test('runtests', bash_exe, kwargs: _kwargs)
+endif