Fix build with poppler 0.64.0

3 files changed, 30 insertions, 12 deletions

diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index 76d3adc60fd..44cf2116caf 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2017/12/31 00:44:32 markd Exp $
+$NetBSD: distinfo,v 1.25 2018/04/29 20:58:29 ryoon Exp $
 
 SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6
 RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e
 SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 Size (texlive-20170524-source.tar.xz) = 63483372 bytes
 SHA1 (patch-am) = b7b81b1161a2117e756b25b80f9a676575267bdd
-SHA1 (patch-pdftexdir_pdftoepdf.cc) = c4258903e6369d3471022b96b96a64c014dfea2f
-SHA1 (patch-pdftexdir_pdftosrc.cc) = c428c847f1fc5cbdeefbdddd0c6fa38ef305691f
+SHA1 (patch-pdftexdir_pdftoepdf.cc) = 24ff0639b236c87aa24b4ffb8f90520d9a4e092f
+SHA1 (patch-pdftexdir_pdftosrc.cc) = d951a2c83adfc28e58e6963f38e4ce5f35fc5bb8
diff --git a/print/web2c/patches/patch-pdftexdir_pdftoepdf.cc b/print/web2c/patches/patch-pdftexdir_pdftoepdf.cc
index 428fa621006..a13adfba446 100644
--- a/print/web2c/patches/patch-pdftexdir_pdftoepdf.cc
+++ b/print/web2c/patches/patch-pdftexdir_pdftoepdf.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-pdftexdir_pdftoepdf.cc,v 1.3 2017/12/31 00:44:32 markd Exp $
+$NetBSD: patch-pdftexdir_pdftoepdf.cc,v 1.4 2018/04/29 20:58:29 ryoon Exp $
 
 Allow recent poppler - from ArchLinux
 
@@ -36,7 +36,7 @@ Allow recent poppler - from ArchLinux
  // When copying the Resources of the selected page, all objects are copied
  // recusively top-down. Indirect objects however are not fetched during
  // copying, but get a new object number from pdfTeX and then will be
-@@ -212,18 +187,6 @@ static void delete_document(PdfDocument
+@@ -212,18 +187,6 @@ static void delete_document(PdfDocument 
      delete pdf_doc;
  }
  
@@ -87,7 +87,7 @@ Allow recent poppler - from ArchLinux
 -                        procset->getTypeName());
 -        copyName(procset->getName());
 +                        procset.getTypeName());
-+        copyName(procset.getName());
++        copyName(const_cast<char*>(procset.getName()));
          pdf_puts(" ");
      }
      pdf_puts("]\n");
@@ -157,7 +157,7 @@ Allow recent poppler - from ArchLinux
 +        && fontdescRef.isRef()
 +        && fontdesc.isDict()
 +        && embeddableFont(&fontdesc)
-+        && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
++        && (fontmap = lookup_fontmap(const_cast<char*>(basefont.getName()))) != NULL) {
          // round /StemV value, since the PDF input is a float
          // (see Font Descriptors in PDF reference), but we only store an
          // integer, since we don't want to change the struct.
@@ -171,7 +171,7 @@ Allow recent poppler - from ArchLinux
 +        charset = fontdesc.dictLookup("CharSet");
 +        if (!charset.isNull() &&
 +            charset.isString() && is_subsetable(fontmap))
-+            epdf_mark_glyphs(fd, charset.getString()->getCString());
++            epdf_mark_glyphs(fd, const_cast<char*>(charset.getString()->getCString()));
          else
              embed_whole_font(fd);
 -        addFontDesc(fontdescRef->getRef(), fd);
@@ -222,7 +222,23 @@ Allow recent poppler - from ArchLinux
      int i, l, c;
      Ref ref;
      char *p;
-@@ -601,8 +589,8 @@ static void copyObject(Object * obj)
+@@ -571,7 +559,7 @@ static void copyObject(Object * obj)
+     } else if (obj->isNum()) {
+         pdf_printf("%s", convertNumToPDF(obj->getNum()));
+     } else if (obj->isString()) {
+-        s = obj->getString();
++        s = const_cast<GooString*>(obj->getString());
+         p = s->getCString();
+         l = s->getLength();
+         if (strlen(p) == (unsigned int) l) {
+@@ -595,14 +583,14 @@ static void copyObject(Object * obj)
+             pdf_puts(">");
+         }
+     } else if (obj->isName()) {
+-        copyName(obj->getName());
++        copyName(const_cast<char*>(obj->getName()));
+     } else if (obj->isNull()) {
+         pdf_puts("null");
      } else if (obj->isArray()) {
          pdf_puts("[");
          for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
diff --git a/print/web2c/patches/patch-pdftexdir_pdftosrc.cc b/print/web2c/patches/patch-pdftexdir_pdftosrc.cc
index 7a4fac8ee28..40c099e33b1 100644
--- a/print/web2c/patches/patch-pdftexdir_pdftosrc.cc
+++ b/print/web2c/patches/patch-pdftexdir_pdftosrc.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-pdftexdir_pdftosrc.cc,v 1.3 2017/12/31 00:44:32 markd Exp $
+$NetBSD: patch-pdftexdir_pdftosrc.cc,v 1.4 2018/04/29 20:58:29 ryoon Exp $
 
 Allow recent poppler - from ArchLinux
 
 --- pdftexdir/pdftosrc.cc.orig	2016-11-25 18:09:21.000000000 +0000
 +++ pdftexdir/pdftosrc.cc
-@@ -86,22 +86,20 @@ int main(int argc, char *argv[])
+@@ -86,31 +86,29 @@ int main(int argc, char *argv[])
              objgen = atoi(argv[3]);
      }
      xref = doc->getXRef();
@@ -31,7 +31,9 @@ Allow recent poppler - from ArchLinux
          if (!srcName.isString()) {
              fprintf(stderr, "No SourceName found\n");
              exit(1);
-@@ -110,7 +108,7 @@ int main(int argc, char *argv[])
+         }
+-        outname = srcName.getString()->getCString();
++        outname = const_cast<char*>(srcName.getString()->getCString());
          // We cannot free srcName, as objname shares its string.
          // srcName.free();
      } else if (objnum > 0) {