<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/542661ba214f200c67ac40814b3ead3199c94f46">https://github.com/macports/macports-ports/commit/542661ba214f200c67ac40814b3ead3199c94f46</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 542661b inkscape: fix build in High Sierra (maintainer timeout)
</span>542661b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 542661ba214f200c67ac40814b3ead3199c94f46
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Sat Oct 7 08:46:41 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> inkscape: fix build in High Sierra (maintainer timeout)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The current version of Inkscape fails with a build error due to an
</span><span style='display:block; white-space:pre;color:#404040;'> ambigious call to abs(). Indeed, i->pathNext->id.objID is of type
</span><span style='display:block; white-space:pre;color:#404040;'> unsigned int, for which abs() does not make much sense. Adding a cast
</span><span style='display:block; white-space:pre;color:#404040;'> to 'long' fixes it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The root cause of the bug is likely that the code isn't strictly valid
</span><span style='display:block; white-space:pre;color:#404040;'> C++, and so the version of Clang included with Xcode 9 rejects it,
</span><span style='display:block; white-space:pre;color:#404040;'> where earlier versions of Clang accepted it. Since this is a build
</span><span style='display:block; white-space:pre;color:#404040;'> fix, we don't bump the revision.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> PR submitted two weeks ago, but the maintainer didn't respond.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (Based on suggestion by Michael Lass)
</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/54886
</span>---
graphics/inkscape/Portfile | 3 ++-
graphics/inkscape/files/libavoid-abs-ambiguous.diff | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/Portfile b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c760d7f..68ecddd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,8 @@ depends_lib port:desktop-file-utils \
</span> port:py27-lxml \
port:py27-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-use-configured-perl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-use-configured-perl.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavoid-abs-ambiguous.diff
</span>
post-patch {
reinplace "s|@@MP_PERL@@|${prefix}/bin/perl${perl_version}|" ${worksrcpath}/Makefile.am
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/libavoid-abs-ambiguous.diff b/graphics/inkscape/files/libavoid-abs-ambiguous.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9475b11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/files/libavoid-abs-ambiguous.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libavoid/connector.cpp 2017-10-06 14:07:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libavoid/connector.cpp 2017-10-06 14:07:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -885,7 +885,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Check for consecutive points on opposite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // corners of two touching shapes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COLA_ASSERT(abs(i->pathNext->id.objID - i->id.objID) != 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COLA_ASSERT(abs((long)i->pathNext->id.objID - i->id.objID) != 2);
</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>