From 7ca1828fc2cf147e0a2d39b0a2c151dab9268692 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 27 Sep 2024 17:38:49 +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 566800 -> 567519 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 712020fa39a..1b01521f2cd 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 \
 	) \
 	odk_scripts \
diff --git a/configure.ac b/configure.ac
index 30f6e4ff68715cd664965a0b1a5bab4cba06d036..55a8fe540a8c812311425139e3bc1ed5942921dd 100644
GIT binary patch
delta 637
zcmbPmM(O@VrG_nxx10F56o4Q)E3qswB|kZK^2b}E(`9rSd3ee*OEPq!!qe|JGD@*S
zIn$aL)mglN>Zj{8F)FJ=MHNyqixZP_Qi~PRQ}a@b5=%1k^Az&a6#QMh6<~@br%z~N
z)STYj!KgTWZ7C!B^q0kq+%RLO8-_3nPe0ShC@c?lQml>+#AzUh#6xYdtxPSBZ9mh*
z2*gZ4%)I?f6N{gpNNOI)?)dzaY$XLnTZO!Q1>MBy8!R}~rw15ta7?#f&BQw0K8u5O
zdcZ{%M{&-~G=-AX;t~ZV6=cJwPwZiqnLhI(i^=qNTUlhLKfTBzF@4ojHo@s!msk`h
z8$`2A&%MmTG2QqQi}>_c4(u}1<1VqNPWR5{P?$asBqnf-MQr-vODu-dZEgb9eaPYv
zpXSCYJ6!>!t6&Ec$Mp4!SvjT~TxPKan#KV#O>y$8Xz}TpmsxnGJN2?jPv3Kyg>O3B
zOE!t=^O=B3ZvmA~zbg!60oAhCdj`9Ex%fNVDglE*2^>10$OD12OfF7^)STi}E>2E`
z(!Ao-5(O{EFh`(bpg2$xss^kA#70#DRN&|w9~|lw9HIf$2DM6)3lUacJP;EhQqw=y
avxq7ZG^#!33JVak0x{e6m@DjCE&>2BwbZ%*

delta 257
zcmW;Ey-LGy00eNFTs{bBf(mLYr3MEBiuwSev5K^VQlg?$3%*8&Dur&M2p&2*7RO=)
zadB~}H6b4zD(V9`IE#aS9e&(!$GwO4Y1eLaGK1q*y_pdtLH6rStZZ@U1v4z<Rh=I<
zlET$DO<^!CPp}Zd;p?@ev*ttLQG^9{A}q4&V}#!krudvdryXOQxjT$;&Qc6kW8`?h
zuNfCT8T@Li`gyRS@ak{XfHcgf7)$&KP~t%%-u^!>6HL;2fXOhyJa5~w#e9lo9;TxB
z%<3k4DYUF(xW%fsyXNi8mfbyfeY;rlHp?O$o(<Gd)*fNDDt!owp!$`*b`t&qZBJr}

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 7354219968c..22e3d58a5b0 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 9cf68f5d025..55077be0a8f 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