[154263] trunk/dports/graphics/inkscape-devel
devans at macports.org
devans at macports.org
Tue Oct 25 19:47:55 CEST 2016
Revision: 154263
https://trac.macports.org/changeset/154263
Author: devans at macports.org
Date: 2016-10-25 19:47:54 +0200 (Tue, 25 Oct 2016)
Log Message:
-----------
inkscape-devel: switch from trunk to release branch inkscape-0.92.x and update to latest 0.92pre2 prerelease, patch to build using a specific perl rather than an indeterminate one, currently perl5.24, mutually sync with port inkscape.
Modified Paths:
--------------
trunk/dports/graphics/inkscape-devel/Portfile
Added Paths:
-----------
trunk/dports/graphics/inkscape-devel/files/
trunk/dports/graphics/inkscape-devel/files/patch-use-configured-perl.diff
Modified: trunk/dports/graphics/inkscape-devel/Portfile
===================================================================
--- trunk/dports/graphics/inkscape-devel/Portfile 2016-10-25 17:40:34 UTC (rev 154262)
+++ trunk/dports/graphics/inkscape-devel/Portfile 2016-10-25 17:47:54 UTC (rev 154263)
@@ -5,10 +5,9 @@
name inkscape-devel
conflicts inkscape
-set bzr_rev 15023
-version 0.91.99.${bzr_rev}
-revision 2
+set bzr_rev 15137
epoch 1
+version 0.92pre2-${bzr_rev}
license GPL-2 LGPL-2.1
maintainers devans
categories graphics gnome
@@ -15,8 +14,8 @@
platforms darwin
homepage http://www.inkscape.org/
-description This is the ongoing unstable development version of Inkscape taken from \
- recent bzr trunk.
+description This is the current pre-release development version of Inkscape taken from \
+ the upstream bzr release branch.
long_description Inkscape is an multi-platform, Open-Source Vector Graphics Editor \
that uses SVG as its native file format. \
@@ -23,15 +22,17 @@
${description}
fetch.type bzr
-bzr.url lp:inkscape
+bzr.url lp:~inkscape.dev/inkscape/0.92.x
bzr.revision ${bzr_rev}
+set perl_version 5.24
+
depends_build port:pkgconfig \
port:autoconf \
port:automake \
port:libtool \
port:intltool \
- path:bin/perl:perl5
+ port:perl${perl_version}
depends_lib port:desktop-file-utils \
port:popt \
@@ -57,13 +58,16 @@
ui_msg "---> Fetching source from bzr repository: this may take a while"
}
+patchfiles patch-use-configured-perl.diff
+
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
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
}
-# py27-numpy is currently not universal (#42416).
+# py27-numpy is currently not universal (#48263).
universal_variant no
@@ -111,6 +115,10 @@
configure.args-replace --disable-strict-build --enable-strict-build
}
+# don't build strict by default after upgrade of glib2 to 2.48.2
+# https://trac.macports.org/ticket/52248
+# default_variants +strict
+
#
# the following dummy variants are used
# to identify this port's binary dependencies
Added: trunk/dports/graphics/inkscape-devel/files/patch-use-configured-perl.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-use-configured-perl.diff (rev 0)
+++ trunk/dports/graphics/inkscape-devel/files/patch-use-configured-perl.diff 2016-10-25 17:47:54 UTC (rev 154263)
@@ -0,0 +1,45 @@
+--- Makefile.am.orig 2016-10-25 03:16:54.000000000 -0700
++++ Makefile.am 2016-10-25 03:21:48.000000000 -0700
+@@ -598,12 +598,12 @@
+ d=`sed -n 's,/,-,g;s,.*\$$[D]ate: \(..........\).*,\1,p' $<`; \
+ pod2man --utf8 $< \
+ | sed 's/^\.TH .*/.TH INKSCAPE 1 "'"$$d"'" "Inkscape-$(VERSION)" "Inkscape"/' \
+- | perl -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
+- | perl $(srcdir)/fix-roff-punct \
++ | @@MP_PERL@@ -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
++ | @@MP_PERL@@ $(srcdir)/fix-roff-punct \
+ > tmp.$$$$ \
+ && mv -f tmp.$$$$ $@
+ # ut8-to-roff removed (groff now supports utf8).
+-# | perl -CI $(srcdir)/utf8-to-roff \
++# | @@MP_PERL@@ -CI $(srcdir)/utf8-to-roff \
+ # man 7 groff_char for further remarks on charset encoding for man pages.
+
+ po/inkscape.pot:
+@@ -630,21 +630,21 @@
+ #.PHONY: warn_markup
+ noinst_DATA = warn_markup
+ warn_markup:
+- @if perl $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \
++ @if @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \
+ echo "WARNING: Bad markup found in translations. Please consider fixing the above problems." >&2; \
+ fi
+
+ .PHONY: check_markup
+ check_DATA = check_markup
+ check_markup:
+- perl $(srcdir)/po/check-markup $(srcdir)/po/*.po || [ $$? = 127 ]
++ @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po || [ $$? = 127 ]
+ # # `make check' probably shouldn't require perl to be installed, hence ignoring 127.
+
+ distcheck-hook:
+- perl $(srcdir)/po/check-markup $(srcdir)/po/*.po
++ @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po
+
+ test-check-markup:
+- if perl -e 42; then \
+- perl $(srcdir)/po/check-markup $(srcdir)/po/bad.po.test 2>&1 \
++ if @@MP_PERL@@ -e 42; then \
++ @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/bad.po.test 2>&1 \
+ | diff $(srcdir)/po/bad.po.test.exp -; \
+ fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161025/1146a00e/attachment-0002.html>
More information about the macports-changes
mailing list