diff options
author | wiz <wiz@pkgsrc.org> | 2020-03-05 06:21:42 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2020-03-05 06:21:42 +0000 |
commit | 7d3332f2d3c92ffcc5a82244d563456242af5375 (patch) | |
tree | a2d9f70a568aed3a88da7c799543b9ed2a9702b8 /print | |
parent | 74d1c8e7d6639497abe476c87dbfd90b5da7ffd2 (diff) | |
download | pkgsrc-7d3332f2d3c92ffcc5a82244d563456242af5375.tar.gz |
web2c: fix build with poppler 0.86.1
Diffstat (limited to 'print')
-rw-r--r-- | print/web2c/distinfo | 4 | ||||
-rw-r--r-- | print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/print/web2c/distinfo b/print/web2c/distinfo index fc4f7511251..dc317e973f8 100644 --- a/print/web2c/distinfo +++ b/print/web2c/distinfo @@ -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) = 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) = 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 diff --git a/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc b/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc index c290bcd074c..caa9c03deb6 100644 --- a/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc +++ b/print/web2c/patches/patch-pdftexdir_pdftoepdf-poppler0.75.0.cc @@ -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-poppler0.75.0.cc,v 1.2 2020/01/11 00:31:05 ry } } #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-poppler0.75.0.cc,v 1.2 2020/01/11 00:31:05 ry 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); } |