 @@ -1,37 +1,39 @@
-# $NetBSD: Makefile,v 1.90 2019/11/07 12:38:08 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2020/01/11 00:31:05 ryoon Exp $
 PKGREVISION= 3
 .include "../../print/texlive/Makefile.common"
 PKGNAME=	web2c-2019
 CATEGORIES=	print
 HOMEPAGE=	http://www.tug.org/web2c/
 COMMENT=	TeX implementation translating WEB to C
 DEPENDS+=	kpathsea>=6.2.1:../../print/kpathsea
 DEPENDS+=	ptexenc>=1.3.7:../../print/ptexenc
 EXTRACT_ELEMENTS+=	${DISTNAME}/texk/web2c
-USE_LANGUAGES=		c c++11
+USE_LANGUAGES=		c c++14
 USE_TOOLS+=		gmake lex yacc
 GNU_CONFIGURE_STRICT=	no # texk/web2c/web2c doesn't know the options
 PKGCONFIG_OVERRIDE=	synctexdir/synctex.pc.in
 INFO_FILES=		yes
 WRKSRC=			${WRKDIR}/${DISTNAME}/texk/web2c
 #CXXFLAGS+=		-fpermissive
 CONFIGURE_ARGS+=	--disable-luatex
 CONFIGURE_ARGS+=	--disable-luatex53
 CONFIGURE_ARGS+=	--disable-luajittex
 CONFIGURE_ARGS+=	--disable-mflua
 CONFIGURE_ARGS+=	--disable-mfluajit
 CONFIGURE_ARGS+=	--disable-xetex
 CONFIGURE_ARGS+=	--with-x=no
 CONFIGURE_ARGS+=	--without-mf-x-toolkit
 CONFIGURE_ARGS+=	--with-system-kpathsea
 CONFIGURE_ARGS+=	--with-system-libpng
 CONFIGURE_ARGS+=	--with-system-cairo
 CONFIGURE_ARGS+=	--with-system-gmp
 CONFIGURE_ARGS+=	--with-gmp-includes=${BUILDLINK_PREFIX.gmp}/include

 @@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.34 2019/05/14 13:23:10 adam Exp $
+$NetBSD: distinfo,v 1.35 2020/01/11 00:31:05 ryoon Exp $
 SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
 RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
 SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 Size (texlive-20190410-source.tar.xz) = 53783408 bytes
 SHA1 (patch-Makefile.in) = ec3cc8f935d7365c90aabcd68be431eb706d970e
 SHA1 (patch-man_Makefile.in) = 8d0cbcd73f113135ea400c0491a4c0cbd0b07c73
 SHA1 (patch-pdftexdir_pdftex-common.h) = 0f82056b5431c0a4718ab8609967f2ec9aeca3a9
-SHA1 (patch-pdftexdir_pdftoepdf-poppler0.75.0.cc) = fed92e4cc1fa8086eb70dd44726371e1df64f79f
+SHA1 (patch-pdftexdir_pdftoepdf-poppler0.75.0.cc) = ac5c44afe5eacd6e7b955ba7acb335f10249d0c3
-SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = ce79bc0fc98756493adb1b57724ccb7f7b2821aa
+SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = ff18cc9bcb0dc665f7981bf06fba753e67117269
 SHA1 (patch-pdftexdir_utils.c) = 989dc2fe8097d4d31ee2ba03885f00da0f1ab39b
 SHA1 (patch-pdftexdir_writeenc.c) = d2dfedf140c2c2c9143bc701291c09d3a8d3f3a4

 @@ -1,111 +1,78 @@
-$NetBSD: patch-pdftexdir_pdftoepdf-poppler0.75.0.cc,v 1.1 2019/05/14 13:23:10 adam Exp $
+$NetBSD: patch-pdftexdir_pdftoepdf-poppler0.75.0.cc,v 1.2 2020/01/11 00:31:05 ryoon Exp $
 Fix building.
 --- pdftexdir/pdftoepdf-poppler0.75.0.cc.orig	2019-03-21 06:38:16.000000000 +0000
 +++ pdftexdir/pdftoepdf-poppler0.75.0.cc
-@@ -275,7 +275,7 @@ static int getNewObjectNumber(Ref ref)
+@@ -22,7 +22,7 @@ This is based on the patch texlive-poppl
  https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
- static void copyObject(Object *);
+ by Arch Linux. A little modifications are made to avoid a crash for
  some kind of pdf images, such as figure_missing.pdf in gnuplot.
--static void copyName(char *s)
+-The poppler should be 0.75.0 or newer versions.
-+static void copyName(const char *s)
++The poppler should be 0.83.0 or newer versions.
  POPPLER_VERSION should be defined.
