<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/760bc1c19bede0ce9566247737820ab5a3731c53">https://github.com/macports/macports-ports/commit/760bc1c19bede0ce9566247737820ab5a3731c53</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 760bc1c scribus-devel: update to unstable version 1.5.5.svn as of 20190429
</span>760bc1c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 760bc1c19bede0ce9566247737820ab5a3731c53
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu May 2 22:34:47 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> scribus-devel: update to unstable version 1.5.5.svn as of 20190429
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Patch to fix build with poppler 0.76.0.
</span>---
print/scribus-devel/Portfile | 12 +++--
print/scribus-devel/files/patch-poppler-0.76.diff | 62 +++++++++++++++++++++++
2 files changed, 69 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/Portfile b/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cbd32f..7e87bf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@ PortGroup qt5 1.0
</span> qt5.depends_component qttools qttranslations
qt5.min_version 5.7.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit 5f77de1ad0af23e41d5014e711d9e2b957b1c534
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20190404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit 436c197d20bc2c4ce22b6508fb038a9e00060433
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20190429
</span> github.setup scribusproject scribus ${git_commit}
name scribus-devel
version 1.5.5.svn-${git_date}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,9 @@ long_description Scribus is an open source desktop publishing program. It \
</span>
homepage http://www.scribus.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 23ca20552455334b23e0a749ba4b6e360048c444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 faea6fe4f2f59fb1429bf103a32d95610d931598c0a70f8f9660109c821d0039 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 85751476
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 98daac453537207c488e56f58df12b199d653135 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cd8e246189fcb73c1c6fdd54b148f0ff77f30eae7871b0c86687b70e37751a1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 85829560
</span>
# Builds forever with llvm-gcc-4.2. https://trac.macports.org/ticket/30835
compiler.blacklist-append llvm-gcc-4.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +68,8 @@ depends_lib-append \
</span> port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-poppler-0.76.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set PyFRM ${frameworks_dir}/Python.framework/Versions
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/files/patch-poppler-0.76.diff b/print/scribus-devel/files/patch-poppler-0.76.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..41f1a9c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/files/patch-poppler-0.76.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2019-05-01 16:27:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scribus/plugins/import/pdf/slaoutput.cpp 2019-05-01 16:44:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -429,8 +429,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dst->isPageRef())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Ref dstr = dst->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 76, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pagNum = pdfDoc->findPage(dst->getPageRef());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Ref dstr = dst->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pagNum = pdfDoc->findPage(dstr.num, dstr.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;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pagNum = dst->getPageNum();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -451,8 +455,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dstn->isPageRef())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Ref dstr = dstn->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 76, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pagNum = pdfDoc->findPage(dstn->getPageRef());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Ref dstr = dstn->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pagNum = pdfDoc->findPage(dstr.num, dstr.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;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pagNum = dstn->getPageNum();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -931,8 +939,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dst->isPageRef())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Ref dstr = dst->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 76, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pagNum = pdfDoc->findPage(dst->getPageRef());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Ref dstr = dst->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pagNum = pdfDoc->findPage(dstr.num, dstr.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;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pagNum = dst->getPageNum();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -955,8 +967,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dstn->isPageRef())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Ref dstr = dstn->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 76, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pagNum = pdfDoc->findPage(dstn->getPageRef());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Ref dstr = dstn->getPageRef();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pagNum = pdfDoc->findPage(dstr.num, dstr.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;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pagNum = dstn->getPageNum();
</span></pre><pre style='margin:0'>
</pre>