Fix 'Application Error'

* Build and link harfbuzz 1.7.1 to avoid conflict fonts/harfbuzz
* Bump PKGREVISION

4 files changed, 39 insertions, 8 deletions

diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile
index c3113fa44e6..d61994e6f6c 100644
--- a/misc/libreoffice/Makefile
+++ b/misc/libreoffice/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.130 2017/11/23 17:20:03 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2017/11/27 23:59:24 ryoon Exp $
 
 VERREL=		5.4.3
 VERRC=		2
 VER=		${VERREL}.${VERRC}
 DISTNAME=	libreoffice-${VER}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=	.tar.xz
@@ -98,7 +98,6 @@ MORE_DISTFILES= \
 	7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz \
 	c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 \
 	edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz \
-	harfbuzz-1.4.8.tar.bz2 \
 	graphite2-minimal-1.3.10.tgz \
 	1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip \
 	EmojiOneColor-SVGinOT-1.3.tar.gz \
@@ -109,6 +108,9 @@ DISTFILES+=		${md}
 SITES.${md}=		http://dev-www.libreoffice.org/src/
 .endfor
 
+DISTFILES+=		harfbuzz-1.7.1.tar.bz2
+SITES.harfbuzz-1.7.1.tar.bz2=	http://www.freedesktop.org/software/harfbuzz/release/
+
 .include "options.mk"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo
index dc5ef8d3964..b6dc1eddefb 100644
--- a/misc/libreoffice/distinfo
+++ b/misc/libreoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2017/11/10 22:54:04 ryoon Exp $
+$NetBSD: distinfo,v 1.43 2017/11/27 23:59:24 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -176,10 +176,10 @@ SHA1 (libreoffice/graphite2-minimal-1.3.10.tgz) = a2dac9614ab6b11ba5529f9043467d
 RMD160 (libreoffice/graphite2-minimal-1.3.10.tgz) = 508f69ef2f6c4e8e3843d4a367aea8e1c00439e3
 SHA512 (libreoffice/graphite2-minimal-1.3.10.tgz) = 0bbf2b586d3b9f09aa6f8e68575482d63ea4ebc712bd2103ba678074b581ac0e5593fdb6d26be60a74fea0261da2797d4c0db7d384d75837fbf93dd4ac3579a2
 Size (libreoffice/graphite2-minimal-1.3.10.tgz) = 155690 bytes
-SHA1 (libreoffice/harfbuzz-1.4.8.tar.bz2) = e48cd89f6e5c9c732923f2c4afd0b9d4e6a85968
-RMD160 (libreoffice/harfbuzz-1.4.8.tar.bz2) = cf4f1483427b4ea207c5b4027e8a07d228310354
-SHA512 (libreoffice/harfbuzz-1.4.8.tar.bz2) = 056a2c02f803439b39086e3ea988e424f5512b3213844f9008c62f5448a8ccdba525f532e7ed54641820a4ef6dc5bc4d13d4f7bfb39ff904f5939c855d294152
-Size (libreoffice/harfbuzz-1.4.8.tar.bz2) = 1587622 bytes
+SHA1 (libreoffice/harfbuzz-1.7.1.tar.bz2) = 68a7347a5a6bb91b416b94c809d448e80d91f33d
+RMD160 (libreoffice/harfbuzz-1.7.1.tar.bz2) = fedf6cac52cb92d88e8be654b06063b4ee2c72d5
+SHA512 (libreoffice/harfbuzz-1.7.1.tar.bz2) = e78c96a4debfc4761075aca50de111acf394bb966c038b8cebc26fd01a113d53492946709cf54dcc30d87bb6b5d920509181b5a0fc9ea0a010a399e94ad090b7
+Size (libreoffice/harfbuzz-1.7.1.tar.bz2) = 1662385 bytes
 SHA1 (libreoffice/language-subtag-registry-2016-02-10.tar.bz2) = 930e1e01da294af239f85f42df78d35cf3e120d0
 RMD160 (libreoffice/language-subtag-registry-2016-02-10.tar.bz2) = efaab283f8a5c2aeeb71c208a6e0ecaf47e8439d
 SHA512 (libreoffice/language-subtag-registry-2016-02-10.tar.bz2) = 39515bfd3feceae0121e0e03ca5b341cf748acf1059b73e832395bee809d730e0a51311c233e017050d4c1df190df77c077de40ddc726f076a4dfa595b0a7de8
@@ -218,6 +218,8 @@ SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4
 SHA1 (patch-configure.ac) = 64d49f455dcef62c950f581d85c4893e9c8945d5
 SHA1 (patch-desktop_unx_source_pagein.c) = 2aeee1be9db348989bb30c033da49386989c7075
+SHA1 (patch-download.lst) = 1705f93982d5ccb0e42c92b58f259a313c7e0f43
+SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 1715c0b08705b9df43b060cd594ca042f870deb8
 SHA1 (patch-external_libmariadb_UnpackedTarball__mariadb.mk) = e7f156c30a33119e0268b371cea61674572fb860
 SHA1 (patch-external_libmariadb_mariadb-netbsd.patch) = 032283279faf2978c7a6af3f09a3c19b5fe861c0
 SHA1 (patch-external_mysqlcppconn_config.h) = 75929db7615da07810ac685b682628b7aca31919
diff --git a/misc/libreoffice/patches/patch-download.lst b/misc/libreoffice/patches/patch-download.lst
new file mode 100644
index 00000000000..e0b8eb8aa15
--- /dev/null
+++ b/misc/libreoffice/patches/patch-download.lst
@@ -0,0 +1,15 @@
+$NetBSD: patch-download.lst,v 1.1 2017/11/27 23:59:24 ryoon Exp $
+
+--- download.lst.orig	2017-11-03 14:12:31.000000000 +0000
++++ download.lst
+@@ -81,8 +81,8 @@ export GPGME_SHA256SUM := 596097257c2ce2
+ export GPGME_TARBALL := gpgme-1.8.0.tar.bz2
+ export GRAPHITE_SHA256SUM := aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9
+ export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
+-export HARFBUZZ_SHA256SUM := ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131
+-export HARFBUZZ_TARBALL := harfbuzz-1.4.8.tar.bz2
++export HARFBUZZ_SHA256SUM := 9645a6e83313b690602017f18d4eb2adf81f2e54c6fc4471e19331304965154e
++export HARFBUZZ_TARBALL := harfbuzz-1.7.1.tar.bz2
+ export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
+ export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ export HUNSPELL_SHA256SUM := 512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2
diff --git a/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk b/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
new file mode 100644
index 00000000000..90dba46d1cf
--- /dev/null
+++ b/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
@@ -0,0 +1,12 @@
+$NetBSD: patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk,v 1.1 2017/11/27 23:59:24 ryoon Exp $
+
+--- external/harfbuzz/UnpackedTarball_harfbuzz.mk.orig	2017-11-03 14:12:31.000000000 +0000
++++ external/harfbuzz/UnpackedTarball_harfbuzz.mk
+@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_pat
+ 
+ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
+     external/harfbuzz/clang-cl.patch \
+-    external/harfbuzz/ubsan.patch \
+ ))
+ 
+ ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)