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 8d0e40b331cf45b59dc14351eb0ca06aba41ebb0 Author: Tor Lillqvist <[email protected]> AuthorDate: Thu Sep 15 12:53:54 2022 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Thu Sep 15 20:38:00 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/+/140001 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Reviewed-by: Tor Lillqvist <[email protected]> diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 14c59c99c41e..c0f91e1a463a 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 e8b6f7a90837..8c2543cf0cd7 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 fa11362929f0..caaacdddca39 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -81,6 +81,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 2cefd3f76856..ca29dca1bc9d 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\ cairo \ graphite \ epoxy \ + expat \ glm_headers \ harfbuzz \ icu_headers \
