From e401fc10e89da0c4d4624161118154a7b9c131a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 20 Feb 2025 18:26:44 +0100
Subject: [PATCH] build: Do not use deprecated features in meson

---
 libfprint/meson.build |  9 +++++++--
 meson.build           |  1 -
 tests/meson.build     | 15 +++++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/libfprint/meson.build b/libfprint/meson.build
index 5c0c4962..0ca17674 100644
--- a/libfprint/meson.build
+++ b/libfprint/meson.build
@@ -274,8 +274,13 @@ libfprint_drivers = static_library('fprint-drivers',
     link_with: libfprint_private,
     install: false)
 
-mapfile = files('libfprint.ver')
-vflag = '-Wl,--version-script,@0@/@1@'.format(meson.project_source_root(), mapfile[0])
+mapfile = files('libfprint.ver')[0]
+if meson.version().version_compare('>=1.4')
+    mapfile_path = mapfile.full_path()
+else
+    mapfile_path = meson.project_source_root() / '@0@'.format(mapfile)
+endif
+vflag = '-Wl,--version-script,@0@'.format(mapfile_path)
 
 libfprint = shared_library(versioned_libname.split('lib')[1],
     sources: [
diff --git a/meson.build b/meson.build
index bdba7bfe..6f4e7c22 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,6 @@ glib_min_version = '2.68'
 glib_version_def = 'GLIB_VERSION_@0@_@1@'.format(
     glib_min_version.split('.')[0], glib_min_version.split('.')[1])
 common_cflags = cc.get_supported_arguments([
-    '-Wall',
     '-Wcast-align',
     '-Wformat-nonliteral',
     '-Wformat-security',
diff --git a/tests/meson.build b/tests/meson.build
index 0c834f86..03efba88 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -373,10 +373,17 @@ valgrind = find_program('valgrind', required: false)
 if valgrind.found() and libfprint_sanitizers.length() == 0
     glib_share = glib_dep.get_variable(pkgconfig: 'prefix') / 'share' / glib_dep.name()
     glib_suppressions = glib_share + '/valgrind/glib.supp'
-    libfprint_suppressions = '@0@/@1@'.format(meson.project_source_root(),
-        files('libfprint.supp')[0])
-    python_suppressions = '@0@/@1@'.format(meson.project_source_root(),
-        files('valgrind-python.supp')[0])
+    libfprint_suppressions = files('libfprint.supp')[0]
+    python_suppressions = files('valgrind-python.supp')[0]
+
+    if meson.version().version_compare('>=1.4')
+        libfprint_suppressions = libfprint_suppressions.full_path()
+        python_suppressions = python_suppressions.full_path()
+    else
+        libfprint_suppressions = meson.project_source_root() / '@0@'.format(libfprint_suppressions)
+        python_suppressions = meson.project_source_root() / '@0@'.format(python_suppressions)
+    endif
+
     libfprint_wrapper = [
         valgrind.full_path(),
         '--tool=memcheck',