[mapnik] 06/06: 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 1e1e2bc30ccdfb882d3bd1924e3d07b5a8d736e7
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Jul 8 22:40:51 2015 +0200

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

diff --git a/debian/patches/2001_ftemplate-depth.patch b/debian/patches/2001_ftemplate-depth.patch
index f42e19b..e51d7a0 100644
--- a/debian/patches/2001_ftemplate-depth.patch
+++ b/debian/patches/2001_ftemplate-depth.patch
@@ -5,12 +5,12 @@ Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2015-06-19
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1772,7 +1772,7 @@
+@@ -1771,7 +1771,7 @@
  
          # Common flags for g++/clang++ CXX compiler.
-         # 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)
+         # TODO: clean up code more to make -Wextra -Wsign-compare -Wsign-conversion -Wconversion viable
+-        common_cxx_flags = '-Wall %s %s -ftemplate-depth-300 -Wsign-compare -Wshadow ' % (env['WARNING_CXXFLAGS'], pthread)
++        common_cxx_flags = '-Wall %s %s -Wsign-compare -Wshadow ' % (env['WARNING_CXXFLAGS'], pthread)
  
          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