summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-02-22 23:21:35 +0000
committerJan-Marek Glogowski <glogow@fbihome.de>2021-04-07 16:17:22 +0000
commitc5a314bca6ab1ec198c77f45fa11ff8ea39ff6d7 (patch)
tree636762cfbc30629f62489c86160a9f3e02397fbd
parent3fabfebab1217f3ee3b2ec12aaada302bbb4567b (diff)
Build needs mdds >= 0.15
Change-Id: Ib9d820d7bb4d55af3ca037e79cc6139f428e5399
-rw-r--r--meson.build5
-rw-r--r--sc/meson.build6
2 files changed, 5 insertions, 6 deletions
diff --git a/meson.build b/meson.build
index 2e05a9c0d385..f219e5f7dbaf 100644
--- a/meson.build
+++ b/meson.build
@@ -174,10 +174,7 @@ kf5_i18n_dep = dependency('KF5I18n')
kf5_config_dep = dependency('KF5KIO', modules: 'KF5::ConfigCore')
kf5_winsys_dep = dependency('KF5WindowSystem')
-# The version in Ubuntu eoan is too old.
-mdds_dep = dependency('mdds-1.6',
- version: '>=1.6.0',
- fallback: ['mdds', 'mdds_dep'])
+mdds_dep = dependency('mdds-1.5')
# FIXME. Java does not provide .pc files.
# Presumably this data can be obtained via other methods.
diff --git a/sc/meson.build b/sc/meson.build
index 0f615819030c..6eff3528a4b1 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -951,7 +951,7 @@ scfilt_lib = shared_library('scfilt',
vcl_lib,
i18nlangtag_lib,
],
- dependencies: [orcus_dep, broken_mdds_dep],
+ dependencies: [orcus_dep, mdds_dep],
install: true,
)
@@ -1045,7 +1045,9 @@ vbaobj_lib = shared_library('vbaobjlo',
vbahelper_lib,
vcl_lib,
],
- dependencies: [mdds_dep],
+ dependencies: [
+ mdds_dep,
+ ],
gnu_symbol_visibility: 'hidden',
install: true,
)