From 680f0dd0a768b201b62899905c38210e834dde91 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 20 Jun 2024 13:47:25 +0200 Subject: Fix meson build files --- plugins/omemo/meson.build | 3 +++ plugins/openpgp/data/gresource.xml | 5 ++--- plugins/openpgp/meson.build | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'plugins') diff --git a/plugins/omemo/meson.build b/plugins/omemo/meson.build index 05d7c265..315f69f4 100644 --- a/plugins/omemo/meson.build +++ b/plugins/omemo/meson.build @@ -65,5 +65,8 @@ c_args = [ vala_args = [ '--vapidir', meson.current_source_dir() / 'vapi', ] +if dep_libadwaita.version() == 'unknown' or dep_libadwaita.version().version_compare('>=1.2') + vala_args += ['-D', 'Adw_1_2'] +endif lib_omemo = shared_library('omemo', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins') dep_omemo = declare_dependency(link_with: lib_omemo, include_directories: include_directories('.')) diff --git a/plugins/openpgp/data/gresource.xml b/plugins/openpgp/data/gresource.xml index fbe2e8e9..75f25e67 100644 --- a/plugins/openpgp/data/gresource.xml +++ b/plugins/openpgp/data/gresource.xml @@ -1,6 +1,5 @@ - - account_settings_item.ui - + + diff --git a/plugins/openpgp/meson.build b/plugins/openpgp/meson.build index ec6f5c0e..ad1614d6 100644 --- a/plugins/openpgp/meson.build +++ b/plugins/openpgp/meson.build @@ -14,6 +14,7 @@ sources = files( 'src/contact_details_provider.vala', 'src/database.vala', 'src/encryption_list_entry.vala', + 'src/encryption_preferences_entry.vala', 'src/file_transfer/file_decryptor.vala', 'src/file_transfer/file_encryptor.vala', 'src/gpgme_fix.c', -- cgit v1.2.3-70-g09d2