From 2762f3ff9903c08adddf616f04eb02b35a15142e Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 29 Dec 2022 23:22:03 +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 532634 -> 533353 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 35c0b746c7c..fc8819193fa 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -919,7 +919,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 \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 5a6440fea015b2d73eb9de835f89284add7c604b..6d4b55dd2e01d4d50bb91d064b673a1b9535da7e 100644
GIT binary patch
delta 576
zcmZ9J&ubG=5XX7zteag@O&ZIFB-oc)sFfZnf_N}W(t<P|qC~w&NYZAL?rzytcU2TL
z)k6e92;}g^Xg2ZYA5ipcg+e^(MLdb(NxcesP;nDO{V_1`-ppsd@5{XQGyZXluWzt7
z<}QW%ao#9jDOc>3LhIJ^33vtzOQQ-d)L3l$^21;=l=WH6nrz?9h~X98DKD>S4zFpJ
zcB$;@w#Dr#&n=$hL)bN02JS_cgi>JR+iIt4EP}qlB9lWCg}J%kX0Gb)YH_5Ux~4gW
zJAIS+DfqeLY2T!8^I^>zyjZj=<`hq+xMichNeA%uu^=ONU6N71PqW}1QdL>6a#wR)
zJ~jQfa_dnzf#V%I1hGvC-0e^l#*#RO@3%?DMu!ruQxk-j9hyY!p^(7Q8@_DNqd3ej
zQUs-z7(l2gh{$-PqW6w=qvX*MM868^psT<>ECdmHMe(6h^PUjEu?IAU_a4oov`PVl
zyOhMIEfz<rO9$~GC`M6#;Wut}DTSX+|KuBxu-T>Y>A_D8qN*!0*VY_Ok!60_ax|A`
z)92EQxdlZ=`L(bo^l!1M<8zl{(LZ|_;Y;}wS%1pkgu3_t5hcA)%%9EV&+H$-jUF|6
NVxzb7Nl$98{{p*q!1w?F

delta 245
zcmaEPOkvhRg@!GRH?rF+a~Xk{35c1uSLU+3G?*^e&!RGY?mU*D$u%+@)0O747*CIG
zVUd_#I3Gwnn9U+Ieg1qFnd$rIv&c{H`oSnNea>-4uIVfbSfr*$JF#$0f8fl-GJV5B
zW{$}VcCt<vSj)mP-Dv@f@brT9jC|9x7qA#kw|L9WKV9z-tJw4hlbE@uzum>iGyTH?
z7Tf8j3t1GW`^;tGpI*9<MR)qs049OyhZeHf3VS(*IlA~edj`9E0V!Lh%GBb?6N*Hq
lpI*emDdOlH9~|lw9HN1ws{Q;T79eH?Vz%w)7qQQ3005R=TZ{kz

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 0286cc6cdc6..f833c8b36fc 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -36,7 +36,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 16eba69c3e3..0d5fca58d2c 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 377c8be0dc5..fc0daf1ed53 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