From f1e26a12e156d627be5ab235d1718c3d4bc8c78e Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 20 Apr 2022 16:39:49 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 526561 -> 527280 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index c68c46ed67b..009c3bdff2d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -860,7 +860,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 20389a9d4fa4bf16eeb5ca9b2800e60c3ec67069..ef758be1c1b23bda426e9f7f994916550102d500 100644
GIT binary patch
delta 589
zcmaDjQDMV$g@!GRzf*X*6o4Q)E3qswB|mxch7vIeun1UGSGPQ~BtsV}IsJb!qZB)g
zqmaU=&f*2sHr*$MQJE7etdKIf?xProzl*m5Oipt8h7?B4>4Fm&6{qWlF$%#=xS7nT
zCJ(kOR!0Zo43Ks4P@`-sQ;TEU-=r`CF%u9oZ-0}*(kU&NnwOZAlNz6&lC7kmXseKy
zKYd{li`MiDS6DfwA24I)nqHUAqB;F&Ba4tsYEE$~7iVUgLP=_IiGq>}vhkA_3d&6X
z+`wWyU8#}9WO~*n7T)RcjV!8@14LP-w=}ZIPp{g{C^Nm!mz8V!g$5R}>Ec^hgeMC~
z@k~GPh=q0fw?-E6=?Shtap@)&!|545%)-+zRIu_*x8K5|4mP79j+tXRcP`M_sZA^f
z(;sYO<d}Z6iA8aGR3VG>^p7B2%PLqTCf^h0m~Pa}VmtkvAQQ**fLs=q>BY?~q8^|a
z0D-hjE=~oAPdF7y^NLeT6ucb699{gKf#N_(s2Z>e5F1rVTITfm%`8$9h(Lg9_6&CS
z0-6B~2607nEnJSy@xh@^!66z@#nUHxvx-cA5Xa8leyy1Wh*^P{ZTq!mcJ5XHvDv@?

delta 224
zcmdlmUE$$Gg@!GRzf;=hq%i_96A&|RpOeN?B|Y80jzwkq{Ohb7)ALf<xu(l!vS?24
zX<`wdTqDCV{aO=?@${vcEE3aIn}Ni=OctT(!Obi((+||MuuLy+W|5w*o5dnBeO)uq
zkkvY@eA7SFvj|TA*32S2-JqC>Z@PR7i{bR}1{Tlh8(UZmAllxxu*gnpWZ|E#*~+3j
z{i`#R!1S_K7Tf8&TUjKhOD$sO=kRh2b9C`{)|@WW#v(O6$&XcN`uaq6?&$(eEG+FS
R+d!BVh}pKUY-49{1pv)5PRRfO

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 6477ad71e8c..c23343a027e 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 16eba69c3e3..0d5fca58d2c 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 0ffc004d871..8062fce1e48 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2