<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/1a9b26947a6dba2fae293e4e415550ca8cf11610">https://github.com/macports/macports-ports/commit/1a9b26947a6dba2fae293e4e415550ca8cf11610</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 1a9b269 inkscape-devel: merge recent build fixes from inkscape
</span>1a9b269 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1a9b26947a6dba2fae293e4e415550ca8cf11610
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Dec 10 15:31:32 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> inkscape-devel: merge recent build fixes from inkscape
</span>---
graphics/inkscape-devel/Portfile | 21 +++++++--------------
.../inkscape-devel/files/patch-openmp_test.diff | 17 +++++++++++++++++
2 files changed, 24 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape-devel/Portfile b/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4afd6f6..71631bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,12 +56,11 @@ depends_lib port:desktop-file-utils \
</span> port:py27-lxml \
port:py27-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "---> Fetching source from bzr repository: this may take a while"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-use-configured-perl.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/57744
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-openmp_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@@MP_PERL@@|${prefix}/bin/perl${perl_version}|" ${worksrcpath}/Makefile.am
reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.7\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +80,9 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# clang-425.0.28 cannot handle glibmm's headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 500} gcc-4.0 *gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cmd ./autogen.sh && ./configure
configure.python ${prefix}/bin/python2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,22 +91,13 @@ configure.args --without-gnome-vfs \
</span> --enable-lcms \
--enable-poppler-cairo \
--enable-dbusapi \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-openmp \
</span> --disable-silent-rules \
--disable-strict-build
configure.cppflags-append \
-I${worksrcpath}/src/extension/script
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match "*clang*" ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -std=c++98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant strict description {Enable strict build} {
configure.args-replace --disable-strict-build --enable-strict-build
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape-devel/files/patch-openmp_test.diff b/graphics/inkscape-devel/files/patch-openmp_test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..25f2e0e
</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-devel/files/patch-openmp_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-03-11 13:38:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-12-07 14:19:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,12 +201,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check for OpenMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ******************************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_OPENMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x$ac_cv_prog_cxx_openmp" != "x"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmp_ok=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl We have it, now set up the flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl ********************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check for libpotrace
</span></pre><pre style='margin:0'>
</pre>