[mapnik] 04/05: Refresh patches.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapnik.

commit 9c53c9f5f357959568cbe77ecc28b959808a956b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Nov 11 00:15:29 2015 +0100

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

diff --git a/debian/patches/2001_ftemplate-depth.patch b/debian/patches/2001_ftemplate-depth.patch
index 5c8c0d6..e45f8c9 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
-@@ -1764,7 +1764,7 @@ if not preconfigured:
+@@ -1785,7 +1785,7 @@ if not preconfigured:
  
          # Common flags for g++/clang++ CXX compiler.
          # 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 '
+         if env['DEBUG']:
+             env.Append(CXXFLAGS = common_cxx_flags + '-O0')

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