From 278d046a3b038bfd789587e05c756783eb1f6e8e Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 1 Nov 2020 21:20:53 +0000
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 485436 -> 486164 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 38fd2475e20..0718b51c8db 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -865,7 +865,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 \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 417b99b2922413741aee291be9f33d74bb0b393f..86e8e046d774228278d7508614e8b92d0b9790df 100644
GIT binary patch
delta 565
zcmY+BF=!KE6vz2;?~=QNq?Zexsix#>+IlB6kkEpIl%^UiW@#blU<n~@FZ67h7A{pB
z#7r$t4k!Lc!C9n3p&%}Tn-1+@QHq$!4sN>WQ1Qz(4fKP@_wo4s|L=S6z1tspemK<L
zWzX!G#>H8<UwcqnUSF#C@4pUbAG)oT>{(_!00OAI;Vijz*YS93#o;{wyB4#kB=qQ5
zY$S4))@+vQrw38A*;RZWWD|X0&0<&5fq7;8w8%oYaJ6SJ^~mum+ijbP2<^3Psd}vQ
zY>j6|on~#Z;Z)a`SMm50rIB_?M(&rC#Pn;5g8z{SW}FOIuUHf>^C1N}S&pDnCz3>y
zV24r)MV%(#=`@K;TLRnBX$<pQjPO|(p7(yrDGYogt#4=IXpv0J{|<%Go+iR<oGzm9
zQ8LkpQyyQ+l<+rVgu*}4{3q&&Ux+H`9E26Do=8#rh*J*xf5m4^gNE^z(Pi8)gm6ry
zr2i(SydVnWsX^B;Ad`Zf6Vb*8gD&9KF(oI}?gloSp3~x`nY%N^xtp3=cZ2bX%V~H{
z@IFW2$RIo4!*7>oOG1_5Q#>O^o4MXyVpCJkDKz1w;b1OeZSw?)kVS;|cp{Rz^B*x;
Bsxbfn

delta 226
zcmXAiAxy(S07cW@zupFc>+aemz?umREP-^HMq(EPV6dR6Lk<L4LP8KD`38X}ph#vA
zn8~rKq0pN{(k=)tK|J+e-oKwFZ+UY0>fLSi)0XG(hiOY3%-B0r%e?LSRb~@_nO2ey
zrP$_I4NZQRLb7A9%QJ(NCktWtWYA!$ojftv;NsYin4e;ap~X6H#-h&0X&{+5ozk_i
zgY0~j7Zz>Ke^49rs+)Y*s={B3z5mdDgoIfL&8rAIEJ`orN90x;V~wAqK=V3wU(YX6
TalC?hzlh<Gj$l~Cs&VuOqM%C|

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index b9dc8d35807..d3b8fc31109 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,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) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 410f8cf8ef1..363a8a41dea 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index be03d40ff58..bed51e1c7a6 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