From 440fe3c55fb87aa5ad80b624984066c90e4a41a6 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Mon, 1 Mar 2021 15:16:29 +0100 Subject: Add support for soup3 --- meson.build | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index ddb4346c9..b8c1a3741 100644 --- a/meson.build +++ b/meson.build @@ -75,7 +75,6 @@ conf.set10('ENABLE_GSB', gsb_api_key != '') glib_requirement = '>= 2.67.1' gtk_requirement = '>= 3.24.0' nettle_requirement = '>= 3.4' -webkitgtk_requirement = '>= 2.31.2' cairo_dep = dependency('cairo', version: '>= 1.2') gcr_dep = dependency('gcr-3', version: '>= 3.5.5') @@ -94,13 +93,22 @@ libarchive_dep = dependency('libarchive') libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.37.1') libhandy_dep = dependency('libhandy-1', version: '>= 1.1.0') libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') -libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0') libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12') nettle_dep = dependency('nettle', version: nettle_requirement) portal_dep = dependency('libportal', version: '>= 0.0.2', required: get_option('libportal')) sqlite3_dep = dependency('sqlite3', version: '>= 3.22') -webkit2gtk_dep = dependency('webkit2gtk-4.0', version: webkitgtk_requirement) -webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: webkitgtk_requirement) + +if get_option('soup2').enabled() + webkitgtk_requirement = '>= 2.31.2' + libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0') + webkit2gtk_dep = dependency('webkit2gtk-4.0', version: webkitgtk_requirement) + webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: webkitgtk_requirement) +else + webkitgtk_requirement = '>= 2.33.0' + libsoup_dep = dependency('libsoup-3.0', version: '>= 2.99.4') + webkit2gtk_dep = dependency('webkit2gtk-4.1', version: webkitgtk_requirement) + webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.1', version: webkitgtk_requirement) +endif conf.set10('USE_LIBPORTAL', portal_dep.found()) -- cgit v1.2.1