aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorDane Springmeyer2013-11-17 15:35:49 -0800
committerAdam Vandenberg2013-11-17 17:43:25 -0800
commitc6612238da69913f11044a5e21650e8619926e27 (patch)
treecd5ed401e4ddcb0e580935fdb308147d768960b3 /Library
parent782115082872e1592484f8442d7071f2ff7ea274 (diff)
downloadhomebrew-c6612238da69913f11044a5e21650e8619926e27.tar.bz2
mapnik: fix build against Boost 1.55 and libc++
Avoids these issue for Mavericks users until Mapnik provides new upstream version: - https://github.com/mapnik/mapnik/issues/2082 - https://github.com/mapnik/mapnik/issues/1973 Closes #24411. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/mapnik.rb24
1 files changed, 24 insertions, 0 deletions
diff --git a/Library/Formula/mapnik.rb b/Library/Formula/mapnik.rb
index d135a2eac..6e27820ff 100644
--- a/Library/Formula/mapnik.rb
+++ b/Library/Formula/mapnik.rb
@@ -5,6 +5,11 @@ class Mapnik < Formula
url 'http://mapnik.s3.amazonaws.com/dist/v2.2.0/mapnik-v2.2.0.tar.bz2'
sha1 'e493ad87ca83471374a3b080f760df4b25f7060d'
+ # can be removed at Mapnik > 2.2.0
+ # https://github.com/mapnik/mapnik/issues/1973
+ def patches
+ DATA
+ end
head 'https://github.com/mapnik/mapnik.git'
depends_on 'pkg-config' => :build
@@ -70,3 +75,22 @@ class Mapnik < Formula
python.standard_caveats if python
end
end
+
+__END__
+diff --git a/bindings/python/mapnik_text_placement.cpp b/bindings/python/mapnik_text_placement.cpp
+index 0520132..4897c28 100644
+--- a/bindings/python/mapnik_text_placement.cpp
++++ b/bindings/python/mapnik_text_placement.cpp
+@@ -194,7 +194,11 @@ struct ListNodeWrap: formatting::list_node, wrapper<formatting::list_node>
+ ListNodeWrap(object l) : formatting::list_node(), wrapper<formatting::list_node>()
+ {
+ stl_input_iterator<formatting::node_ptr> begin(l), end;
+- children_.insert(children_.end(), begin, end);
++ while (begin != end)
++ {
++ children_.push_back(*begin);
++ ++begin;
++ }
+ }
+
+ /* TODO: Add constructor taking variable number of arguments.