Fix build with poppler 0.64.0

* And remove an unused patch.

4 files changed, 51 insertions, 18 deletions

diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo
index 3180f3dff94..c55c91a31eb 100644
--- a/misc/libreoffice/distinfo
+++ b/misc/libreoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2018/04/19 18:07:03 mrg Exp $
+$NetBSD: distinfo,v 1.55 2018/04/30 04:46:16 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -215,7 +215,6 @@ SHA1 (patch-download.lst) = ebcdd4ad27656f2199312413c5d118c0049f8316
 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = ffe2b8ff9e9ff6b5faf4eea1d51a8983908d0602
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = ed0c6861fd9a61eeac05e235dd505b6bed166a3a
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
-SHA1 (patch-external_mysql-connector-cpp_patches_netbsd.patch) = d0981757856f5b28082ee468b385dc2fdf027dd0
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce
 SHA1 (patch-external_postgresql_UnpackedTarball__postgresql.mk) = d0b94e20d9e1aa89adac0f4a91c7b684850c78bc
 SHA1 (patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch) = de2b5d8e657e9721867f9c72a402cc30fd093218
@@ -229,6 +228,8 @@ SHA1 (patch-i18nutil_source_utility_unicode.cxx) = b2c48cafe10cf4fd45604c8e501bb
 SHA1 (patch-lotuswordpro_source_filter_localtime.cxx) = 8db23e81f54b5a71e331dfccb57cceb8aab92d2a
 SHA1 (patch-mysqlc_Library__mysqlc.mk) = b040cfdb25f41896c77df3acafd4c31dc41dd590
 SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 6df205a34db526938eccaa3190d3f9ef4a62d76a
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx) = 2c25420332c28768973aa15dae8fa57fbcf118b3
 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
 SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58
 SHA1 (patch-vcl_inc_scrptrun.h) = 52877f7f6c867e2baeed525c200ce7d75a97574a
diff --git a/misc/libreoffice/patches/patch-external_mysql-connector-cpp_patches_netbsd.patch b/misc/libreoffice/patches/patch-external_mysql-connector-cpp_patches_netbsd.patch
deleted file mode 100644
index 70730b51c13..00000000000
--- a/misc/libreoffice/patches/patch-external_mysql-connector-cpp_patches_netbsd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-external_mysql-connector-cpp_patches_netbsd.patch,v 1.1 2018/02/03 00:39:50 ryoon Exp $
-
---- external/mysql-connector-cpp/patches/netbsd.patch.orig	2018-02-01 02:39:56.558112089 +0000
-+++ external/mysql-connector-cpp/patches/netbsd.patch
-@@ -0,0 +1,11 @@
-+--- include/my_global.h.orig	2014-04-04 10:21:01.000000000 +0000
-++++ include/my_global.h
-+@@ -190,7 +190,7 @@ double my_ulonglong2double(unsigned long
-+ #ifdef HAVE_UNISTD_H
-+ #include <unistd.h>
-+ #endif
-+-#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
-++#if (defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)) || defined(__NetBSD__)
-+ #undef HAVE_ALLOCA
-+ #undef HAVE_ALLOCA_H
-+ #endif
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..fa0cd728edc
--- /dev/null
+++ b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
@@ -0,0 +1,33 @@
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.4 2018/04/30 04:46:17 ryoon Exp $
+
+* Fix build with poppler 0.64.0
+
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2018-03-29 15:04:09.000000000 +0000
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -446,7 +446,7 @@ int PDFOutDev::parseFont( long long nNew
+     FontAttributes aNewFont;
+     int nSize = 0;
+ 
+-    GooString* pFamily = gfxFont->getName();
++    GooString* pFamily = const_cast<GooString*>(gfxFont->getName());
+     if( pFamily )
+     {
+         aNewFont.familyName.clear();
+@@ -742,7 +742,7 @@ void PDFOutDev::updateFont(GfxState *sta
+         FontAttributes aFont;
+         int nEmbedSize=0;
+ 
+-        Ref* pID = gfxFont->getID();
++        Ref* pID = const_cast<Ref*>(gfxFont->getID());
+         // TODO(Q3): Portability problem
+         long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
+         std::unordered_map< long long, FontAttributes >::const_iterator it =
+@@ -932,7 +932,7 @@ void PDFOutDev::drawChar(GfxState *state
+     printf( "\n" );
+ }
+ 
+-void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
++void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
+ {
+     // TODO(F3): NYI
+ }
diff --git a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx
new file mode 100644
index 00000000000..e7e12b2a06e
--- /dev/null
+++ b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx,v 1.1 2018/04/30 04:46:17 ryoon Exp $
+
+* Fix build with poppler 0.64.0
+
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig	2018-03-29 15:04:09.000000000 +0000
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -223,7 +223,7 @@ namespace pdfi
+                               double dx, double dy,
+                               double originX, double originY,
+                               CharCode code, int nBytes, Unicode *u, int uLen) override;
+-        virtual void drawString(GfxState *state, GooString *s) override;
++        virtual void drawString(GfxState *state, const GooString *s) override;
+         virtual void endTextObject(GfxState *state) override;
+ 
+         //----- image drawing