From 15cacb9054b3cdbdc803634b73d697c3147167bf Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Sun, 27 Aug 2023 01:18:58 +0200 Subject: [PATCH] Use less boost external headers dependency in shell Change-Id: Ie9c184abe3f30b79163bed10c89f4cf76015a5aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156555 Tested-by: Jenkins Reviewed-by: Gabor Kelemen --- shell/Executable_lngconvex.mk | 2 -- shell/IwyuFilter_shell.yaml | 2 -- shell/Library_desktopbe.mk | 2 -- shell/Library_kf5be.mk | 1 - shell/Library_losessioninstall.mk | 1 - shell/Library_macbe.mk | 2 -- 6 files changed, 10 deletions(-) diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk index 55b4c33c41f5..76ff52b5d92c 100644 --- a/shell/Executable_lngconvex.mk +++ b/shell/Executable_lngconvex.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Executable_Executable,lngconvex)) -$(eval $(call gb_Executable_use_external,lngconvex,boost_headers)) - $(eval $(call gb_Executable_use_sdk_api,lngconvex)) $(eval $(call gb_Executable_use_libraries,lngconvex,\ diff --git a/shell/IwyuFilter_shell.yaml b/shell/IwyuFilter_shell.yaml index 933f817ad38d..755dc738343e 100644 --- a/shell/IwyuFilter_shell.yaml +++ b/shell/IwyuFilter_shell.yaml @@ -15,8 +15,6 @@ excludelist: shell/source/backends/kf5be/kf5backend.cxx: # Keep abstract QT headers - QtWidgets/QApplication - # Keep abstract boost headers - - boost/noncopyable.hpp shell/source/backends/localebe/localebackend.cxx: # Needed on WIN for toU - o3tl/char16_t2wchar_t.hxx diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index 741127ce3cb1..01f1347a9e65 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Library_Library,desktopbe1)) -$(eval $(call gb_Library_use_external,desktopbe1,boost_headers)) - $(eval $(call gb_Library_use_sdk_api,desktopbe1)) $(eval $(call gb_Library_use_libraries,desktopbe1,\ diff --git a/shell/Library_kf5be.mk b/shell/Library_kf5be.mk index 26ed1b35dd22..1355d402dc00 100644 --- a/shell/Library_kf5be.mk +++ b/shell/Library_kf5be.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,kf5be1)) $(eval $(call gb_Library_use_sdk_api,kf5be1)) $(eval $(call gb_Library_use_externals,kf5be1,\ - boost_headers \ kf5 \ )) diff --git a/shell/Library_losessioninstall.mk b/shell/Library_losessioninstall.mk index 1c95a2dd7cd8..7e89ae72ddce 100644 --- a/shell/Library_losessioninstall.mk +++ b/shell/Library_losessioninstall.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_libraries,losessioninstall,\ )) $(eval $(call gb_Library_use_externals,losessioninstall,\ - boost_headers \ dbus \ gio \ )) diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 091b6d43a15a..21588937a049 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Library_Library,macbe1)) -$(eval $(call gb_Library_use_external,macbe1,boost_headers)) - $(eval $(call gb_Library_use_sdk_api,macbe1)) $(eval $(call gb_Library_use_system_darwin_frameworks,macbe1,\