[mapnik] 01/01: Refresh patch

[Jérémy Lal]

This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository mapnik.

commit 950fd10e01e8572ba94249538c671beb692f3bdd
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Jun 19 18:32:56 2015 +0200

    Refresh patch
---
 debian/patches/2001_ftemplate-depth.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/2001_ftemplate-depth.patch b/debian/patches/2001_ftemplate-depth.patch
index 71e3918..cc397b1 100644
--- a/debian/patches/2001_ftemplate-depth.patch
+++ b/debian/patches/2001_ftemplate-depth.patch
@@ -2,15 +2,15 @@ Description: remove gcc ftemplate-depth-300 flag
  it can use a lot of memory, and default value works on debian
 Forwarded: not-needed, https://github.com/mapnik/mapnik/commit/b01b21f24
 Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2013-10-12
+Last-Update: 2015-06-19
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1733,7 +1733,7 @@
+@@ -1772,7 +1772,7 @@
  
          # Common flags for g++/clang++ CXX compiler.
-         # TODO: clean up code more to make -Wsign-conversion -Wconversion -Wshadow viable
--        common_cxx_flags = '-Wall -Wsign-compare %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
-+        common_cxx_flags = '-Wall -Wsign-compare %s %s ' % (env['WARNING_CXXFLAGS'], pthread)
+         # TODO: clean up code more to make -Wextra -Wsign-compare -Wsign-conversion -Wconversion -Wshadow viable
+-        common_cxx_flags = '-Wall %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
++        common_cxx_flags = '-Wall %s %s' % (env['WARNING_CXXFLAGS'], pthread)
  
-         # https://github.com/mapnik/mapnik/issues/1835
-         if sys.platform == 'darwin' and env['CXX'] == 'g++':
+         if 'clang++' in env['CXX']:
+             common_cxx_flags += ' -Wno-unknown-pragmas -Wno-unsequenced '

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git