<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3834fccc3d1d802166c699142917d956148efa69">https://github.com/macports/macports-ports/commit/3834fccc3d1d802166c699142917d956148efa69</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3834fccc3d1d802166c699142917d956148efa69
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jun 30 19:18:58 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> scribus-devel: Fix build with llvm.org clang 16
</span>---
print/scribus-devel/Portfile | 3 ++-
print/scribus-devel/files/authors.patch | 4 ++--
print/scribus-devel/files/unary_function.patch | 27 ++++++++++++++++++++++++++
3 files changed, 31 insertions(+), 3 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 7e3baea2aac..cdc80519b8c 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;'>@@ -78,7 +78,8 @@ post-extract {
</span> }
patchfiles authors.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- poppler.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ poppler.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unary_function.patch
</span>
compiler.c_standard 2011
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/files/authors.patch b/print/scribus-devel/files/authors.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index dd27d3dbd6c..5ba890e1238 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus-devel/files/authors.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/files/authors.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix formatting in Authors tab in About box.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+r25521: #16966: About box: Some names formatted improperly in Authors tab
</span> https://bugs.scribus.net/view.php?id=16966
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- AUTHORS.orig (revision 25520)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- AUTHORS (revision 25520)
</span> +++ AUTHORS (working copy)
@@ -98,12 +98,12 @@
Official Documentation:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/files/unary_function.patch b/print/scribus-devel/files/unary_function.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..33bb7f09b73
</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/unary_function.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+r25523: #16967: error: no template named 'unary_function' in namespace 'std' when building in C++17 mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.scribus.net/view.php?id=16967
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scribus/desaxe/digester.cpp (revision 25522)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scribus/desaxe/digester.cpp (revision 25523)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -448,10 +448,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return nfa;
</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;'>+-struct CreateDFAState : public std::unary_function <std::set<nfa_state_t>, dfa_state_t> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct CreateDFAState
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CreateDFAState(const std::vector<rule_t>& rules, const std::vector<nfa_state_t>& accepting)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : n(0), rules_(rules), accepting_(accepting)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : rules_(rules), accepting_(accepting)
</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;'>+ dfa_state_t operator()(const std::set<nfa_state_t>& combination)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -465,7 +465,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</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;'>+- unsigned int n;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int n { 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const std::vector<rule_t>& rules_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const std::vector<nfa_state_t>& accepting_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span></pre><pre style='margin:0'>
</pre>