From 281bd0b08a1c678209befd2355c29d823a2e85d3 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 28 Sep 2016 08:52:45 +0200 Subject: Update HarfBuzz to 1.3.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Only build the library, makes no-freetype patch redundant. * Don’t build ICU support as a separate library, otherwise we would also build the alternative UCDN Unicode functions which we do not use. * Don’t build FontConfig support stuff that was added a few releases ago as we don’t need it as well. Change-Id: Ia5f296c61a6ce2a589b1c521b3c2c7c75dbcf74d Reviewed-on: https://gerrit.libreoffice.org/29342 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- external/harfbuzz/ExternalProject_harfbuzz.mk | 5 +++-- external/harfbuzz/UnpackedTarball_harfbuzz.mk | 1 - external/harfbuzz/no-freetype.patch | 13 ------------- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 external/harfbuzz/no-freetype.patch (limited to 'external') diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index 9e01833261e6..1bee5bb43dbc 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -28,14 +28,15 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : --disable-shared \ --disable-gtk-doc \ --with-pic \ - --with-icu=yes \ + --with-icu=builtin \ --with-freetype=no \ + --with-fontconfig=no \ --with-cairo=no \ --with-glib=no \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter LINUX,$(OS)),CXXFLAGS="$(CXXFLAGS) -fvisibility=hidden") \ - && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \ + && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 1514fd8edb6d..9a5560fda96f 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0)) $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ external/harfbuzz/ubsan.patch \ - external/harfbuzz/no-freetype.patch \ )) ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE) diff --git a/external/harfbuzz/no-freetype.patch b/external/harfbuzz/no-freetype.patch deleted file mode 100644 index 32d62e205da3..000000000000 --- a/external/harfbuzz/no-freetype.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Makefile.in -+++ src/Makefile.in -@@ -149,9 +149,7 @@ - @HAVE_GOBJECT_TRUE@ $(HB_GOBJECT_ENUM_headers) \ - @HAVE_GOBJECT_TRUE@ $(NULL) - --noinst_PROGRAMS = main$(EXEEXT) test$(EXEEXT) \ -- test-buffer-serialize$(EXEEXT) test-size-params$(EXEEXT) \ -- test-would-substitute$(EXEEXT) $(am__EXEEXT_1) -+noinst_PROGRAMS = main$(EXEEXT) $(am__EXEEXT_1) - bin_PROGRAMS = - check_PROGRAMS = test-ot-tag$(EXEEXT) $(am__EXEEXT_1) - TESTS = $(am__EXEEXT_2) $(check_PROGRAMS) -- cgit