diff --git converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-1.patch converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-1.patch new file mode 100644 index 000000000000..5b49804be1b6 --- /dev/null +++ converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-1.patch @@ -0,0 +1,35 @@ +From aa3fdae51c19ad2865f92882ec9007feeb7e477a Mon Sep 17 00:00:00 2001 +From: Jakub Wilk +Date: Mon, 1 Apr 2019 08:23:51 +0200 +Subject: [PATCH] Put Ref in pdf namespace. + +--- + pdf-backend.hh | 1 + + pdf2djvu.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/pdf-backend.hh b/pdf-backend.hh +index 43899c0..d7872c3 100644 +--- pdf-backend.hh ++++ pdf-backend.hh +@@ -82,6 +82,7 @@ namespace pdf + typedef ::Catalog Catalog; + typedef ::GooString String; + typedef ::Goffset Offset; ++ typedef ::Ref Ref; + + /* type definitions — annotations + * ============================== +diff --git a/pdf2djvu.cc b/pdf2djvu.cc +index 669eba5..d9e1532 100644 +--- pdf2djvu.cc ++++ pdf2djvu.cc +@@ -86,7 +86,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata + int page; + if (dest->isPageRef()) + { +- Ref pageref = dest->getPageRef(); ++ pdf::Ref pageref = dest->getPageRef(); + page = catalog->findPage(pageref.num, pageref.gen); + } + else diff --git converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-2.patch converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-2.patch new file mode 100644 index 000000000000..9cfe39b65461 --- /dev/null +++ converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-2.patch @@ -0,0 +1,69 @@ +From 8b0348b3d5f33494d7e637411633fbea511a78d7 Mon Sep 17 00:00:00 2001 +From: Jakub Wilk +Date: Mon, 1 Apr 2019 08:49:02 +0200 +Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to + Catalog::findPage(int, int). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’: + pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’ +--- + pdf-backend.cc | 15 +++++++++++++++ + pdf-backend.hh | 2 ++ + pdf2djvu.cc | 2 +- + 3 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/pdf-backend.cc b/pdf-backend.cc +index f1d7662..a1b9b63 100644 +--- pdf-backend.cc ++++ pdf-backend.cc +@@ -631,4 +631,19 @@ const char * pdf::get_c_string(const pdf::String *str) + } + #endif + ++template static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0)) ++{ ++ return catalog->findPage(pgref.num, pgref.gen); ++} ++ ++template static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref)) ++{ ++ return catalog->findPage(pgref); ++} ++ ++int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref) ++{ ++ return find_page_impl(catalog, pgref); ++} ++ + // vim:ts=2 sts=2 sw=2 et +diff --git a/pdf-backend.hh b/pdf-backend.hh +index d7872c3..d88c956 100644 +--- pdf-backend.hh ++++ pdf-backend.hh +@@ -436,6 +436,8 @@ namespace pdf + + const char * get_c_string(const pdf::String *str); + ++ int find_page(pdf::Catalog *catalog, pdf::Ref pgref); ++ + } + + #endif +diff --git a/pdf2djvu.cc b/pdf2djvu.cc +index d9e1532..21f2d50 100644 +--- pdf2djvu.cc ++++ pdf2djvu.cc +@@ -87,7 +87,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata + if (dest->isPageRef()) + { + pdf::Ref pageref = dest->getPageRef(); +- page = catalog->findPage(pageref.num, pageref.gen); ++ page = pdf::find_page(catalog, pageref); + } + else + page = dest->getPageNum(); diff --git converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-3.patch converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-3.patch new file mode 100644 index 000000000000..ddcd8ded4b1a --- /dev/null +++ converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-3.patch @@ -0,0 +1,38 @@ +From 8325358a9769e8aa33693fc5ea2ac771dd82716f Mon Sep 17 00:00:00 2001 +From: Jakub Wilk +Date: Tue, 23 Apr 2019 08:23:46 +0200 +Subject: [PATCH] pdf-backend: simplify find_page() implementation. + +--- + pdf-backend.cc | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) + +diff --git a/pdf-backend.cc b/pdf-backend.cc +index f6f5267..a94383e 100644 +--- pdf-backend.cc ++++ pdf-backend.cc +@@ -631,19 +631,13 @@ const char * pdf::get_c_string(const pdf::String *str) + } + #endif + +-template static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0)) +-{ +- return catalog->findPage(pgref.num, pgref.gen); +-} +- +-template static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref)) +-{ +- return catalog->findPage(pgref); +-} +- + int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref) + { +- return find_page_impl(catalog, pgref); ++#if POPPLER_VERSION >= 7600 ++ return catalog->findPage(pgref); ++#else ++ return catalog->findPage(pgref.num, pgref.gen); ++#endif + } + + // vim:ts=2 sts=2 sw=2 et diff --git graphics/inkscape/files/patch-gentoo_inkscape-0.92.4-poppler-0.76.0.patch graphics/inkscape/files/patch-gentoo_inkscape-0.92.4-poppler-0.76.0.patch new file mode 100644 index 000000000000..d9c23a860d52 --- /dev/null +++ graphics/inkscape/files/patch-gentoo_inkscape-0.92.4-poppler-0.76.0.patch @@ -0,0 +1,44 @@ +From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001 +From: Marc Jeanmougin +Date: Wed, 24 Apr 2019 14:11:26 +0200 +Subject: [PATCH] Tentative fix for poppler 0.76 + +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- + src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 2981d6ee51..ddbff7671f 100644 +--- src/extension/internal/pdfinput/pdf-parser.cpp ++++ src/extension/internal/pdfinput/pdf-parser.cpp +@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { + error(errInternal, -1, "Weird page contents"); + return; + } +- parser = new Parser(xref, new Lexer(xref, obj), gFalse); ++ parser = new _POPPLER_NEW_PARSER(xref, obj); + go(topLevel); + delete parser; + parser = NULL; +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 6e4dde7dee..21a60702fa 100644 +--- src/extension/internal/pdfinput/poppler-transition-api.h ++++ src/extension/internal/pdfinput/poppler-transition-api.h +@@ -3,6 +3,13 @@ + + #include + ++#if POPPLER_CHECK_VERSION(0, 76, 0) ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) ++#else ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) ++#endif ++ ++ + #if POPPLER_CHECK_VERSION(0, 72, 0) + #define getCString c_str + #endif +-- +2.18.1 + diff --git graphics/poppler/Makefile graphics/poppler/Makefile index 28c537d07397..7b0cbaeabb69 100644 --- graphics/poppler/Makefile +++ graphics/poppler/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= poppler -DISTVERSION= 0.75.0 +DISTVERSION= 0.76.1 CATEGORIES= graphics print MASTER_SITES= https://poppler.freedesktop.org/ diff --git graphics/poppler/distinfo graphics/poppler/distinfo index 1a19318a2316..b113955376e5 100644 --- graphics/poppler/distinfo +++ graphics/poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553492103 -SHA256 (poppler-0.75.0.tar.xz) = 3bbaedb0fa2797cac933a0659d144303e4d09eec6892c65600da987d8707199a -SIZE (poppler-0.75.0.tar.xz) = 1523872 +TIMESTAMP = 1557610026 +SHA256 (poppler-0.76.1.tar.xz) = e62cd4053f851eecc4a6aa2b81d739fbab1d67b3c60b31ebac7049483cc617b1 +SIZE (poppler-0.76.1.tar.xz) = 1531548 diff --git graphics/poppler/pkg-plist graphics/poppler/pkg-plist index 255bcc16b9f4..d48563e86038 100644 --- graphics/poppler/pkg-plist +++ graphics/poppler/pkg-plist @@ -97,7 +97,6 @@ include/poppler/fofi/FoFiType1C.h include/poppler/goo/FixedPoint.h include/poppler/goo/GooCheckedOps.h include/poppler/goo/GooLikely.h -include/poppler/goo/GooList.h include/poppler/goo/GooString.h include/poppler/goo/GooTimer.h include/poppler/goo/ImgWriter.h @@ -134,8 +133,8 @@ lib/libpoppler-cpp.so lib/libpoppler-cpp.so.0 lib/libpoppler-cpp.so.0.7.0 lib/libpoppler.so -lib/libpoppler.so.86 -lib/libpoppler.so.86.0.0 +lib/libpoppler.so.87 +lib/libpoppler.so.87.0.0 libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc diff --git print/scribus-devel/files/patch-z-gentoo_scribus-1.5.5_pre20190429-poppler-0.76.patch print/scribus-devel/files/patch-z-gentoo_scribus-1.5.5_pre20190429-poppler-0.76.patch new file mode 100644 index 000000000000..27b758158355 --- /dev/null +++ print/scribus-devel/files/patch-z-gentoo_scribus-1.5.5_pre20190429-poppler-0.76.patch @@ -0,0 +1,51 @@ +From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 2 May 2019 00:08:12 +0200 +Subject: [PATCH] Fix build with poppler-0.76 + +findPage(int num, int gen) -> findPage(const Ref ref) + +https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e + +--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2019-05-12 09:24:08.096711000 +0200 ++++ scribus/plugins/import/pdf/slaoutput.cpp 2019-05-12 09:24:46.609452000 +0200 +@@ -516,8 +516,7 @@ + { + if (dst->isPageRef()) + { +- Ref dstr = dst->getPageRef(); +- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); ++ pagNum = pdfDoc->findPage(dst->getPageRef()); + } + else + pagNum = dst->getPageNum(); +@@ -538,8 +537,7 @@ + { + if (dstn->isPageRef()) + { +- Ref dstr = dstn->getPageRef(); +- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); ++ pagNum = pdfDoc->findPage(dstn->getPageRef()); + } + else + pagNum = dstn->getPageNum(); +@@ -1061,8 +1059,7 @@ + { + if (dst->isPageRef()) + { +- Ref dstr = dst->getPageRef(); +- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); ++ pagNum = pdfDoc->findPage(dst->getPageRef()); + } + else + pagNum = dst->getPageNum(); +@@ -1085,8 +1082,7 @@ + { + if (dstn->isPageRef()) + { +- Ref dstr = dstn->getPageRef(); +- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); ++ pagNum = pdfDoc->findPage(dstn->getPageRef()); + } + else + pagNum = dstn->getPageNum();