external/skia/Library_skia.mk | 1 +
sdext/Executable_xpdfimport.mk | 2 ++
vcl/Library_vcl.mk | 1 +
vcl/Library_vclplug_gen.mk | 1 +
4 files changed, 5 insertions(+)
New commits:
commit 1c43b81320ee54e719661ca85a74ff5fd1e90720
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Sep 15 12:53:54 2022 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Sep 26 20:57:48 2022 +0200
Fix building without system cairo, fontconfig, freetype, and harfbuzz
At least for me, this was needed when I added --without-system-cairo
--without-system-fontconfig --without-system-freetype
--without-system-harfbuzz to my otherwise fairly normal autogen.input
on Linux.
Change-Id: I149a57c24d6c11d710298125e53cb9524cb3dcaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140054
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index d3c3dd2cae7c..48717bdcffb3 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -83,6 +83,7 @@ endif
else
$(eval $(call gb_Library_use_externals,skia,\
+ expat \
freetype \
fontconfig \
))
diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk
index 495671a4ecae..bbdc76217c59 100644
--- a/sdext/Executable_xpdfimport.mk
+++ b/sdext/Executable_xpdfimport.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_Executable_Executable,xpdfimport))
$(eval $(call gb_Executable_use_externals,xpdfimport,\
boost_headers \
+ expat \
+ freetype \
poppler \
$(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \
zlib \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index fe0e0998ed4e..75b37832cfea 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\
$(eval $(call gb_Library_use_externals,vcl,\
boost_headers \
+ expat \
gio \
glm_headers \
graphite \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 3ebf80034c91..a8d4bb5ac26f 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
cairo \
graphite \
epoxy \
+ expat \
glm_headers \
harfbuzz \
icu_headers \
