<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0cee10d3ed8375f9138ecf55aca1356c42f9b84d">https://github.com/macports/macports-ports/commit/0cee10d3ed8375f9138ecf55aca1356c42f9b84d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0cee10d pdf2djvu: backport upstream patches for poppler 0.76 compatibility, rebuild
</span>0cee10d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0cee10d3ed8375f9138ecf55aca1356c42f9b84d
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed May 1 00:05:19 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> pdf2djvu: backport upstream patches for poppler 0.76 compatibility, rebuild
</span>---
graphics/pdf2djvu/Portfile | 6 +-
graphics/pdf2djvu/files/patch-find-page.diff | 79 +++++++++++++++++++++++++
graphics/pdf2djvu/files/patch-i18n.hh.diff | 2 +-
graphics/pdf2djvu/files/patch-poppler-0.76.diff | 38 ++++++++++++
4 files changed, 122 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pdf2djvu/Portfile b/graphics/pdf2djvu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c63d302..3ff2e4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pdf2djvu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pdf2djvu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cxx11 1.1
github.setup jwilk pdf2djvu 0.9.12
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories graphics textproc
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,9 @@ depends_lib port:djvulibre \
</span> port:libxslt
patchfiles patch-i18n.hh.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sys-uuid.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sys-uuid.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-find-page.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-poppler-0.76.diff
</span>
#Openmp is anyway not detected with llvm-gcc or clang, and breaks compilation with
#gcc42 on SL (ticket #38184)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pdf2djvu/files/patch-find-page.diff b/graphics/pdf2djvu/files/patch-find-page.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2ebdbbe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pdf2djvu/files/patch-find-page.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,79 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8b0348b3d5f33494d7e637411633fbea511a78d7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jakub Wilk <jwilk@jwilk.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 1 Apr 2019 08:49:02 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Catalog::findPage(int, int).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf-backend.cc | 15 +++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf-backend.hh | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf2djvu.cc | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 18 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pdf-backend.cc b/pdf-backend.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f1d7662..a1b9b63 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pdf-backend.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pdf-backend.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -631,4 +631,19 @@ const char * pdf::get_c_string(const pdf::String *str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return catalog->findPage(pgref.num, pgref.gen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return catalog->findPage(pgref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return find_page_impl<pdf::Catalog>(catalog, pgref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // vim:ts=2 sts=2 sw=2 et
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pdf-backend.hh b/pdf-backend.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d7872c3..d88c956 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pdf-backend.hh.orig 2019-01-02 07:46:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pdf-backend.hh 2019-04-30 23:26:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,6 +82,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ::Catalog Catalog;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ::GooString String;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ::Goffset Offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef ::Ref Ref;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* type definitions — annotations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ==============================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -435,6 +436,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char * get_c_string(const pdf::String *str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int find_page(pdf::Catalog *catalog, pdf::Ref pgref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pdf2djvu.cc b/pdf2djvu.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d9e1532..21f2d50 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pdf2djvu.cc.orig 2019-01-02 07:46:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pdf2djvu.cc 2019-04-30 23:10:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,8 +86,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int page;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dest->isPageRef())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Ref pageref = dest->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- page = catalog->findPage(pageref.num, pageref.gen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pdf::Ref pageref = dest->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ page = pdf::find_page(catalog, pageref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ page = dest->getPageNum();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pdf2djvu/files/patch-i18n.hh.diff b/graphics/pdf2djvu/files/patch-i18n.hh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 022d899..455a383 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pdf2djvu/files/patch-i18n.hh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pdf2djvu/files/patch-i18n.hh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- i18n.hh.orig 2010-06-12 15:20:36.000000000 -0500
+++ i18n.hh 2010-09-21 02:34:55.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,10 @@
</span>
#include <libintl.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pdf2djvu/files/patch-poppler-0.76.diff b/graphics/pdf2djvu/files/patch-poppler-0.76.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ddcd8de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pdf2djvu/files/patch-poppler-0.76.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8325358a9769e8aa33693fc5ea2ac771dd82716f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jakub Wilk <jwilk@jwilk.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 23 Apr 2019 08:23:46 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] pdf-backend: simplify find_page() implementation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf-backend.cc | 16 +++++-----------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 11 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pdf-backend.cc b/pdf-backend.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f6f5267..a94383e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pdf-backend.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pdf-backend.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -631,19 +631,13 @@ const char * pdf::get_c_string(const pdf::String *str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return catalog->findPage(pgref.num, pgref.gen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return catalog->findPage(pgref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return find_page_impl<pdf::Catalog>(catalog, pgref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_VERSION >= 7600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return catalog->findPage(pgref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return catalog->findPage(pgref.num, pgref.gen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // vim:ts=2 sts=2 sw=2 et
</span></pre><pre style='margin:0'>
</pre>