[132139] users/devans/dports/graphics/inkscape-prerelease
devans at macports.org
devans at macports.org
Fri Jan 23 16:30:02 PST 2015
Revision: 132139
https://trac.macports.org/changeset/132139
Author: devans at macports.org
Date: 2015-01-23 16:30:02 -0800 (Fri, 23 Jan 2015)
Log Message:
-----------
devans/dports: inkscape-prerelease, merge configuration changes from inkscape-0.91.x, update to version 0.91pre4, last prerelease tarball.
Modified Paths:
--------------
users/devans/dports/graphics/inkscape-prerelease/Portfile
Removed Paths:
-------------
users/devans/dports/graphics/inkscape-prerelease/files/clang-cxx11-boost-1-56_3.diff
Modified: users/devans/dports/graphics/inkscape-prerelease/Portfile
===================================================================
--- users/devans/dports/graphics/inkscape-prerelease/Portfile 2015-01-23 23:31:18 UTC (rev 132138)
+++ users/devans/dports/graphics/inkscape-prerelease/Portfile 2015-01-24 00:30:02 UTC (rev 132139)
@@ -6,7 +6,7 @@
name inkscape-prerelease
set dname inkscape
conflicts inkscape inkscape-devel inkscape-branched
-version 0.91pre2
+version 0.91pre4
epoch 1
license GPL-2 LGPL-2.1
maintainers devans
@@ -27,8 +27,8 @@
distname ${dname}-${version}
-checksums rmd160 49fbb632cea3a38dfd5164b93cc9a29c29bc5523 \
- sha256 79f4facb4140fce09a55daa464399116cae10a4f92c95e8b427875fe56da798b
+checksums rmd160 b5784b3b2fcf1e2de4c643c9a0e743ff852b31d2 \
+ sha256 6e05e4092367ff9e3b22c37fbcf6c3135e0bc800ef8b2a50245d4817c58ab836
depends_build port:pkgconfig \
port:autoconf \
@@ -43,52 +43,25 @@
port:gsl \
port:gtkmm \
port:dbus-glib \
- port:lcms \
+ port:lcms2 \
port:poppler \
port:boost \
port:ImageMagick \
- port:libcdr \
+ port:libcdr-0.1 \
port:libexif \
- port:libvisio \
- port:libwpg \
- port:gtkspell2
+ port:libvisio-0.1 \
+ port:libwpg-0.3 \
+ port:gtkspell2 \
+ port:py27-lxml \
+ port:py27-numpy
-patchfiles clang-cxx11-boost-1-56_3.diff
-
post-patch {
xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+ 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
}
-variant python26 conflicts python27 description {Configure to use Python version 2.6} {
- depends_lib-append \
- port:py26-lxml \
- port:py26-numpy
-
- post-patch {
- reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.6\"|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
- }
-
- configure.python \
- ${prefix}/bin/python2.6
-}
-
-variant python27 conflicts python26 description {Configure to use Python version 2.7} {
- depends_lib-append \
- port:py27-lxml \
- port:py27-numpy
-
- post-patch {
- 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
- }
-
- configure.python \
- ${prefix}/bin/python2.7
-}
-
variant gtk3 description {Enable experimental GTK+ 3 build} {
depends_lib-delete port:gtkspell2 \
port:gtk2 \
@@ -103,11 +76,14 @@
variant svg2 description {Enable experimental SVG level 2 proposed features} {
configure.cppflags-append \
- "-DWITH_MESH -DWITH_CSSBLEND -DWITH_CSSCOMPOSITE"
+ "-DWITH_MESH -DWITH_CSSBLEND -DWITH_CSSCOMPOSITE -DWITH_SVG2"
}
configure.cmd ./autogen.sh && ./configure
+configure.python \
+ ${prefix}/bin/python2.7
+
configure.args --without-gnome-vfs \
--enable-lcms \
--enable-poppler-cairo \
@@ -122,10 +98,12 @@
configure.cxxflags-append -std=c++11
}
-if {![variant_isset python26] && ![variant_isset python27]} {
- default_variants +python27
+variant strict description {Enable strict build} {
+ configure.args-replace --disable-strict-build --enable-strict-build
}
+default_variants +strict
+
#
# the following dummy variants are used
# to identify this port's binary dependencies
Deleted: users/devans/dports/graphics/inkscape-prerelease/files/clang-cxx11-boost-1-56_3.diff
===================================================================
--- users/devans/dports/graphics/inkscape-prerelease/files/clang-cxx11-boost-1-56_3.diff 2015-01-23 23:31:18 UTC (rev 132138)
+++ users/devans/dports/graphics/inkscape-prerelease/files/clang-cxx11-boost-1-56_3.diff 2015-01-24 00:30:02 UTC (rev 132139)
@@ -1,13 +0,0 @@
-=== modified file 'src/object-snapper.cpp'
---- src/object-snapper.cpp 2014-07-30 20:47:29 +0000
-+++ src/object-snapper.cpp 2014-08-15 16:19:01 +0000
-@@ -677,7 +677,7 @@
- (*p_inters) = dt->doc2dt(*p_inters);
- // Construct a snapped point
- Geom::Coord dist = Geom::L2(p.getPoint() - *p_inters);
-- SnappedPoint s = SnappedPoint(*p_inters, p.getSourceType(), p.getSourceNum(), k->target_type, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, k->target_bbox);;
-+ SnappedPoint s = SnappedPoint(*p_inters, p.getSourceType(), p.getSourceNum(), k->target_type, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, false, k->target_bbox);
- // Store the snapped point
- if (dist <= tolerance) { // If the intersection is within snapping range, then we might snap to it
- isr.points.push_back(s);
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150123/4a1f07b9/attachment-0001.html>
More information about the macports-changes
mailing list