From e826de21fbec923ef7e39821874aeb5940ce5107 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 6 Mar 2025 17:41:13 +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 580782 -> 581501 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 dfe83a7fc30f220849344b89528906338812886b..8e8f39866ae030ea1f3b689dc04ac098c85c96ef 100644
GIT binary patch
delta 655
zcmaJ-&ubG=5awlPO?M@db|FbiNMF<XlWs}DQz1fZp_+mPW4)BJuFZ?x7<bWqsfd@{
zdMQmI$P`ZzZwB;IDD6QCo(tALz<_vA5Iq*US@CTe1wHs+-kX{Cee=!C>)lcR?PzVA
z?A0SG6=$(*u9`(>xj||%tZk6~a4&)8IvM&CMC;^yCNH2}Qb44FRDHl~ZgR`9C#bGJ
zw)l!u<$A9GE#jTiBsM!gGe`f+yy0;Ah*j9CX>)4Xl&>&Rt!TOC-3rs4;(fYox(tnH
zWNdK3HSe*huKtPOZ#B%V6AfD%L>un5xHLX~GGEY@(Q7IDgt<#=tvV4F5+?1m>hQAM
z&+I_T5K?J6lBKqTKfl5yOl?U6*!&0=vFU+^`^O*?1t-;zCW+zkupLU`!7*IMbQ_X5
z=s^PWhjIj`JUH9fzXE7@FpTAGDT(hjNx{q!$U&(%w&vs*Hs67YAA*qXK@5*Pn8d9g
zBK*D!YGWc1X+#&#q5c^n_^<;RjJ}fk@I?nk@cAbxj?FIsc+e3friBv$sSnTiki|FO
zgeRoKc+-c0Yu#mut7NGPWfhmHibAWl%Q(&FZs%s^r$t_T1~~C_5rO|Vq-5b!ABGZE
wiE`$0njY(suNP+XqDHWdc<Nt{nwvHX3s(!bE(GYcO&^5G!cOgM`r%aj7oct7Z~y=R

delta 227
zcmeynPkG%=<%TVcyZYOsCo%#t6A&|RkDkafC2Km5606Ge{WF<`rmy|MqB(u~Ul!r%
z?GIRlrf>bjqCfq`9~OgY4}m<rzbrD-{r<AZPxpVwA~HR}l9g-v<i9M^(@&pc;+meH
z!z4I;0T(OF^h+T91(P`Vr{_OpVV%zSk41aB!7moi>AnA045lCb$D%l0dnX6?bjJTI
zhSS5lm;|N={b#Wi@p24vbn$og40iVdQnpH!sl`f@8_$SLjb`N(adeIk4s{9+(Lhqw
S8qeAq&(<2xzBQgh?mhr}^i=u)

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