From 0fd942f26dd869391466c3c1476b0ea0be8cdf50 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Sat, 22 Feb 2020 23:22:38 +0000 Subject: 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 --- meson.build | 5 ++--- 1 file 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') -- cgit