[pkgsrc/trunk]: pkgsrc/misc/libreoffice Fix build with poppler-0.72

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/280173e2317d
branches:  trunk
changeset: 316382:280173e2317d
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Dec 11 12:59:49 2018 +0000

description:
Fix build with poppler-0.72

diffstat:

 misc/libreoffice/distinfo                                                             |   4 +-
 misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx |  20 +++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r 34e322bcb12e -r 280173e2317d misc/libreoffice/distinfo
--- a/misc/libreoffice/distinfo Tue Dec 11 12:41:02 2018 +0000
+++ b/misc/libreoffice/distinfo Tue Dec 11 12:59:49 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2018/12/04 12:56:48 ryoon Exp $
+$NetBSD: distinfo,v 1.67 2018/12/11 12:59:49 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -236,7 +236,7 @@
 SHA1 (patch-lotuswordpro_source_filter_localtime.cxx) = 8db23e81f54b5a71e331dfccb57cceb8aab92d2a
 SHA1 (patch-mysqlc_Library__mysqlc.mk) = c5560b4739cf54b8207c7d9dfa2a22ffeeee8cfd
 SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
-SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 3797e214235ca1b196bf634e2200b2f9e67f5381
+SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 1910ebf571181b2f6a973e2f6537baf67edbcb4a
 SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx) = 15a5d9708a5349f6584231dcf787537618371cb0
 SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_wrapper__gpl.cxx) = f2ecf16e731bebc88639598c5e63b05998317f8a
 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
diff -r 34e322bcb12e -r 280173e2317d misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
--- a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx     Tue Dec 11 12:41:02 2018 +0000
+++ b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx     Tue Dec 11 12:59:49 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.6 2018/12/04 12:56:49 ryoon Exp $
+$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.7 2018/12/11 12:59:49 ryoon Exp $
 
 --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-10-29 19:55:29.000000000 +0000
 +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -11,6 +11,15 @@
      m_bSkipImages(false)
  {
  }
+@@ -555,7 +555,7 @@ void PDFOutDev::processLink(Link* link, 
+     LinkAction* pAction = link->getAction();
+     if (pAction && pAction->getKind() == actionURI)
+     {
+-        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
++        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+ 
+         std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
+ 
 @@ -578,7 +578,7 @@ void PDFOutDev::restoreState(GfxState*)
      printf( "restoreState\n" );
  }
@@ -20,6 +29,15 @@
  {
      assert(pMat);
  
+@@ -753,7 +753,7 @@ void PDFOutDev::updateFont(GfxState *sta
+ 
+             aFont = it->second;
+ 
+-            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
++            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
+             printf( " %d %d %d %d %f %d %s",
+                     aFont.isEmbedded,
+                     aFont.isBold,
 @@ -939,11 +939,11 @@ void PDFOutDev::endTextObject(GfxState*)
  }