Revision: 118461 https://trac.macports.org/changeset/118461 Author: devans@macports.org Date: 2014-04-02 14:01:55 -0700 (Wed, 02 Apr 2014) Log Message: ----------- devans/dports: inkscape-devel, update to bzr 13250 for testing, revert bzr 13232 which breaks build. Modified Paths: -------------- users/devans/dports/graphics/inkscape-devel/Portfile Added Paths: ----------- users/devans/dports/graphics/inkscape-devel/files/patch-revert-r13232.diff Removed Paths: ------------- users/devans/dports/graphics/inkscape-devel/files/patch-src-extension-internal-grid.cpp.diff Modified: users/devans/dports/graphics/inkscape-devel/Portfile =================================================================== --- users/devans/dports/graphics/inkscape-devel/Portfile 2014-04-02 21:01:24 UTC (rev 118460) +++ users/devans/dports/graphics/inkscape-devel/Portfile 2014-04-02 21:01:55 UTC (rev 118461) @@ -5,7 +5,7 @@ name inkscape-devel conflicts inkscape -set bzr_rev 13163 +set bzr_rev 13250 version 0.48.99.${bzr_rev} epoch 1 license GPL-2 LGPL-2.1 @@ -25,8 +25,8 @@ homepage http://www.inkscape.org/ master_sites file:///Users/devans/macports/distfiles/${name} -checksums rmd160 37df0c4dcd5275aaa24f8f0113107f496a311f9b \ - sha256 618709808cfde0b262cb92b37c6262abed1fe2804a51978b612610d9f24e3abb +checksums rmd160 4a27c2d97a7629254326dbcf085967af49043fcb \ + sha256 35067afc0bcae97c46c288c4fc155f273f9ea1af6be9b0c5b9f95a6233ad3a35 worksrcdir inkscape @@ -53,8 +53,10 @@ port:libwpg \ port:gtkspell2 -configure.cflags-append -Wno-unused-function +patchfiles patch-revert-r13232.diff +configure.cflags-append -Wno-error=unused-function + variant python26 conflicts python27 description {Configure to use Python version 2.6} { depends_lib-append \ port:py26-lxml \ Added: users/devans/dports/graphics/inkscape-devel/files/patch-revert-r13232.diff =================================================================== --- users/devans/dports/graphics/inkscape-devel/files/patch-revert-r13232.diff (rev 0) +++ users/devans/dports/graphics/inkscape-devel/files/patch-revert-r13232.diff 2014-04-02 21:01:55 UTC (rev 118461) @@ -0,0 +1,22 @@ +--- src/ui/tool/node.h.orig 2014-04-02 13:37:52.000000000 -0700 ++++ src/ui/tool/node.h 2014-04-02 13:39:01.000000000 -0700 +@@ -12,10 +12,6 @@ + #ifndef SEEN_UI_TOOL_NODE_H + #define SEEN_UI_TOOL_NODE_H + +-#if HAVE_CONFIG_H +- #include "config.h" +-#endif +- + #include <iterator> + #include <iosfwd> + #include <stdexcept> +@@ -41,7 +37,7 @@ + } + } + +-#if HAVE_TR1_UNORDERED_SET ++#if __cplusplus < 201103L + namespace std { + namespace tr1 { + template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >; Deleted: users/devans/dports/graphics/inkscape-devel/files/patch-src-extension-internal-grid.cpp.diff =================================================================== --- users/devans/dports/graphics/inkscape-devel/files/patch-src-extension-internal-grid.cpp.diff 2014-04-02 21:01:24 UTC (rev 118460) +++ users/devans/dports/graphics/inkscape-devel/files/patch-src-extension-internal-grid.cpp.diff 2014-04-02 21:01:55 UTC (rev 118461) @@ -1,19 +0,0 @@ ---- src/extension/internal/grid.cpp.orig 2014-03-11 00:39:37.000000000 -0700 -+++ src/extension/internal/grid.cpp 2014-03-11 00:43:17.000000000 -0700 -@@ -115,11 +115,11 @@ - - gdouble scale = Inkscape::Util::Quantity::convert(1, "px", (document->doc())->getDefaultUnit()); - bounding_area *= Geom::Scale(scale); -- float spacings[2] = { scale*module->get_param_float("xspacing"), -- scale*module->get_param_float("yspacing") }; -- float line_width = scale*module->get_param_float("lineWidth"); -- float offsets[2] = { scale*module->get_param_float("xoffset"), -- scale*module->get_param_float("yoffset") }; -+ float spacings[2] = { static_cast<float>(scale*module->get_param_float("xspacing")), -+ static_cast<float>(scale*module->get_param_float("yspacing"))}; -+ float line_width = static_cast<float>(scale*module->get_param_float("lineWidth")); -+ float offsets[2] = { static_cast<float>(scale*module->get_param_float("xoffset")), -+ static_cast<float>(scale*module->get_param_float("yoffset")) }; - - Glib::ustring path_data(""); -