<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a0f091e65dd76c7f301b8d9a44615c0d26c6fda7">https://github.com/macports/macports-ports/commit/a0f091e65dd76c7f301b8d9a44615c0d26c6fda7</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 a0f091e scribus-devel: Update poppler patch and revbump
</span>a0f091e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a0f091e65dd76c7f301b8d9a44615c0d26c6fda7
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Fri Sep 28 12:01:48 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> scribus-devel: Update poppler patch and revbump
</span>---
print/scribus-devel/Portfile | 2 +-
print/scribus-devel/files/poppler.patch | 70 +++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 1 deletion(-)
<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 d4868c9..8d06b8c 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;'>@@ -7,7 +7,7 @@ PortGroup qt5 1.0
</span>
name scribus-devel
version 1.5.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories print
license LGPL-2+ BSD MIT
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/files/poppler.patch b/print/scribus-devel/files/poppler.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e1ebd1c..5e48207 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus-devel/files/poppler.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/files/poppler.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1026,3 +1026,73 @@ index 7317cae210..b8497d94de 100644
</span> +};
+
+#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a5ce57fdfc..e3690cca8b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scribus/plugins/import/pdf/importpdf.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scribus/plugins/import/pdf/importpdf.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -548,10 +548,21 @@ bool PdfPlug::convert(const QString& fn)
</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;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GooList *ocgs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ocgs = ocg->getOCGs ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i = 0; i < ocgs->getLength (); ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 69, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const auto& ocgs = ocg->getOCGs ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (const auto& ocg : ocgs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OptionalContentGroup *oc = ocg.second.get();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString ocgName = UnicodeParsedString(oc->getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!ocgNames.contains(ocgName))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ocgGroups.prepend(oc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ocgNames.append(ocgName);
</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;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GooList *ocgs = ocg->getOCGs ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int i = 0; i < ocgs->getLength (); ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OptionalContentGroup *oc = (OptionalContentGroup *)ocgs->get(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString ocgName = UnicodeParsedString(oc->getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -561,15 +572,27 @@ bool PdfPlug::convert(const QString& fn)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocgNames.append(ocgName);
</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;'>+ }
</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;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GooList *ocgs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ocgs = ocg->getOCGs ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i = 0; i < ocgs->getLength (); ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 69, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const auto& ocgs = ocg->getOCGs ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (const auto& ocg : ocgs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OptionalContentGroup *oc = ocg.second.get();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString ocgName = UnicodeParsedString(oc->getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!ocgNames.contains(ocgName))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ocgGroups.prepend(oc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ocgNames.append(ocgName);
</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;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GooList *ocgs = ocg->getOCGs ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int i = 0; i < ocgs->getLength (); ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OptionalContentGroup *oc = (OptionalContentGroup *)ocgs->get(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString ocgName = UnicodeParsedString(oc->getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -579,6 +602,7 @@ bool PdfPlug::convert(const QString& fn)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocgNames.append(ocgName);
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>