Fix build with poppler-0.62.0 and runtime error with harfbuzz-1.7,4

Bump PKGREVISION

4 files changed, 38 insertions, 13 deletions

diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile
index 110936c4fe9..3e02318d38a 100644
--- a/misc/libreoffice/Makefile
+++ b/misc/libreoffice/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.136 2018/01/10 22:16:25 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2018/01/11 12:52:05 ryoon Exp $
 
 VERREL=		5.4.4
 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
@@ -108,8 +108,8 @@ 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/
+DISTFILES+=		harfbuzz-1.7.4.tar.bz2
+SITES.harfbuzz-1.7.4.tar.bz2=	http://www.freedesktop.org/software/harfbuzz/release/
 
 .include "options.mk"
 
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo
index b6acc48f40d..93a104fff48 100644
--- a/misc/libreoffice/distinfo
+++ b/misc/libreoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2017/12/24 09:13:10 ryoon Exp $
+$NetBSD: distinfo,v 1.46 2018/01/11 12:52:05 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.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/harfbuzz-1.7.4.tar.bz2) = acaca9dd723516a06c7a237c9a6894101f736993
+RMD160 (libreoffice/harfbuzz-1.7.4.tar.bz2) = ddad7f9221f701a7b26da56a4ca7859a9f9e19de
+SHA512 (libreoffice/harfbuzz-1.7.4.tar.bz2) = d5343822f2e7ed33b34f0ecb470d219be161ebb4d2349833a8fcd909cec18a97aed6ca51a97fd73407d5d70ebfc61cafb71bd13ce96c9a278c720681a04f47df
+Size (libreoffice/harfbuzz-1.7.4.tar.bz2) = 1718260 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,13 +218,14 @@ 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-download.lst) = 1976dfdc700fbfb4f0a6ee1baabc621ebdbe8dbb
 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
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce
 SHA1 (patch-mysqlc_Library__mysqlc.mk) = c75e938a59cf64cf02ce6545f05752d64d634599
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 5ef64fe2fad810ac8fb119a6f929aef2dcffe192
 SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = df3a3900fc8b5542f1cc37f7bd509afdb53d9c1b
 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
 SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58
diff --git a/misc/libreoffice/patches/patch-download.lst b/misc/libreoffice/patches/patch-download.lst
index e0b8eb8aa15..2d4c58c5984 100644
--- a/misc/libreoffice/patches/patch-download.lst
+++ b/misc/libreoffice/patches/patch-download.lst
@@ -1,4 +1,4 @@
-$NetBSD: patch-download.lst,v 1.1 2017/11/27 23:59:24 ryoon Exp $
+$NetBSD: patch-download.lst,v 1.2 2018/01/11 12:52:05 ryoon Exp $
 
 --- download.lst.orig	2017-11-03 14:12:31.000000000 +0000
 +++ download.lst
@@ -8,8 +8,8 @@ $NetBSD: patch-download.lst,v 1.1 2017/11/27 23:59:24 ryoon Exp $
  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 HARFBUZZ_SHA256SUM := b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b
++export HARFBUZZ_TARBALL := harfbuzz-1.7.4.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-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
new file mode 100644
index 00000000000..787f76b4205
--- /dev/null
+++ b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
@@ -0,0 +1,24 @@
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.1 2018/01/11 12:52:05 ryoon Exp $
+
+* Fix build with poppler-0.62.0
+
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2017-12-12 17:45:07.000000000 +0000
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -36,7 +36,7 @@
+ // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
+ //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
+ #if POPPLER_CHECK_VERSION(0, 21, 1)
+-#include "UTF8.h"
++#include "UnicodeMapFuncs.h"
+ #elif POPPLER_CHECK_VERSION(0, 21, 0)
+ #include "UTF.h"
+ #else
+@@ -918,7 +918,7 @@ void PDFOutDev::drawChar(GfxState *state
+             );
+ 
+     // silence spurious warning
+-    (void)&mapUCS2;
++    (void)&mapUTF16;
+ 
+     char buf[9];
+     for( int i=0; i<uLen; ++i )