[Libreoffice-commits] core.git: external/freetype vcl/commonfuzzer.mk

[Caolán McNamara]

 external/freetype/ExternalProject_freetype.mk |    5 +----
 vcl/commonfuzzer.mk                           |    1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 5a0aabe7b38825d584b9c134c0e96927cb6dd50c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Feb 4 22:24:20 2017 +0000

    circular freetype and harfbuzz dependency
    
    harfbuzz needs freetype, freetype wants harfbuzz but can live
    without it
    
    Change-Id: I4b5dbd937ccfc9af46c86be5ae1d3f8eeb14e86b

diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk
index b12303c6..1980637 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -9,10 +9,6 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,freetype))
 
-$(eval $(call gb_ExternalProject_use_externals,freetype,\
-	harfbuzz \
-))
-
 $(eval $(call gb_ExternalProject_register_targets,freetype,\
 	build \
 ))
@@ -30,6 +26,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
 			--disable-shared \
 			--without-zlib \
 			--without-bzip2 \
+			--without-harfbuzz \
 			--prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 3d2125f..32a1bae 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -24,6 +24,7 @@ fuzzer_externals = \
     libxslt \
     libxml2 \
     jpeg \
+    png \
     clew \
     openssl \
     expat \