[mapnik] 06/07: Refresh patches.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Oct 10 15:10:28 UTC 2015


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

sebastic pushed a commit to branch master
in repository mapnik.

commit c65b5ed49f93709b927c73b201f5bca2cd79c169
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 10 12:58:12 2015 +0200

    Refresh patches.
---
 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 99f0520..be75f44 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
-@@ -1769,7 +1769,7 @@ if not preconfigured:
+@@ -1770,7 +1770,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)
+ 	# 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 '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



More information about the Pkg-grass-devel mailing list