From ea6a4696bb98bfad39031f33a171b6aaea883b8a Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 13 Aug 2025 22:27:02 +0200
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 581449 -> 582168 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 dba6f987480..cbb6df60a9d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -945,7 +945,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	odk_settings \
 	odk_settings_generated \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 	odk_scripts \
diff --git a/configure.ac b/configure.ac
index 601df584f9af5494157ec101a45e59b7dce2fc7d..8ac13ef074c66e06e79190662cdeac3ba785c254 100644
GIT binary patch
delta 631
zcmaKoPiPZS5XRZvS+lzuv7{z7hW53Me_9$zMK3}iv4!Fatr9CpEpcsL>}s+L?xy0&
z^bkB4nnMWV&GjItc!<#AK~MxKNDg`n2racBo<#88jc?N^=)ni`;2Y*Q-^_e?GyL%V
zaA}qMT=gr2y}6s(l9n|WYNQlIXNBwWbrZN;;lh7JyviMmtE{vGc_3j>u|N%5vvt!r
zL1M8xy1i%??O3+~$zo|Q7o3`zJWu{hPMbElP4jd~Gi;(8#9pMVTUNKU>v<Y8v$x2C
zW>LIX=c0#ZE$s$9)A8Rm{OyKXg$rPFg$oRHMw}lT+uhHbD$^Y)ahF>2_nTFY1<yiw
z)vQ9T&_fN+D#NUX$Y6pPChq?Zqxi8PNN51BVB-snV8ev~e%b+%lkuX$2LyHje0Nlg
z;KmM|!jsz&!4VhwFuX4KQFY-6CL=tc>B0c2n|uT-YoOo@7Y^g=X)%b6btbo62;sFB
zA4Fdp#_{P-CX<gOsYd2bW8xe5ak&j~bhda2U$$WopMMoXc;SfvxZwfgEuj}jTl~Iy
zznH+cKS09d6(7_y;=yR=PVCF+icDzUqKYh&qG3^+sHw}T$(ad7#;vP-?}5LQIlcZs
z4EO0dVpGc|L(y*ax%8CEAbh;ahx-3Tl+;8fJ$p8N>9|*2cEqx?r|kIF9O>ESFG#4?
ACjbBd

delta 233
zcmbPnMET@C<%TVcxBA<wCo%#t6A&|Rub#-#k~>{Sl~rYWK|V9bbY2H$rRnxU96Zwt
z{<FwVpYxc7cly!)Ec(-b{AV$kF7Sj!XsR8n%+xqm`RVabSVX25*syX<UCb&yJ=&0i
zZ~BCHOuW-K@UpT@eZ(p}c|ro;^tvZ3Y|{l9S+%D-{AKZ+K9`ZzVER=?R>kSr3z)d4
z3o@}9P8a>lE-*cbiPcuv%Q4K+#oyU8*xd_A*(z107EfQ8&mlTJo0*kU#L+oEIMgXP
XL<31#dp<KO5VHX>`*xuFSKb2v(8x_I

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 0966fa57746..fdf35505023 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(gb_CustomTarget_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 d30c7164776..500348a7ea6 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,8 +43,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 8c1728671d9..405d84a72db 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -181,7 +181,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