From 0a8a5016a859b498149f4828ffad4112ba4f21ef Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 27 Nov 2023 19:15:44 +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 539353 -> 540072 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 d2ed28363cd..879491f5ca1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -925,7 +925,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 \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 7346c88f235c5b2a11757ab474a61cbf608dc1da..7d65a4324486ce52a154b3d73270b70675f8af07 100644
GIT binary patch
delta 585
zcmZXR!D|yy5XO1Q?Dp+yB5iFOV$qja4UMG)JP1ONYC%j74G~1pP`Bnqqj5KO(~2iO
zwFeQkk$xxZMNlzGixdh45%DA_#G@en13XAn1W^yZjY~ls7<g~yH{ZOO_u;#E@=M%Y
zV{a;9Qz$!g$(pkY&iQ=Jde?_L4(smnBe2RWx^?;Numoiki)e-IP56u`lw51NEM0Ly
z+H%IKmK<9+MKL)(Av&<Eu%oy-$6{z%tY=H@vBUQ7>GaQ!jQoAawNmxslrNjUF5UdX
zMujO4C=af0ROsvBZfSeXrkuj%xQL~N?Vx=_OQQ9Ra?HT{d9637M!}blY!Jyh9mM^6
zG>F+cMey^v9>P+c_SLcx!tVxgyspy#lADUXJENKSQKu*-IPXPvRX30da}A>n>c_bj
z<F$4wj3bMr<8*@#;L{6L+JdTDm6TAD+wrnNX|(5q+!K%C>}}N{yB64iE02gTHHnaF
z(lEaDX_4Ayj$`zJ5_6h#2+O$u$J1TGa5f!RgU37j@czcLV#zdwEW6S)3^8lFvMMrT
zr^d!7kEysy`b>xL&i^2I)uf%V6DN;n6hCa1ilQprs)!Hy5`M;8*g)vN%6=?9)O)bJ
Un{QhPt&nm}xxOA+>3VzX57}zQ2mk;8

delta 223
zcmZ4STjAzcg@!GRCkxuMiWq^I35c1uXBDwLwwlg4k40rV?^AY;=@Ztnculu?#>6q5
zcO8rIbj!&s64PVW0g2PAScIl`tz(gy9<zakWBR6bEaKC>CNc|7-}{P%ce=qU7MAIs
z*RhCAU%if<Z*qez?{v-eKotS2S@@@iuV*os-nW{?bNUMq3#?yb1B>MJH*y@@Ag<wL
zHyeTJYd5giPX7cFzjcP4e|qdj7IraBE=TA1;83UF5DhQKFh>`EXU|}Ful8LVS%8=o
Nh}pL9+Q|N{8vud9RS5t9

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0095619d50..eeb4afa2a51 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)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 8b8ee8ccaac..073f048998f 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 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