[mapnik] 08/34: 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 e257b9c64274ac6c5e84f73324e6b4c9bea3cc59
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Aug 21 07:13:16 2014 +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 037b0aa..71e3918 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: 2013-10-12
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1664,7 +1664,7 @@
-         if not env['SUNCC']:
+@@ -1733,7 +1733,7 @@
  
-             # Common flags for CXX compiler.
--            common_cxx_flags = '-ansi -Wall %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
-+            common_cxx_flags = '-ansi -Wall %s %s ' % (env['WARNING_CXXFLAGS'], pthread)
+         # 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)
  
-             # https://github.com/mapnik/mapnik/issues/1835
-             if sys.platform == 'darwin' and env['CXX'] == 'g++':
+         # https://github.com/mapnik/mapnik/issues/1835
+         if sys.platform == 'darwin' and env['CXX'] == 'g++':

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