-     pdf_puts("/");
+ */
      for (; *s != 0; s++) {
-@@ -310,7 +310,7 @@ static void copyDict(Object * obj)
+@@ -669,7 +669,7 @@ static void writeEncodings()
- static void copyFontDict(Object * obj, InObj * r)
+             else
                  glyphNames[i] = notdef;
      int i, l;
--    char *key;
+-        epdf_write_enc(glyphNames, r->enc_objnum);
-+    const char *key;
++        epdf_write_enc(const_cast<const char**>(glyphNames), r->enc_objnum);
      if (!obj->isDict())
-         pdftex_fail("PDF inclusion: invalid dict type <%s>",
+     for (r = encodingList; r != 0; r = n) {
-                     obj->getTypeName());
+         n = r->next;
-@@ -382,7 +382,7 @@ static bool embeddableFont(Object * font
+@@ -710,7 +710,7 @@ static const PDFRectangle *get_pagebox(P
      return false;
  int
  read_pdf_info(char *image_name, char *page_name, int page_num,
--static void copyFont(char *tag, Object * fontRef)
+-              int pagebox_spec, int minor_pdf_version_wanted,
-+static void copyFont(const char *tag, Object * fontRef)
++              int pagebox_spec, /* int major_pdf_version_wanted, */ int minor_pdf_version_wanted,
                int pdf_inclusion_errorlevel)
      Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
-         stemV;
+     PdfDocument *pdf_doc;
-@@ -467,7 +467,7 @@ static void copyFontResources(Object * o
+@@ -723,7 +723,7 @@ read_pdf_info(char *image_name, char *pa
-     pdf_puts(">>\n");
+ #endif
      // initialize
      if (!isInit) {
--static void copyOtherResources(Object * obj, char *key)
+-        globalParams = new GlobalParams();
-+static void copyOtherResources(Object * obj, const char *key)
++        globalParams = std::make_unique<GlobalParams>();
          globalParams->setErrQuiet(false);
-     // copies all other resources (write_epdf handles Fonts and ProcSets),
+         isInit = true;
+     }
-@@ -554,8 +554,8 @@ static void copyObject(Object * obj)
+@@ -738,16 +738,16 @@ read_pdf_info(char *image_name, char *pa
-     Object obj1;
+ #ifdef POPPLER_VERSION
-     int i, l, c;
+     pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
-     Ref ref;
+     pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
--    char *p;
+-    if ((pdf_major_version_found > 1)
--    GString *s;
++    if ((pdf_major_version_found > /* major_pdf_version_wanted */ 1)
-+    const char *p;
+      || (pdf_minor_version_found > minor_pdf_version_wanted)) {
-+    const GString *s;
+         const char *msg =
-     if (obj->isBool()) {
+-            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
-         pdf_printf("%s", obj->getBool()? "true" : "false");
++            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
-     } else if (obj->isInt()) {
+         if (pdf_inclusion_errorlevel > 0) {
-@@ -655,7 +655,7 @@ static void writeRefs()
+-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
- static void writeEncodings()
++            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, /* major_pdf_version_wanted, */ minor_pdf_version_wanted);
          } else if (pdf_inclusion_errorlevel < 0) {
-     UsedEncoding *r, *n;
+             ; /* do nothing */
--    char *glyphNames[256], *s;
+         } else { /* = 0, give warning */
-+    const char *glyphNames[256], *s;
+-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
-     int i;
++            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, /* major_pdf_version_wanted, */ minor_pdf_version_wanted);
      for (r = encodingList; r != 0; r = r->next) {
          for (i = 0; i < 256; i++) {
-@@ -685,20 +685,24 @@ static void writeEncodings()
+ #else
- // get the pagebox according to the pagebox_spec
+@@ -761,7 +761,7 @@ read_pdf_info(char *image_name, char *pa
  static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
 +    const PDFRectangle *ret;
      if (pagebox_spec == pdfboxspecmedia)
 -        return page->getMediaBox();
 +        ret = page->getMediaBox();
      else if (pagebox_spec == pdfboxspeccrop)
 -        return page->getCropBox();
 +        ret = page->getCropBox();
      else if (pagebox_spec == pdfboxspecbleed)
 -        return page->getBleedBox();
 +        ret = page->getBleedBox();
      else if (pagebox_spec == pdfboxspectrim)
 -        return page->getTrimBox();
 +        ret = page->getTrimBox();
      else if (pagebox_spec == pdfboxspecart)
 -        return page->getArtBox();
 +        ret = page->getArtBox();
      else
          pdftex_fail("PDF inclusion: unknown value of pagebox spec (%i)",
                      (int) pagebox_spec);
 -    return page->getMediaBox(); // to make the compiler happy
 +    // ret = page->getMediaBox(); // to make the compiler happy
 +    return const_cast<PDFRectangle*>(ret);
@@ -761,7 +765,7 @@ read_pdf_info(char *image_name, char *pa
          if (link == 0 || !link->isOk())
              pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
          Ref ref = link->getPageRef();
 -        page_num = pdf_doc->doc->getCatalog()->findPage(ref.num, ref.gen);
 +        page_num = pdf_doc->doc->getCatalog()->findPage(ref);
          if (page_num == 0)
              pdftex_fail("PDF inclusion: destination is not a page <%s>",
                          page_name);
-@@ -822,7 +826,7 @@ void write_epdf(void)
+@@ -1107,7 +1107,5 @@ void epdf_check_mem()
-     Object groupDict;
+             n = p->next;
-     bool writeSepGroup = false;
+             delete_document(p);
      Object info;
--    char *key;
+-        // see above for globalParams
-+    const char *key;
+-        delete globalParams;
      char s[256];
      int i, l;
      int rotate;

 @@ -1,68 +1,90 @@
-$NetBSD: patch-pdftexdir_pdftosrc-newpoppler.cc,v 1.6 2019/05/14 13:23:10 adam Exp $
+$NetBSD: patch-pdftexdir_pdftosrc-newpoppler.cc,v 1.7 2020/01/11 00:31:05 ryoon Exp $
 Fix building.
 --- pdftexdir/pdftosrc-newpoppler.cc.orig	2018-12-06 23:31:33.000000000 +0000
 +++ pdftexdir/pdftosrc-newpoppler.cc
-@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
+@@ -20,8 +20,7 @@ with this program.  If not, see <http://
-     Stream *s;
+ /*
-     Object srcStream, srcName, catalogDict;
+ This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
-     FILE *outfile;
+ https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
--    char *outname;
+-by Arch Linux. The poppler should be 0.59.0 or newer versions.
-+    const char *outname;
+-It is tested upto the poppler 0.70.1.
-     int objnum = 0, objgen = 0;
++by Arch Linux. The poppler should be 0.83.0 or newer versions.
-     bool extract_xref_table = false;
+ POPPLER_VERSION should be defined.
-     int c;
+ */
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
@@ -80,7 +79,7 @@ int main(int argc, char *argv[])
          exit(1);
+     }
      fileName = new GString(argv[1]);
 -    globalParams = new GlobalParams();
 +    globalParams = std::make_unique<GlobalParams>();
      doc = new PDFDoc(fileName);
      if (!doc->isOk()) {
          fprintf(stderr, "Invalid PDF file\n");
@@ -100,8 +99,8 @@ int main(int argc, char *argv[])
      srcStream = Object(objNull);
      if (objnum == 0) {
          srcStream = catalogDict.dictLookup("SourceObject");
 -        static char const_SourceFile[] = "SourceFile";
 -        if (!srcStream.isStream(const_SourceFile)) {
 +        static const char *const_SourceFile = "SourceFile";
 +        if (!srcStream.isDict(const_SourceFile)) {
              fprintf(stderr, "No SourceObject found\n");
              exit(1);
+         }
@@ -110,7 +109,7 @@ int main(int argc, char *argv[])
              fprintf(stderr, "No SourceName found\n");
              exit(1);
+         }
 -        outname = (char *)srcName.getString()->getCString();
 +        outname = (char *)srcName.getString()->c_str();
          // We cannot free srcName, as objname shares its string.
          // srcName.free();
      } else if (objnum > 0) {
-@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
+@@ -119,7 +118,7 @@ int main(int argc, char *argv[])
              fprintf(stderr, "Not a Stream object\n");
              exit(1);
+         }
 -        sprintf(buf, "%s", fileName->getCString());
 +        sprintf(buf, "%s", fileName->c_str());
          if ((p = strrchr(buf, '.')) == 0)
              p = strchr(buf, 0);
          if (objgen == 0)
-@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
+@@ -129,7 +128,7 @@ int main(int argc, char *argv[])
          outname = buf;
      } else {                    // objnum < 0 means we are extracting the XRef table
          extract_xref_table = true;
 -        sprintf(buf, "%s", fileName->getCString());
 +        sprintf(buf, "%s", fileName->c_str());
          if ((p = strrchr(buf, '.')) == 0)
              p = strchr(buf, 0);
          sprintf(p, ".xref");
-@@ -157,12 +157,11 @@ int main(int argc, char *argv[])
+@@ -162,7 +161,7 @@ int main(int argc, char *argv[])
                          (e->type == xrefEntryFree ? "f" : "n"));
              else {              // e->offset is the object number of the object stream
                  Stream *str;
 -                Lexer *lexer;
                  Parser *parser;
                  Object objStr, obj1, obj2;
                  int nObjects, first, n;
                  int localOffset = 0;
 -                Guint firstOffset;
 +                unsigned int firstOffset;
                  objStr = xref->fetch(e->offset, 0);
                  assert(objStr.isStream());
 @@ -174,9 +173,8 @@ int main(int argc, char *argv[])
                  // parse the header: object numbers and offsets
                  objStr.streamReset();
 -                str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first);
 -                lexer = new Lexer(xref, str);
 -                parser = new Parser(xref, lexer, gFalse);
 +                str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
 +                parser = new Parser(xref, str, false);
                  for (n = 0; n < nObjects; ++n) {
                      obj1 = parser->getObj();
                      obj2 = parser->getObj();
@@ -204,5 +202,4 @@ int main(int argc, char *argv[])
          fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
      fclose(outfile);
      delete doc;
 -    delete globalParams;
+ }