diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2020-02-22 23:22:38 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-07 16:17:22 +0000 |
| commit | 0fd942f26dd869391466c3c1476b0ea0be8cdf50 (patch) | |
| tree | 99715ab1e77d863341090bc6def3250ee91e5ad3 | |
| parent | c5a314bca6ab1ec198c77f45fa11ff8ea39ff6d7 (diff) | |
Use Ubuntu focal LO Java build dependencies
This is the Java version installed by:
apt-get build-dep libreoffice
Also drop the duplicate cairo dependency variable.
Change-Id: Id34defc63700825f2925e6284f1ccfdad05b85bb
| -rw-r--r-- | meson.build | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meson.build b/meson.build index f219e5f7dbaf..cff452fa7a4b 100644 --- a/meson.build +++ b/meson.build @@ -135,7 +135,6 @@ xrender_dep = dependency('xrender') sm_dep = dependency('sm') ice_dep = dependency('ice') fc_dep = dependency('fontconfig') -cairo_dep = dependency('cairo') orcus_dep = dependency('liborcus-0.15') clucene_dep = dependency('libclucene-core') libxslt_dep = dependency('libxslt') @@ -178,8 +177,8 @@ mdds_dep = dependency('mdds-1.5') # FIXME. Java does not provide .pc files. # Presumably this data can be obtained via other methods. -jni_dep = declare_dependency(compile_args: ['-I/usr/lib/jvm/java-13-openjdk-amd64/include', - '-I/usr/lib/jvm/java-13-openjdk-amd64/include/linux']) +jni_dep = declare_dependency(compile_args: ['-I/usr/lib/jvm/java-11-openjdk-amd64/include', + '-I/usr/lib/jvm/java-11-openjdk-amd64/include/linux']) subdir('config_host') subdir('sal') |