From 6417b08b932f41742f66518797ca309c554de588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 20 Aug 2024 10:52:29 +0200 Subject: [PATCH] build: Specify minimum versions for plugin pref libs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We're requiring a minimum libadwaita version to not hit deprecations so we should specify that as version requirement. While at that do the same for GTK4. Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1104 Signed-off-by: Guido Günther Tested-by: Anna Vyalkova Part-of: --- plugins/meson.build | 12 ++++++++++-- plugins/ticket-box/prefs/meson.build | 3 --- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/meson.build b/plugins/meson.build index 00f0e4357..4604d18d5 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,5 +1,13 @@ phosh_plugin_header_subdir = 'phosh' +adw_ver = '1.5' +gtk4_ver = '4.12' + +adw_ver_str = 'ADW_VERSION_@0@'.format(adw_ver.replace('.','_')) +gtk4_ver_str = 'ADW_VERSION_@0@'.format(gtk4_ver.replace('.','_')) +adw_ver_cmp = '>=@0@'.format(adw_ver) +gtk4_ver_cmp = '>=@0@'.format(gtk4_ver) + # Pubilc header that can also be used by out of tree plugins phosh_plugin_config = configuration_data() phosh_plugin_config.set_quoted('PHOSH_PLUGIN_EXTENSION_POINT_LOCKSCREEN_WIDGET', @@ -84,8 +92,8 @@ if get_option('lockscreen-plugins') or get_option('quick-setting-plugins') sources: [phosh_plugin_h, plugin_prefs_config_h], include_directories: plugin_prefs_inc, dependencies: [ - dependency('gtk4'), - dependency('libadwaita-1'), + dependency('libadwaita-1', version: adw_ver_cmp), + dependency('gtk4', version: gtk4_ver_cmp), ], ) diff --git a/plugins/ticket-box/prefs/meson.build b/plugins/ticket-box/prefs/meson.build index 0072532f7..b92eb9913 100644 --- a/plugins/ticket-box/prefs/meson.build +++ b/plugins/ticket-box/prefs/meson.build @@ -10,9 +10,6 @@ ticket_box_plugin_prefs_sources = files( 'ticket-box-prefs.h', ) -adw_ver = '1.5' -adw_ver_str = 'ADW_VERSION_@0@'.format(adw_ver.replace('.','_')) - phosh_ticket_box_plugin_prefs = shared_module( 'phosh-plugin-prefs-ticket-box', ticket_box_plugin_prefs_sources, -- GitLab