codemaker/Executable_cppumaker.mk | 1 - codemaker/Executable_javamaker.mk | 1 - idl/Executable_svidl.mk | 1 - sax/Library_sax.mk | 1 - sc/CppunitTest_sc_dataprovider.mk | 1 - sc/Library_scfilt.mk | 1 - ucb/Library_ucpftp1.mk | 1 - unoidl/Executable_unoidl-check.mk | 1 - unoidl/Executable_unoidl-write.mk | 1 - writerperfect/Library_wpftcalc.mk | 1 - writerperfect/Library_wpftdraw.mk | 1 - writerperfect/Library_wpftimpress.mk | 1 - 12 files changed, 12 deletions(-)
New commits: commit 6f60670877208612b5ea320b3677480ef6508abb Author: Gabor Kelemen <[email protected]> AuthorDate: Sun Aug 27 00:28:36 2023 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Mon Sep 18 08:34:34 2023 +0200 Use less zlib external headers dependency Change-Id: Ibcc7f37e464cde44cfbb6fbd70c3dc66667102bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156553 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk index 0e17378c7e74..9b8581356738 100644 --- a/codemaker/Executable_cppumaker.mk +++ b/codemaker/Executable_cppumaker.mk @@ -14,7 +14,6 @@ $(eval $(call gb_Executable_use_external,cppumaker,boost_headers)) ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Executable_use_externals,cppumaker,\ dtoa \ - zlib \ )) endif diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk index e1b08ccff10d..0cb237c4b6fc 100644 --- a/codemaker/Executable_javamaker.mk +++ b/codemaker/Executable_javamaker.mk @@ -14,7 +14,6 @@ $(eval $(call gb_Executable_use_external,javamaker,boost_headers)) ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Executable_use_externals,javamaker,\ dtoa \ - zlib \ )) endif diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index 54676af66860..ffce1cdab285 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Executable_use_external,svidl,boost_headers)) ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Executable_use_externals,svidl,\ dtoa \ - zlib \ )) endif diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index aecde51a41dd..97389a2bb06d 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Library_use_externals,sax,\ boost_headers \ libxml2 \ expat \ - zlib \ )) $(eval $(call gb_Library_use_libraries,sax,\ diff --git a/sc/CppunitTest_sc_dataprovider.mk b/sc/CppunitTest_sc_dataprovider.mk index 8fa3b62f60b4..18da975ed131 100644 --- a/sc/CppunitTest_sc_dataprovider.mk +++ b/sc/CppunitTest_sc_dataprovider.mk @@ -136,7 +136,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_dataprovider,\ boost_filesystem \ boost_system \ boost_iostreams \ - zlib \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_dataprovider)) diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 7b345b85e0f5..43192bec1046 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -232,7 +232,6 @@ $(eval $(call gb_Library_use_externals,scfilt,\ boost_filesystem \ boost_system \ boost_iostreams \ - zlib \ )) $(eval $(call gb_Library_add_exception_objects,scfilt,\ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index 87c48e7021ec..af8eda87f558 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Library_use_libraries,ucpftp1,\ $(eval $(call gb_Library_use_externals,ucpftp1,\ curl \ - zlib \ )) $(eval $(call gb_Library_add_exception_objects,ucpftp1,\ diff --git a/unoidl/Executable_unoidl-check.mk b/unoidl/Executable_unoidl-check.mk index 671ee38de5f8..cdf9f5aa28ff 100644 --- a/unoidl/Executable_unoidl-check.mk +++ b/unoidl/Executable_unoidl-check.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Executable_use_libraries,unoidl-check, \ ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Executable_use_externals,unoidl-check,\ dtoa \ - zlib \ )) endif diff --git a/unoidl/Executable_unoidl-write.mk b/unoidl/Executable_unoidl-write.mk index cc15bc34d004..e7ec3ba23c21 100644 --- a/unoidl/Executable_unoidl-write.mk +++ b/unoidl/Executable_unoidl-write.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Executable_use_libraries,unoidl-write, \ ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Executable_use_externals,unoidl-write,\ dtoa \ - zlib \ )) endif diff --git a/writerperfect/Library_wpftcalc.mk b/writerperfect/Library_wpftcalc.mk index 9f235603017f..2f8b713baaf5 100644 --- a/writerperfect/Library_wpftcalc.mk +++ b/writerperfect/Library_wpftcalc.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_externals,wpftcalc,\ mwaw \ staroffice \ wps \ - zlib \ lcms2 \ libxml2 \ icu_headers \ diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 340cb889b416..a369a626cccf 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\ visio \ wpg \ wpd \ - zlib \ lcms2 \ libxml2 \ icu_headers \ diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk index 9547faecd1be..96772de2e654 100644 --- a/writerperfect/Library_wpftimpress.mk +++ b/writerperfect/Library_wpftimpress.mk @@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_externals,wpftimpress,\ odfgen \ staroffice \ revenge \ - zlib \ libxml2 \ ))
