external/harfbuzz/UnpackedTarball_harfbuzz.mk | 6 ++----
external/harfbuzz/harfbuzz-ios.patch | 20 --------------------
2 files changed, 2 insertions(+), 24 deletions(-)
New commits:
commit 2a1fa1f2c69480bfc14ba5613ac13b3fb1382b1b
Author: David Tardon <dtar...@redhat.com>
Date: Wed Nov 8 19:58:30 2017 +0100
harfbuzz: update autoconf configs the gbuild way
Change-Id: Ie89e2888bdd28d4836ab1f01827612360c267808
Reviewed-on: https://gerrit.libreoffice.org/44539
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 9a2967220e25..74c990c0c1aa 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,harfbuzz))
$(eval $(call
gb_UnpackedTarball_set_tarball,harfbuzz,$(HARFBUZZ_TARBALL),,harfbuzz))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
+
$(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
@@ -24,8 +26,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
))
endif
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
- external/harfbuzz/harfbuzz-ios.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/harfbuzz-ios.patch
b/external/harfbuzz/harfbuzz-ios.patch
deleted file mode 100644
index 6a47ab9bb1df..000000000000
--- a/external/harfbuzz/harfbuzz-ios.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- config.sub
-+++ config.sub
-@@ -253,7 +253,7 @@
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
- | am33_2.0 \
- | arc | arceb \
-- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] |
arm64 \
- | avr | avr32 \
- | be32 | be64 \
- | bfin \
-@@ -367,7 +367,7 @@
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
