<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/4105ab9765ba0b9a733d86d65298edc69111b8ba">https://github.com/macports/macports-ports/commit/4105ab9765ba0b9a733d86d65298edc69111b8ba</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 4105ab9 pdf2djvu: apply upstream patches for poppler 0.83.0 compatibility, rebuild
</span>4105ab9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4105ab9765ba0b9a733d86d65298edc69111b8ba
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri Dec 6 14:09:15 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> pdf2djvu: apply upstream patches for poppler 0.83.0 compatibility, rebuild
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Should be included in upcoming 0.9.15 release.
</span>---
graphics/pdf2djvu/Portfile | 5 ++-
.../pdf2djvu/files/patch-poppler-0.83-001.diff | 46 ++++++++++++++++++++++
.../pdf2djvu/files/patch-poppler-0.83-002.diff | 36 +++++++++++++++++
3 files changed, 86 insertions(+), 1 deletion(-)
<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 3672066..ee4ebd4 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,6 +5,7 @@ PortGroup github 1.0
</span> PortGroup cxx11 1.1
github.setup jwilk pdf2djvu 0.9.14
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics textproc
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,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-poppler-0.83-001.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-poppler-0.83-002.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-poppler-0.83-001.diff b/graphics/pdf2djvu/files/patch-poppler-0.83-001.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a148922
</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.83-001.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0aa17bb79dbcdfc249e4841f5b5398e27cfdfd41 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: Fri, 15 Nov 2019 11:47:47 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] =?UTF-8?q?pdf-backend:=20fix=20global=20params=20init=20f?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?or=20Poppler=20=E2=89=A5=200.83.?=
</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;'>+ pdf-backend.cc: In constructor ‘pdf::Environment::Environment()’:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf-backend.cc:106:35: error: no match for ‘operator=’ (operand types are ‘std::unique_ptr<GlobalParams>’ and ‘GlobalParams*’)
</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, 15 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 a94383e..085cd9e 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;'>+@@ -101,9 +101,23 @@ static void poppler_error_handler(void *data, ErrorCategory category, pdf::Offse
</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 T> T new_global_params();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// POPPLER_VERSION >= 8300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <> std::unique_ptr<GlobalParams> new_global_params<std::unique_ptr<GlobalParams>>()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return std::unique_ptr<GlobalParams>(new GlobalParams);
</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;'>++// POPPLER_VERSION < 8300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <> GlobalParams* new_global_params<GlobalParams*>()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return new GlobalParams;
</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::Environment::Environment()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- globalParams = new GlobalParams();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ globalParams = new_global_params<decltype(globalParams)>();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setErrorCallback(poppler_error_handler, nullptr);
</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;color:#808080;'>diff --git a/graphics/pdf2djvu/files/patch-poppler-0.83-002.diff b/graphics/pdf2djvu/files/patch-poppler-0.83-002.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..84763a5
</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.83-002.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 27b9e028091a2f370367e9eaf37b4bb1cde87b62 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, 25 Nov 2019 07:27:12 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] =?UTF-8?q?pdf-backend:=20fix=20const=20issues=20with=20Po?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?ppler=20=E2=89=A5=200.83.?=
</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;'>+ pdf-backend.cc: In static member function ‘static void pdf::Renderer::convert_path(pdf::gfx::State*, pdf::splash::Path&)’:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf-backend.cc:517:40: error: invalid conversion from ‘const GfxPath*’ to ‘pdf::gfx::Path*’ {aka ‘GfxPath*’} [-fpermissive]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdf-backend.cc | 5 ++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 3 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 085cd9e..8a95e95 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;'>+@@ -513,12 +513,11 @@ bool pdf::get_glyph(splash::Splash *splash, splash::Font *font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void pdf::Renderer::convert_path(pdf::gfx::State *state, splash::Path &splash_path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Source was copied from <poppler/SplashOutputDev.c>. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pdf::gfx::Subpath *subpath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pdf::gfx::Path *path = state->getPath();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto path = state->getPath();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int n_subpaths = path->getNumSubpaths();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < n_subpaths; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- subpath = path->getSubpath(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto subpath = path->getSubpath(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (subpath->getNumPoints() > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double x1, y1, x2, y2, x3, y3;
</span></pre><pre style='margin:0'>
</pre>