[mapnik] 06/07: Refresh patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Oct 14 07:50:27 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 451b9b1c8e675fa5aab12d42c2ab77c1c909a836
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Oct 14 09:10:53 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 be75f44..5c8c0d6 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
-@@ -1770,7 +1770,7 @@ if not preconfigured:
+@@ -1764,7 +1764,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