cpputools/Executable_uno.mk | 4 ---- drawinglayer/CppunitTest_drawinglayer_border.mk | 1 - drawinglayer/CppunitTest_drawinglayer_processors.mk | 1 - drawinglayer/Library_drawinglayercore.mk | 1 - helpcompiler/Executable_HelpIndexer.mk | 1 - i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 1 - opencl/Library_opencl.mk | 1 - sc/CppunitTest_sc_filters_test.mk | 1 - sc/CppunitTest_sc_screenshots.mk | 1 - sc/CppunitTest_sc_vba_macro_test.mk | 1 - sc/functions_setup.mk | 1 - svtools/CppunitTest_svtools_graphic.mk | 1 - sw/CppunitTest_sw_accessible_relation_set.mk | 1 - sw/CppunitTest_sw_filters_test.mk | 1 - sw/CppunitTest_sw_odffeatures.mk | 1 - ucb/CppunitTest_ucb_webdav_core.mk | 1 - writerfilter/CppunitTest_writerfilter_misc.mk | 4 ---- writerperfect/Library_wpftcalc.mk | 1 - writerperfect/Library_wpftimpress.mk | 1 - 19 files changed, 25 deletions(-)
New commits: commit d5afeecbffec0457b87faaff38f913fad489e08d Author: Gabor Kelemen <[email protected]> AuthorDate: Sat Sep 9 15:59:53 2023 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Fri Sep 29 00:20:57 2023 +0200 Use less libxml2 external headers dependency Change-Id: I1749628e0104dff856161bc0bdfd343ef0db208e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156784 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk index ba3b22fb6337..f3106c304b82 100644 --- a/cpputools/Executable_uno.mk +++ b/cpputools/Executable_uno.mk @@ -20,10 +20,6 @@ $(eval $(call gb_Executable_use_libraries,uno,\ salhelper \ )) -$(eval $(call gb_Executable_use_externals,uno,\ - libxml2 \ -)) - $(eval $(call gb_Executable_add_exception_objects,uno,\ cpputools/source/unoexe/unoexe \ )) diff --git a/drawinglayer/CppunitTest_drawinglayer_border.mk b/drawinglayer/CppunitTest_drawinglayer_border.mk index e00006c18dba..f87321a608c5 100644 --- a/drawinglayer/CppunitTest_drawinglayer_border.mk +++ b/drawinglayer/CppunitTest_drawinglayer_border.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_border, \ $(eval $(call gb_CppunitTest_use_externals,drawinglayer_border,\ boost_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,drawinglayer_border, \ diff --git a/drawinglayer/CppunitTest_drawinglayer_processors.mk b/drawinglayer/CppunitTest_drawinglayer_processors.mk index b17a5107dc2d..fcbbf247f10a 100644 --- a/drawinglayer/CppunitTest_drawinglayer_processors.mk +++ b/drawinglayer/CppunitTest_drawinglayer_processors.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_processors, \ $(eval $(call gb_CppunitTest_use_externals,drawinglayer_processors,\ boost_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,drawinglayer_processors, \ diff --git a/drawinglayer/Library_drawinglayercore.mk b/drawinglayer/Library_drawinglayercore.mk index 2eb24a40182d..7cff1a4b70bd 100644 --- a/drawinglayer/Library_drawinglayercore.mk +++ b/drawinglayer/Library_drawinglayercore.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_sdk_api,drawinglayercore)) $(eval $(call gb_Library_use_externals,drawinglayercore,\ boost_headers \ - libxml2 \ )) $(eval $(call gb_Library_use_libraries,drawinglayercore,\ diff --git a/helpcompiler/Executable_HelpIndexer.mk b/helpcompiler/Executable_HelpIndexer.mk index 5fee9f7a64f4..9b2a7657e9ba 100644 --- a/helpcompiler/Executable_HelpIndexer.mk +++ b/helpcompiler/Executable_HelpIndexer.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Executable_use_libraries,HelpIndexer,\ $(eval $(call gb_Executable_use_externals,HelpIndexer,\ expat \ libxslt \ - libxml2 \ clucene \ )) diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk index 801bfe7b99ff..271aa7f21558 100644 --- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\ icu_headers \ icuuc \ liblangtag \ - libxml2 \ )) ifneq ($(SYSTEM_LIBLANGTAG),) diff --git a/opencl/Library_opencl.mk b/opencl/Library_opencl.mk index 5b3de52d6a3e..213c600637c2 100644 --- a/opencl/Library_opencl.mk +++ b/opencl/Library_opencl.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_externals,opencl,\ icu_headers \ icui18n \ icuuc \ - libxml2 \ )) $(eval $(call gb_Library_use_custom_headers,opencl,\ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index ca12691c73a4..67ef60664081 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -24,7 +24,6 @@ endif $(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \ boost_headers \ mdds_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ diff --git a/sc/CppunitTest_sc_screenshots.mk b/sc/CppunitTest_sc_screenshots.mk index 0749d39b0c39..5bec1eb4a6e1 100644 --- a/sc/CppunitTest_sc_screenshots.mk +++ b/sc/CppunitTest_sc_screenshots.mk @@ -39,7 +39,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_screenshots, \ $(eval $(call gb_CppunitTest_use_externals,sc_screenshots,\ boost_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_set_include,sc_screenshots,\ diff --git a/sc/CppunitTest_sc_vba_macro_test.mk b/sc/CppunitTest_sc_vba_macro_test.mk index e648d1240213..dc16cfd33a87 100644 --- a/sc/CppunitTest_sc_vba_macro_test.mk +++ b/sc/CppunitTest_sc_vba_macro_test.mk @@ -12,7 +12,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_vba_macro_test)) $(eval $(call gb_CppunitTest_use_externals,sc_vba_macro_test, \ boost_headers \ mdds_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_vba_macro_test)) diff --git a/sc/functions_setup.mk b/sc/functions_setup.mk index 0acff70355f7..1c82249ab5fd 100644 --- a/sc/functions_setup.mk +++ b/sc/functions_setup.mk @@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_$(1)_functions_test, \ $(eval $(call gb_CppunitTest_use_externals,sc_$(1)_functions_test, \ boost_headers \ mdds_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_$(1)_functions_test, \ diff --git a/svtools/CppunitTest_svtools_graphic.mk b/svtools/CppunitTest_svtools_graphic.mk index 04e562e16691..287e10e95b81 100644 --- a/svtools/CppunitTest_svtools_graphic.mk +++ b/svtools/CppunitTest_svtools_graphic.mk @@ -11,7 +11,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,svtools_graphic)) $(eval $(call gb_CppunitTest_use_externals,svtools_graphic,\ boost_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_use_api,svtools_graphic,\ diff --git a/sw/CppunitTest_sw_accessible_relation_set.mk b/sw/CppunitTest_sw_accessible_relation_set.mk index ddb1754426c5..73c353f59021 100644 --- a/sw/CppunitTest_sw_accessible_relation_set.mk +++ b/sw/CppunitTest_sw_accessible_relation_set.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_accessible_relation_set, \ $(eval $(call gb_CppunitTest_use_externals,sw_accessible_relation_set,\ boost_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 5546dc7f2a3e..e457b1f015eb 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -13,7 +13,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_filters_test)) $(eval $(call gb_CppunitTest_use_externals,sw_filters_test,\ boost_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_filters_test)) diff --git a/sw/CppunitTest_sw_odffeatures.mk b/sw/CppunitTest_sw_odffeatures.mk index f0f5cca0cbd1..9dea4289c613 100644 --- a/sw/CppunitTest_sw_odffeatures.mk +++ b/sw/CppunitTest_sw_odffeatures.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_odffeatures, \ $(eval $(call gb_CppunitTest_use_externals,sw_odffeatures,\ boost_headers \ - libxml2 \ )) $(eval $(call gb_CppunitTest_set_include,sw_odffeatures,\ diff --git a/ucb/CppunitTest_ucb_webdav_core.mk b/ucb/CppunitTest_ucb_webdav_core.mk index 0df1feefff21..d04771f87bc9 100644 --- a/ucb/CppunitTest_ucb_webdav_core.mk +++ b/ucb/CppunitTest_ucb_webdav_core.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_library_objects,ucb_webdav_core, \ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_core,\ boost_headers \ - libxml2 \ curl \ )) diff --git a/writerfilter/CppunitTest_writerfilter_misc.mk b/writerfilter/CppunitTest_writerfilter_misc.mk index 1b45ec716cda..0822e90bc285 100644 --- a/writerfilter/CppunitTest_writerfilter_misc.mk +++ b/writerfilter/CppunitTest_writerfilter_misc.mk @@ -31,10 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_misc, \ salhelper \ )) -$(eval $(call gb_CppunitTest_use_externals,writerfilter_misc,\ - libxml2 \ -)) - $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_misc, \ writerfilter/qa/cppunittests/misc/misc \ )) diff --git a/writerperfect/Library_wpftcalc.mk b/writerperfect/Library_wpftcalc.mk index 2f8b713baaf5..3f7f82329998 100644 --- a/writerperfect/Library_wpftcalc.mk +++ b/writerperfect/Library_wpftcalc.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Library_use_externals,wpftcalc,\ staroffice \ wps \ lcms2 \ - libxml2 \ icu_headers \ icui18n \ icuuc \ diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk index 96772de2e654..3fa007ae5d72 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 \ - libxml2 \ )) $(eval $(call gb_Library_add_exception_objects,wpftimpress,\
