mapnik@2: delete (#16733)

2017-08-12 15:09:25 -07:00 · 2017-08-12 15:09:25 -07:00 · bc08219696
parent 2af7442734
commit bc08219696
2 changed files with 0 additions and 117 deletions
--- a/Aliases/mapnik@3
+++ b/Aliases/mapnik@3
@ -1 +0,0 @@
-../Formula/mapnik.rb
--- a/Formula/mapnik@2.rb
+++ b/Formula/mapnik@2.rb
@ -1,116 +0,0 @@
-class MapnikAT2 < Formula
-  desc "Toolkit for developing mapping applications"
-  homepage "http://www.mapnik.org/"
-  url "https://s3.amazonaws.com/mapnik/dist/v2.2.0/mapnik-v2.2.0.tar.bz2"
-  sha256 "9b30de4e58adc6d5aa8478779d0a47fdabe6bf8b166b67a383b35f5aa5d6c1b0"
-  revision 5
-
-  bottle do
-    sha256 "a134b1ce0863aa3acc1b704efbe4a6412ab2219c3d6dce4c860b8de3d979433a" => :sierra
-    sha256 "62de5437b3b5769baf4fbb6dca73362c1f2e272e6dbeb2459c97202d5e0219ba" => :el_capitan
-    sha256 "8ff3727156a798dbb88edc01d8f438c167873ba66afecd0d635a7f95a0410593" => :yosemite
-  end
-
-  keg_only :versioned_formula
-
-  # compile error in bindings/python/mapnik_text_placement.cpp
-  # https://github.com/mapnik/mapnik/issues/1973
-  patch :DATA
-
-  # boost 1.56 compatibility
-  # concatenated from https://github.com/mapnik/mapnik/issues/2428
-  patch do
-    url "https://gist.githubusercontent.com/tdsmith/22aeb0bfb9691de91463/raw/3064c193466a041d82e011dc5601312ccadc9e15/mapnik-boost-megadiff.diff"
-    sha256 "40e83052ae892aa0b134c09d8610ebd891619895bb5f3e5d937d0c48ed42d1a6"
-  end
-
-  # jpeg 9 compatibility
-  # Upstream commit from 5 Oct 2015 "jpeg: fix re-occuring boolean/TRUE/FALSE
-  # issue + prefer using c++ headers"
-  patch do
-    url "https://github.com/mapnik/mapnik/commit/860631acc5.patch?full_index=1"
-    sha256 "53756f0af88b146ed9d02fba3fa376e2389b037ba55af2ce3ab3b4820016c61b"
-  end
-
-  depends_on "pkg-config" => :build
-  depends_on "freetype"
-  depends_on "libpng"
-  depends_on "libtiff"
-  depends_on "proj"
-  depends_on "icu4c"
-  depends_on "jpeg"
-  depends_on "boost@1.59"
-  depends_on "boost-python@1.59"
-  depends_on "gdal" => :optional
-  depends_on "postgresql" => :optional
-  depends_on "cairo" => :optional
-  depends_on "py2cairo" if build.with? "cairo"
-
-  def install
-    icu = Formula["icu4c"].opt_prefix
-    boost = Formula["boost159"].opt_prefix
-    proj = Formula["proj"].opt_prefix
-    jpeg = Formula["jpeg"].opt_prefix
-    libpng = Formula["libpng"].opt_prefix
-    libtiff = Formula["libtiff"].opt_prefix
-    freetype = Formula["freetype"].opt_prefix
-
-    # mapnik compiles can take ~1.5 GB per job for some .cpp files
-    # so lets be cautious by limiting to CPUS/2
-    jobs = ENV.make_jobs.to_i
-    jobs /= 2 if jobs > 2
-
-    args = ["CC=\"#{ENV.cc}\"",
-            "CXX=\"#{ENV.cxx}\"",
-            "JOBS=#{jobs}",
-            "PREFIX=#{prefix}",
-            "ICU_INCLUDES=#{icu}/include",
-            "ICU_LIBS=#{icu}/lib",
-            "PYTHON_PREFIX=#{prefix}", # Install to Homebrew's site-packages
-            "JPEG_INCLUDES=#{jpeg}/include",
-            "JPEG_LIBS=#{jpeg}/lib",
-            "PNG_INCLUDES=#{libpng}/include",
-            "PNG_LIBS=#{libpng}/lib",
-            "TIFF_INCLUDES=#{libtiff}/include",
-            "TIFF_LIBS=#{libtiff}/lib",
-            "BOOST_INCLUDES=#{boost}/include",
-            "BOOST_LIBS=#{boost}/lib",
-            "PROJ_INCLUDES=#{proj}/include",
-            "PROJ_LIBS=#{proj}/lib",
-            "FREETYPE_CONFIG=#{freetype}/bin/freetype-config"]
-
-    if build.with? "cairo"
-      args << "CAIRO=True" # cairo paths will come from pkg-config
-    else
-      args << "CAIRO=False"
-    end
-    args << "GDAL_CONFIG=#{Formula["gdal"].opt_bin}/gdal-config" if build.with? "gdal"
-    args << "PG_CONFIG=#{Formula["postgresql"].opt_bin}/pg_config" if build.with? "postgresql"
-
-    system "python", "scons/scons.py", "configure", *args
-    system "python", "scons/scons.py", "install"
-  end
-
-  test do
-    system bin/"mapnik-config", "-v"
-  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.