From d28495d54f2a42b64291c02c5f6acdc95638acca Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 10 Nov 2022 12:15:50 +0000 Subject: build: Simplify detection of GPGME when using Meson In theory we could have ended up linking a non-threadsafe version of GPGME, since the version without the -pthread suffix has only been thread-safe since 1.8.0. In practice we require version 0.53 of Meson (available in Ubuntu 20.04, Debian 11, etc.) so it seems reasonable to require a contemporary version of GPGME (1.8.0 is available in Ubuntu 18.04, Debian 10, etc.) and drop the complexity of handling this in a fully-backwards-compatible way. Users of older LTS distributions like Ubuntu 16.04 should continue to build Flatpak with Autotools. Signed-off-by: Simon McVittie --- meson.build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 755bb922..746683cf 100644 --- a/meson.build +++ b/meson.build @@ -208,14 +208,7 @@ build_gtk_doc = gtkdoc_dep.found() base_deps = [glib_dep, gio_dep, gio_unix_dep] -if meson.version().version_compare('>=0.60.0') - gpgme_dep = dependency('gpgme-pthread', 'gpgme', version : '>=1.1.8') -else - gpgme_dep = dependency('gpgme-pthread', version : '>=1.1.8', required : false) - if not gpgme_dep.found() - gpgme_dep = dependency('gpgme', version : '>=1.1.8') - endif -endif +gpgme_dep = dependency('gpgme', version : '>=1.8.0') if get_option('selinux_module').disabled() build_selinux_module = false -- cgit v1.2.1