<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/c752b190d9f4ade343236c37acc5ef85e3f69e27">https://github.com/macports/macports-ports/commit/c752b190d9f4ade343236c37acc5ef85e3f69e27</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 c752b19 poppler: Fix upstream issue #893
</span>c752b19 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c752b190d9f4ade343236c37acc5ef85e3f69e27
</span>Author: Torsten Maehne <Torsten.Maehne@gmx.de>
AuthorDate: Sun Mar 15 13:29:37 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> poppler: Fix upstream issue #893
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This commit adds a patch to the poppler port for
</span><span style='display:block; white-space:pre;color:#404040;'> [upstream issue 893](https://gitlab.freedesktop.org/poppler/poppler/issues/893)
</span><span style='display:block; white-space:pre;color:#404040;'> It is based on upstream commit 68b6dd2e by Adam Reichold. With this
</span><span style='display:block; white-space:pre;color:#404040;'> fix, pdfpc works also with poppler 0.86.1.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/60180
</span>---
graphics/poppler/Portfile | 7 ++-
.../poppler/files/patch-upstream-issue-893.diff | 64 ++++++++++++++++++++++
2 files changed, 70 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/Portfile b/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e820db..5563e94 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,6 +10,7 @@ PortGroup legacysupport 1.0
</span> name poppler
conflicts xpdf-tools
version 0.86.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license GPL-2+
maintainers {devans @dbevans} openmaintainer
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +66,11 @@ patchfiles-append patch-bug106417.diff
</span>
# https://trac.macports.org/ticket/57167
patchfiles-append patch-trac-57167.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.freedesktop.org/poppler/poppler/issues/893
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch based on upstream commit 68b6dd2e by Adam Reichold
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-upstream-issue-893.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
-DENABLE_QT5=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-upstream-issue-893.diff b/graphics/poppler/files/patch-upstream-issue-893.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..af91e12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler/files/patch-upstream-issue-893.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/poppler-action.cc.orig glib/poppler-action.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/poppler-action.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/poppler-action.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -627,39 +627,39 @@ _poppler_action_new (PopplerDocument *document,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (link->getKind ()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionGoTo:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action->type = POPPLER_ACTION_GOTO_DEST;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_goto_dest (document, action, dynamic_cast <const LinkGoTo *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_goto_dest (document, action, static_cast <const LinkGoTo *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionGoToR:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action->type = POPPLER_ACTION_GOTO_REMOTE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_goto_remote (action, dynamic_cast <const LinkGoToR *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_goto_remote (action, static_cast <const LinkGoToR *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionLaunch:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action->type = POPPLER_ACTION_LAUNCH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_launch (action, dynamic_cast <const LinkLaunch *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_launch (action, static_cast <const LinkLaunch *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionURI:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action->type = POPPLER_ACTION_URI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_uri (action, dynamic_cast <const LinkURI *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_uri (action, static_cast <const LinkURI *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionNamed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action->type = POPPLER_ACTION_NAMED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_named (action, dynamic_cast <const LinkNamed *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_named (action, static_cast <const LinkNamed *> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionMovie:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action->type = POPPLER_ACTION_MOVIE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_movie (document, action, dynamic_cast<const LinkMovie*> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_movie (document, action, static_cast<const LinkMovie*> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionRendition:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action->type = POPPLER_ACTION_RENDITION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_rendition (action, dynamic_cast<const LinkRendition*> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_rendition (action, static_cast<const LinkRendition*> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionOCGState:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action->type = POPPLER_ACTION_OCG_STATE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_ocg_state (document, action, dynamic_cast<const LinkOCGState*> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_ocg_state (document, action, static_cast<const LinkOCGState*> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionJavaScript:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action->type = POPPLER_ACTION_JAVASCRIPT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- build_javascript (action, dynamic_cast<const LinkJavaScript*> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ build_javascript (action, static_cast<const LinkJavaScript*> (link));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case actionUnknown:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/utils/HtmlOutputDev.cc.orig b/utils/HtmlOutputDev.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- utils/HtmlOutputDev.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ utils/HtmlOutputDev.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1839,7 +1839,7 @@ int HtmlOutputDev::getOutlinePageNum(OutlineItem *item)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!action || action->getKind() != actionGoTo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return pagenum;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link = dynamic_cast<const LinkGoTo*>(action);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link = static_cast<const LinkGoTo*>(action);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!link || !link->isOk())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return pagenum;
</span></pre><pre style='margin:0'>
</pre>