summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-02-22 23:22:38 +0000
committerJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-03-14 23:35:10 +0000
commit7e839c8f4826b59c0df03a6b5d67c4fa2d5cf1f0 (patch)
treea9c0a3f3533a3f31d7df49f78381bea74df40c54
parent787f5c9fabac04eb3334a8f4785c20aa4b7e91f8 (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.build5
1 files changed, 2 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index c540a6739a7a..58fc36c0f49e 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')
@@ -176,8 +175,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')