[qlandkartegt] 02/02: Add patch to use -fsigned-char instead of DEB_CXXFLAGS_MAINT_APPEND.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository qlandkartegt.

commit 81d5e1bed0c5d3c223e3854715f74e5d3476c3ef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 4 22:07:32 2016 +0200

    Add patch to use -fsigned-char instead of DEB_CXXFLAGS_MAINT_APPEND.
---
 debian/patches/series            |  1 +
 debian/patches/signed-char.patch | 21 +++++++++++++++++++++
 debian/rules                     |  2 --
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index d7afc32..18c7504 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ qt5-r4008.patch
 qt5-r4009.patch
 hicolor-icons.patch
 position-typo.patch
+signed-char.patch
diff --git a/debian/patches/signed-char.patch b/debian/patches/signed-char.patch
new file mode 100644
index 0000000..729b663
--- /dev/null
+++ b/debian/patches/signed-char.patch
@@ -0,0 +1,21 @@
+Description: Fix FTBFS with on architectures using unsigned char by default.
+ Original patch by Christoph Biedl.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/836685
+Forwarded: https://bitbucket.org/kiozen/qlandkarte-gt/pull-requests/3
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,6 +50,12 @@ if(MSVC)
+   set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
+ endif(MSVC)
+ 
++# Use signed chars for all architectures.
++# Some architectures like arm64, powerpc & s390x use unsigned chars by default.
++# This causes the build of 3rdparty/map2rmp/CFileGenerator.cpp to fail with GCC 6.2:
++# <path>/CFileGenerator.cpp:83:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
++
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+ set(CMAKE_MODULE_PATH
+   ${CMAKE_SOURCE_DIR}/cmake/Modules
diff --git a/debian/rules b/debian/rules
index d0570f8..95c923b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,6 @@ BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date
 
 MANPAGES := $(wildcard debian/man/*.*.xml)
 
-export DEB_CXXFLAGS_MAINT_APPEND=-fsigned-char
-
 # one ring to rule them all ...
 %:
 	dh $@ --parallel

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