<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/269936a15a19113e25c2f65f183466bb17d5398b">https://github.com/macports/macports-ports/commit/269936a15a19113e25c2f65f183466bb17d5398b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 269936a15a19113e25c2f65f183466bb17d5398b
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri Jan 18 10:35:57 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> inkscape-devel: update to version 0.92.4 maint branch as of 20190116
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * now uses preferred cmake/ninja build
</span><span style='display:block; white-space:pre;color:#404040;'> * switch to cmake fixes display of version in Help/About
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/56806
</span>---
graphics/inkscape-devel/Portfile | 78 ++++++++--------------
.../inkscape-devel/files/patch-openmp_test.diff | 17 -----
.../files/patch-use-configured-perl.diff | 45 -------------
3 files changed, 28 insertions(+), 112 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 3d11517..179b5f7 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;'>@@ -3,14 +3,16 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.generator Ninja
</span>
name inkscape-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts inkscape
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts inkscape inkscape-gtk3-devel
</span> epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit 31483c312000d1fe2778d38a502233b948b0cbb1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20181223
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.92.3-${git_date}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit 33fec40d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20190116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.92.4-${git_date}
</span> license GPL-2 LGPL-2.1
maintainers {devans @dbevans}
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,21 +28,22 @@ long_description Inkscape is an multi-platform, Open-Source Vector Graphics E
</span> homepage http://www.inkscape.org/
fetch.type git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-git.url -b 0.92.x --depth 100 git://git.launchpad.net/inkscape
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git.url -b 0.92.x --depth 100 https://gitlab.com/inkscape/inkscape.git
</span> git.branch ${git_commit}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set perl_version 5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_major 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_minor 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version ${python_major}${python_minor}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:libtool \
port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl${perl_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtest
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:desktop-file-utils \
</span> port:popt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libgc.dylib:boehmgc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boehmgc \
</span> port:gdk-pixbuf2 \
port:gsl \
port:gtkmm \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,54 +59,29 @@ depends_lib port:desktop-file-utils \
</span> port:aspell \
port:gtkspell2 \
port:potrace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-lxml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-use-configured-perl.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/57744
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-openmp_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-lxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-numpy
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MP_PERL@@|${prefix}/bin/perl${perl_version}|" ${worksrcpath}/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.7\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python${python_major}.${python_minor}\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
</span> reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|lib/inkscape|lib|" ${worksrcpath}/src/CMakeLists.txt
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# py27-numpy is currently not universal (#48263).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# py-numpy is currently not universal (#48263).
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# on Sierra, building with clang optimization enabled causes crash at startup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# issue affects both +x11 and +quartz builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.optflags -O0
</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> # clang-425.0.28 cannot handle glibmm's headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 500} gcc-4.0 *gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# allow build with more modern gcc on 10.5 and earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 500} *gcc-3.* *gcc-4.*
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh && ./configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --without-gnome-vfs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-lcms \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-poppler-cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-dbusapi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-openmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-strict-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${worksrcpath}/src/extension/script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant strict description {Enable strict build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-strict-build --enable-strict-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_DBUS:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GNOME_VFS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_OPENMP=OFF
</span>
#
# the following dummy variants are used
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 25f2e0e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape-devel/files/patch-openmp_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2018-03-11 13:38:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2018-12-07 14:19:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,12 +201,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Check for OpenMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ******************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_OPENMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_prog_cxx_openmp" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openmp_ok=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl We have it, now set up the flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ********************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Check for libpotrace
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape-devel/files/patch-use-configured-perl.diff b/graphics/inkscape-devel/files/patch-use-configured-perl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e3e4541..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape-devel/files/patch-use-configured-perl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am.orig 2016-10-25 03:16:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am 2016-10-25 03:21:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -598,12 +598,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d=`sed -n 's,/,-,g;s,.*\$$[D]ate: \(..........\).*,\1,p' $<`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pod2man --utf8 $< \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | sed 's/^\.TH .*/.TH INKSCAPE 1 "'"$$d"'" "Inkscape-$(VERSION)" "Inkscape"/' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | perl -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | perl $(srcdir)/fix-roff-punct \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | @@MP_PERL@@ -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | @@MP_PERL@@ $(srcdir)/fix-roff-punct \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- > tmp.$$$$ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && mv -f tmp.$$$$ $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ut8-to-roff removed (groff now supports utf8).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# | perl -CI $(srcdir)/utf8-to-roff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# | @@MP_PERL@@ -CI $(srcdir)/utf8-to-roff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # man 7 groff_char for further remarks on charset encoding for man pages.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po/inkscape.pot:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -630,21 +630,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #.PHONY: warn_markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- noinst_DATA = warn_markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- warn_markup:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @if perl $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @if @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "WARNING: Bad markup found in translations. Please consider fixing the above problems." >&2; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: check_markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_DATA = check_markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_markup:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perl $(srcdir)/po/check-markup $(srcdir)/po/*.po || [ $$? = 127 ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po || [ $$? = 127 ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # # `make check' probably shouldn't require perl to be installed, hence ignoring 127.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distcheck-hook:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perl $(srcdir)/po/check-markup $(srcdir)/po/*.po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test-check-markup:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if perl -e 42; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perl $(srcdir)/po/check-markup $(srcdir)/po/bad.po.test 2>&1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if @@MP_PERL@@ -e 42; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/bad.po.test 2>&1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | diff $(srcdir)/po/bad.po.test.exp -; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span></pre><pre style='margin:0'>
</pre>