CVS commit: pkgsrc/print/web2c

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar  5 06:21:43 UTC 2020

Modified Files:
        pkgsrc/print/web2c: distinfo
        pkgsrc/print/web2c/patches: patch-pdftexdir_pdftoepdf-poppler0.75.0.cc

Log Message:
web2c: fix build with poppler 0.86.1


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/print/web2c/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/web2c/distinfo
diff -u pkgsrc/print/web2c/distinfo:1.35 pkgsrc/print/web2c/distinfo:1.36
--- pkgsrc/print/web2c/distinfo:1.35    Sat Jan 11 00:31:05 2020
+++ pkgsrc/print/web2c/distinfo Thu Mar  5 06:21:42 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2020/01/11 00:31:05 ryoon Exp $
+$NetBSD: distinfo,v 1.36 2020/03/05 06:21:42 wiz Exp $
 
 SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
 RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
@@ -7,7 +7,7 @@ Size (texlive-20190410-source.tar.xz) = 
 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) = ac5c44afe5eacd6e7b955ba7acb335f10249d0c3
+SHA1 (patch-pdftexdir_pdftoepdf-poppler0.75.0.cc) = 58bcae1a76696178c3f7a2e4e050306e56bdc0f9
 SHA1 (patch-pdftexdir_pdftosrc-newpoppler.cc) = ff18cc9bcb0dc665f7981bf06fba753e67117269
 SHA1 (patch-pdftexdir_utils.c) = 989dc2fe8097d4d31ee2ba03885f00da0f1ab39b
 SHA1 (patch-pdftexdir_writeenc.c) = d2dfedf140c2c2c9143bc701291c09d3a8d3f3a4

Index: pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc
diff -u pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc:1.2 pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc:1.3
--- pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc:1.2   Sat Jan 11 00:31:05 2020
+++ pkgsrc/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc       Thu Mar  5 06:21:42 2020
@@ -1,4 +1,6 @@
-$NetBSD: patch-pdftexdir_pdftoepdf-poppler0.75.0.cc,v 1.2 2020/01/11 00:31:05 ryoon Exp $
+$NetBSD: patch-pdftexdir_pdftoepdf-poppler0.75.0.cc,v 1.3 2020/03/05 06:21:42 wiz Exp $
+
+Fix build with poppler 0.86.1.
 
 --- pdftexdir/pdftoepdf-poppler0.75.0.cc.orig  2019-03-21 06:38:16.000000000 +0000
 +++ pdftexdir/pdftoepdf-poppler0.75.0.cc
@@ -59,7 +61,12 @@ $NetBSD: patch-pdftexdir_pdftoepdf-poppl
          }
      }
  #else
-@@ -761,7 +761,7 @@ read_pdf_info(char *image_name, char *pa
+@@ -757,15 +757,14 @@ read_pdf_info(char *image_name, char *pa
+     if (page_name) {
+         // get page by name
+         GString name(page_name);
+-        LinkDest *link = pdf_doc->doc->findDest(&name);
++        std::unique_ptr<LinkDest> link = pdf_doc->doc->findDest(&name);
          if (link == 0 || !link->isOk())
              pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
          Ref ref = link->getPageRef();
@@ -68,7 +75,11 @@ $NetBSD: patch-pdftexdir_pdftoepdf-poppl
          if (page_num == 0)
              pdftex_fail("PDF inclusion: destination is not a page <%s>",
                          page_name);
-@@ -1107,7 +1107,5 @@ void epdf_check_mem()
+-        delete link;
+     } else {
+         // get page by number
+         if (page_num <= 0 || page_num > epdf_num_pages)
+@@ -1107,7 +1106,5 @@ void epdf_check_mem()
              n = p->next;
              delete_document(p);
          }