Build mdds as a subproject.

Change-Id: Ic0db15647c185cdc3520342a823df1dea01d550c

3 files changed, 23 insertions, 11 deletions

diff --git a/meson.build b/meson.build
index 4960a8f077cb..cfd2cc73da33 100644
--- a/meson.build
+++ b/meson.build
@@ -158,9 +158,9 @@ mythes_dep = dependency('mythes')
 libexttextcat_dep = dependency('libexttextcat')
 
 # The version in Ubuntu eoan is too old.
-#mdds_dep = dependency('mdds-1.5')
-mdds_dep = declare_dependency(include_directories: 'mdds')
-broken_mdds_dep = declare_dependency(include_directories: '.')
+mdds_dep = dependency('mdds-1.6',
+                      version: '>=1.6.0',
+                      fallback: ['mdds', 'mdds_dep'])
 
 # 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 895fdf3a9aa3..a38c710113ba 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -605,11 +605,11 @@ sc_lib = shared_library('sclo',
   # Formula logger.
   'source/core/tool/formulalogger.cxx',
   scslots_hxx,
-  udk_fake_h, off_fake_h, oovba_fake_h,
+  udk_fake_h, off_fake_h, oovba_fake_h, common_hxx,
   cpp_args: ['-DSC_DLLIMPLEMENTATION',
              '-DSC_INFO_OSVERSION="linux"',
              '-DLIBO_INTERNAL_ONLY'],
-  include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc', 'source/core/inc', 'source/ui/inc', 'source/filter/inc'],
+  include_directories: [main_inc, udkh_inc, offapi_inc, oovbaapi_inc, 'inc', 'source/core/inc', 'source/ui/inc', 'source/filter/inc', setup_inc],
   link_with: [avmedia_lib,
     basegfx_lib,
     comphelper_lib,
@@ -640,7 +640,7 @@ sc_lib = shared_library('sclo',
     vcl_lib,
     xo_lib,
     ],
-  dependencies: [libxml_dep, icuuc_dep, icu18_dep, broken_mdds_dep, orcus_dep],
+  dependencies: [libxml_dep, icuuc_dep, icu18_dep, mdds_dep, orcus_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -701,9 +701,9 @@ scui_lib = shared_library('scuilo',
   'source/ui/pagedlg/tphf.cxx',
   'source/ui/pagedlg/tptable.cxx',
   'source/ui/styleui/styledlg.cxx',
-  udk_fake_h, off_fake_h,
+  udk_fake_h, off_fake_h, calc_hxx,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
-  include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc'],
+  include_directories: [main_inc, udkh_inc, offapi_inc, 'inc', 'source/ui/inc', setup_inc],
   link_with: [
     comphelper_lib,
     cppu_lib,
@@ -724,7 +724,7 @@ scui_lib = shared_library('scuilo',
     utl_lib,
     vcl_lib,
   ],
-  dependencies: [broken_mdds_dep],
+  dependencies: [mdds_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
@@ -921,7 +921,9 @@ scui_lib = shared_library('scuilo',
 #    vcl_lib,
 #    i18nlangtag_lib,
 #  ],
-#  dependencies: [orcus_dep, broken_mdds_dep],
+#  dependencies: [orcus_dep, mdds_dep],
+#  gnu_symbol_visibility: 'hidden',
+#  install: true,
 #)
 
 vbaobj_lib = shared_library('vbaobjlo',
@@ -1014,7 +1016,7 @@ vbaobj_lib = shared_library('vbaobjlo',
     vbahelper_lib,
     vcl_lib,
   ],
-  dependencies: [broken_mdds_dep],
+  dependencies: [mdds_dep],
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/subprojects/mdds.wrap b/subprojects/mdds.wrap
new file mode 100644
index 000000000000..4d80c70103fd
--- /dev/null
+++ b/subprojects/mdds.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = mdds-1.6.0
+
+source_url = https://gitlab.com/mdds/mdds/-/archive/1.6.0/mdds-1.6.0.tar.gz
+source_filename = mdds-1.6.0.tar.gz
+source_hash = 77d5f9e758c8dd3b980b6c34aeb4a64297a5d0b49d394a7d48b02238a01003e0
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/mdds/1.6.0/1/get_zip
+patch_filename = mdds-1.6.0-1-wrap.zip
+patch_hash = ae180db0bdd564319f13e178c171effe25ff18997432641997ad6eff5d0322c4