diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 5 | ||||
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 1 | ||||
| -rw-r--r-- | external/harfbuzz/no-freetype.patch | 13 |
5 files changed, 7 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 97e6e0f2c9d2..56f5ebe6a15b 100644 --- a/configure.ac +++ b/configure.ac @@ -9341,9 +9341,9 @@ if test "$with_harfbuzz" = "yes" -o \( $_os != WINNT -a $_os != Darwin -a $_os ! AC_MSG_RESULT([yes]) ENABLE_HARFBUZZ="TRUE" if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then - libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz -lharfbuzz-icu"]) + libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"]) else - libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10],[-I${WORKDIR}/UnpackedTarball/harfbuzz/src],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz -lharfbuzz-icu"]) + libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10],[-I${WORKDIR}/UnpackedTarball/harfbuzz/src],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"]) fi else AC_MSG_RESULT([no]) diff --git a/download.lst b/download.lst index 018679ea998f..ef4fc152515e 100644 --- a/download.lst +++ b/download.lst @@ -57,8 +57,8 @@ export GLEW_TARBALL := 3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip export GLYPHY_TARBALL := 5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2 export GRAPHITE_TARBALL := 4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz -export HARFBUZZ_MD5SUM := a82d49ff67197bc3c96ea34b98880c52 -export HARFBUZZ_TARBALL := a82d49ff67197bc3c96ea34b98880c52-harfbuzz-1.3.0.tar.bz2 +export HARFBUZZ_MD5SUM := 5986e1bfcd983d1f6caa53ef64c4abc5 +export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_TARBALL := 33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz 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) |