avmedia/Library_avmedia.mk | 4 ----
chart2/Library_chartcore.mk | 1 -
cui/Library_cui.mk | 1 -
slideshow/Library_slideshow.mk | 1 -
svx/Library_svxcore.mk | 1 -
toolkit/Library_tk.mk | 1 -
vcl/CppunitTest_vcl_bitmap_test.mk | 1 -
vcl/CppunitTest_vcl_svm_test.mk | 1 -
vcl/Executable_icontest.mk | 6 ------
vcl/Executable_lo_kde5filepicker.mk | 1 -
vcl/Executable_vcldemo.mk | 6 ------
vcl/Library_vclplug_gtk3_kde5.mk | 1 -
vcl/Library_vclplug_gtk4.mk | 1 -
13 files changed, 26 deletions(-)
New commits:
commit c17d369230b1eac80395a1aebf058bace12885be
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Sun Aug 27 01:59:18 2023 +0200
Commit: Gabor Kelemen <kelem...@ubuntu.com>
CommitDate: Sat Sep 23 10:38:36 2023 +0200
Use less epoxy external headers dependency
Change-Id: If5d4e5a65a0fcea6bd67cdba48742f6aaec0811d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156556
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 72a5a67350e2..3b57e564a530 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
ifneq (,$(filter AVMEDIA,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_externals,avmedia,\
- epoxy \
-))
-
$(eval $(call
gb_Library_set_componentfile,avmedia,avmedia/util/avmedia,services))
$(eval $(call gb_Library_use_libraries,avmedia,\
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 54bc946766d8..ea427820a726 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -27,7 +27,6 @@ $(eval $(call
gb_Library_set_precompiled_header,chartcore,chart2/inc/pch/precomp
$(eval $(call gb_Library_use_externals,chartcore,\
boost_headers \
- epoxy \
libxml2 \
))
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 9c621a17171a..e122d2b734c4 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_Library_use_externals,cui,\
boost_headers \
$(call gb_Helper_optional,OPENCL,\
clew) \
- epoxy \
icuuc \
icu_headers \
libxml2 \
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index a55ec61b0770..3b9f3fb3f095 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -25,7 +25,6 @@ $(eval $(call
gb_Library_set_precompiled_header,slideshow,slideshow/inc/pch/prec
$(eval $(call gb_Library_use_externals,slideshow,\
boost_headers \
box2d \
- epoxy \
))
$(eval $(call gb_Library_add_defs,slideshow,\
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 51121441959a..28ed214c063f 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
$(eval $(call gb_Library_use_externals,svxcore,\
boost_headers \
- epoxy \
icuuc \
icu_headers \
libxml2 \
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 75ae962cafc5..bcea9abb6d7e 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -23,7 +23,6 @@ $(eval $(call
gb_Library_set_componentfile,tk,toolkit/util/tk,services))
$(eval $(call gb_Library_use_externals,tk,\
boost_headers \
- epoxy \
))
$(eval $(call gb_Library_set_include,tk,\
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk
b/vcl/CppunitTest_vcl_bitmap_test.mk
index 0edaabc9f9d9..d9cec0023fda 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -22,7 +22,6 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \
$(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
boost_headers \
- epoxy \
))
$(eval $(call gb_CppunitTest_set_include,vcl_bitmap_test,\
diff --git a/vcl/CppunitTest_vcl_svm_test.mk b/vcl/CppunitTest_vcl_svm_test.mk
index 3ed8bad38492..f689b6384b71 100644
--- a/vcl/CppunitTest_vcl_svm_test.mk
+++ b/vcl/CppunitTest_vcl_svm_test.mk
@@ -15,7 +15,6 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,vcl_svm_test, \
$(eval $(call gb_CppunitTest_use_externals,vcl_svm_test,\
boost_headers \
- epoxy \
libxml2 \
))
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index 0f8a3b60b09b..dc71ce3443b1 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -9,12 +9,6 @@
$(eval $(call gb_Executable_Executable,icontest))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Executable_use_externals,icontest,\
- epoxy \
-))
-endif
-
$(eval $(call gb_Executable_add_defs,icontest,\
-DVCL_INTERNALS \
))
diff --git a/vcl/Executable_lo_kde5filepicker.mk
b/vcl/Executable_lo_kde5filepicker.mk
index 1e7d48b0a5e2..9244a8c18b09 100644
--- a/vcl/Executable_lo_kde5filepicker.mk
+++ b/vcl/Executable_lo_kde5filepicker.mk
@@ -63,7 +63,6 @@ $(eval $(call gb_Executable_use_libraries,lo_kde5filepicker,\
))
$(eval $(call gb_Executable_use_externals,lo_kde5filepicker,\
- epoxy \
qt5 \
kf5 \
dbus \
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index beb8809bd7a4..f09f9fffeb12 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -15,12 +15,6 @@ $(eval $(call gb_Executable_use_api,vcldemo,\
udkapi \
))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Executable_use_externals,vcldemo,\
- epoxy \
-))
-endif
-
$(eval $(call gb_Executable_add_defs,vcldemo,\
-DVCL_INTERNALS \
))
diff --git a/vcl/Library_vclplug_gtk3_kde5.mk b/vcl/Library_vclplug_gtk3_kde5.mk
index 853ec7aafa4e..8401a66b2c12 100644
--- a/vcl/Library_vclplug_gtk3_kde5.mk
+++ b/vcl/Library_vclplug_gtk3_kde5.mk
@@ -79,7 +79,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3_kde5,\
$(eval $(call gb_Library_use_externals,vclplug_gtk3_kde5,\
boost_headers \
boost_filesystem \
- epoxy \
dbus \
graphite \
harfbuzz \
diff --git a/vcl/Library_vclplug_gtk4.mk b/vcl/Library_vclplug_gtk4.mk
index bb9d82ad570f..ed47d0978f59 100644
--- a/vcl/Library_vclplug_gtk4.mk
+++ b/vcl/Library_vclplug_gtk4.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk4,\
$(eval $(call gb_Library_use_externals,vclplug_gtk4,\
boost_headers \
- epoxy \
dbus \
graphite \
harfbuzz \
