diff options
| author | Pete Deffendol | 2012-03-21 10:09:57 -0600 |
|---|---|---|
| committer | Misty De Meo | 2012-03-21 11:38:49 -0500 |
| commit | 2dac58746d370866113e682c4418dc7e35303543 (patch) | |
| tree | 1d2bd97f6aaf470b9f54f2f397bba284526d563d | |
| parent | e307054cf87c8272060a392fd13befe7b65e72d2 (diff) | |
| download | homebrew-2dac58746d370866113e682c4418dc7e35303543.tar.bz2 | |
Mapserver: update to 6.0.2 and fix clang build
Fixes #11066.
Closes #11118.
Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
| -rw-r--r-- | Library/Formula/mapserver.rb | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb index 140bc91b7..10017d9f0 100644 --- a/Library/Formula/mapserver.rb +++ b/Library/Formula/mapserver.rb @@ -1,9 +1,9 @@ require 'formula' class Mapserver < Formula - url 'http://download.osgeo.org/mapserver/mapserver-6.0.1.tar.gz' + url 'http://download.osgeo.org/mapserver/mapserver-6.0.2.tar.gz' homepage 'http://mapserver.org/' - md5 'b96287449dcbca9a2fcea3a64905915a' + md5 'd831c905b1b0df7ac09a80c3f9387374' depends_on 'gd' depends_on 'proj' @@ -43,6 +43,12 @@ class Mapserver < Formula args end + def patches + # Fix clang compilation issue, remove on future release + # See http://trac.osgeo.org/mapserver/changeset/12809 + DATA + end + def install ENV.x11 system "./configure", *configure_args @@ -67,3 +73,17 @@ class Mapserver < Formula EOS end end + +__END__ +diff --git a/renderers/agg/include/agg_renderer_outline_aa.h b/renderers/agg/include/agg_renderer_outline_aa.h +index 5ff3f20..7a14588 100644 +--- a/renderers/agg/include/agg_renderer_outline_aa.h ++++ b/renderers/agg/include/agg_renderer_outline_aa.h +@@ -1365,7 +1365,6 @@ namespace mapserver + //--------------------------------------------------------------------- + void profile(const line_profile_aa& prof) { m_profile = &prof; } + const line_profile_aa& profile() const { return *m_profile; } +- line_profile_aa& profile() { return *m_profile; } + + //--------------------------------------------------------------------- + int subpixel_width() const { return m_profile->subpixel_width(); } |