From c8521b158c59351a7f1662fdbd1065ddffcfb4d6 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] cppunit-optional

Gbp-Pq: Name cppunit-optional.diff
---
 Repository.mk                 |   4 ++++
 config_host.mk.in             |   1 +
 configure.ac                  | Bin 581501 -> 581762 bytes
 sal/Module_sal.mk             |   7 ++++++-
 sdext/Executable_pdf2xml.mk   |  12 ++++++++++--
 smoketest/Module_smoketest.mk |   6 ++++++
 test/Module_test.mk           |   2 ++
 testtools/Module_testtools.mk |   4 ++++
 unotest/Module_unotest.mk     |   2 ++
 9 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index cbb6df60a9d..24e2a6e4edb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -878,8 +878,12 @@ endif
 
 # 'test_unittest' is only package delivering to workdir.
 # Other packages could be potentially autoinstalled.
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 $(eval $(call gb_Helper_register_packages, \
 	test_unittest \
+))
+endif
+$(eval $(call gb_Helper_register_packages, \
 	$(if $(ENABLE_CLI),cli_basetypes_copy) \
 	extras_wordbook \
 	instsetoo_native_setup \
diff --git a/config_host.mk.in b/config_host.mk.in
index 7b1b669934d..8f243c2b339 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -168,6 +168,7 @@ export ENABLE_COINMP=@ENABLE_COINMP@
 SYSTEM_COINMP=@SYSTEM_COINMP@
 export COINMP_CFLAGS=@COINMP_CFLAGS@
 export COINMP_LIBS=@COINMP_LIBS@
+export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@
 export ENABLE_ATSPI_TESTS=@ENABLE_ATSPI_TESTS@
 export ENABLE_CPDB=@ENABLE_CPDB@
 export ENABLE_CUPS=@ENABLE_CUPS@
diff --git a/configure.ac b/configure.ac
index 8e8f39866ae030ea1f3b689dc04ac098c85c96ef..37961507738df415c97863d9ec9224fb78d8eda7 100644
GIT binary patch
delta 262
zcmeynPr2!!a>Euzo^H0}f`Zb#%;||4jIz@ULK#`oAOa<Ju{vA|P!OGxS)7=Zld6zZ
znwgW5nU}7isHu>jrT|r{P+U@)mZp%HQ=AW0QKFDiS_D+3keiqd)f20!!=+Q6S&|VC
z)iXU%lTmcKgD4|wJ5M(w5HkTW^LCzYmWn@OnQ00osl_D<N-8K?1Wz!DOy8r)CN+IQ
zJFA8S$Z@WIj!r(V@y-DOp?;nrwjn{Gu3XbUJZ6++gNRI5v|tLI-Y>zz(XQ6P3dC$c
M%)VW%gCjf~0KMT>egFUf

delta 57
zcmZoVsQh=Ia>Euzp6>R|-HbrY1jNkSH+QpC{Fxry!Rj)-IGHW1UAdDLh}nRceY<ie
HM|?N{-R~D8

diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 854d46a8e6d..08a317d292f 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Module_Module,sal))
 
 $(eval $(call gb_Module_add_targets,sal,\
-	$(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \
 	$(if $(filter $(OS),ANDROID EMSCRIPTEN), \
 		Library_lo-bootstrap) \
 	Library_sal \
@@ -39,4 +38,10 @@ $(eval $(call gb_Module_add_check_targets,sal,\
 
 endif
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+$(eval $(call gb_Module_add_check_targets,sal,\
+	$(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index d98ee3ea2a3..50ec34454ba 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -13,10 +13,10 @@ $(eval $(call gb_Executable_use_sdk_api,pdf2xml))
 
 $(eval $(call gb_Executable_use_externals,pdf2xml,\
     boost_headers \
-    cppunit \
     zlib \
 ))
 
+
 $(eval $(call gb_Executable_set_include,pdf2xml,\
     -I$(SRCDIR)/sdext/source/pdfimport/inc \
     $$(INCLUDE) \
@@ -29,7 +29,6 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\
     cppu \
     drawinglayercore \
     drawinglayer \
-    unotest \
     cppuhelper \
     sal \
     salhelper \
@@ -38,6 +37,15 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\
     i18nutil \
 ))
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+$(eval $(call gb_Executable_use_externals,pdf2xml,\
+    cppunit \
+))
+$(eval $(call gb_Executable_use_libraries,pdf2xml,\
+    unotest \
+))
+endif
+
 $(eval $(call gb_Executable_use_library_objects,pdf2xml,pdfimport))
 
 $(eval $(call gb_Executable_add_exception_objects,pdf2xml,\
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 5d66a0daa1e..ed141379c0e 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -13,8 +13,12 @@ $(eval $(call gb_Module_Module,smoketest))
 ifeq ($(CROSS_COMPILING),)
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 $(eval $(call gb_Module_add_targets,smoketest,\
 	Library_smoketest \
+))
+endif
+$(eval $(call gb_Module_add_targets,smoketest,\
 	Zip_smoketestdoc \
 ))
 endif
@@ -28,6 +32,7 @@ $(eval $(call gb_Module_add_targets,smoketest,\
 endif
 endif
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 ifneq (MACOSX/TRUE,$(OS)/$(ENABLE_MACOSX_SANDBOX))
 ifneq ($(filter EXTENSIONS,$(BUILD_TYPE)),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
@@ -35,6 +40,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
 ))
 endif
 endif
+endif
 
 endif
 
diff --git a/test/Module_test.mk b/test/Module_test.mk
index 99e72290515..74f2a604a12 100644
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,test))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
     Library_test_setupvcl \
@@ -23,6 +24,7 @@ $(eval $(call gb_Module_add_check_targets,test,\
     CppunitTest_test_a11y \
     CppunitTest_test_xpath \
 ))
+endif
 
 endif
 
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 2ef90a01c0e..25ad6d55c25 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_Module_Module,testtools))
 
 ifeq ($(CROSS_COMPILING),)
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+
 $(eval $(call gb_Module_add_targets,testtools,\
 	CustomTarget_bridgetest \
 	InternalUnoApi_bridgetest \
@@ -43,4 +45,6 @@ $(eval $(call gb_Module_add_check_targets,testtools,\
 
 endif
 
+endif
+
 # vim:set noet sw=4 ts=4:
diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
index 196d6cd1af7..bd54227ca2a 100644
--- a/unotest/Module_unotest.mk
+++ b/unotest/Module_unotest.mk
@@ -12,12 +12,14 @@ $(eval $(call gb_Module_Module,unotest))
 
 ifeq ($(gb_Side),host)
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 $(eval $(call gb_Module_add_targets,unotest,\
 	Library_unobootstrapprotector \
 	Library_unoexceptionprotector \
 	Library_unotest \
 ))
 endif
+endif
 
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,unotest,\
-- 
2.30.2