[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-1-6-gdcf81c8

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=a2a4aa9

The following commit has been merged in the master branch:
commit a2a4aa972a230aac9311f9f4f263afc9c7c6dea0
Author: Pino Toscano <pino at debian.org>
Date:   Sat Sep 17 08:16:33 2016 +0200

    fix build on platforms where char is unsigned
    
    backport upstream commit 956bb80db4f300e4f8edeaf19d24fd61eb1932b2
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  1 +
 ...tion-of-PsCommentLexer.cpp-on-platforms-w.patch | 29 ++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d2c3aa6..47a8bbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ calligra (1:2.9.11+dfsg-2) UNRELEASED; urgency=medium
   * Remove unused calligra-map-shape.install.
   * Backport upstream commit 04d61e92515f19cbd2dbb0cc06d4340ba4514a8a to fix
     build on armel/armhf; patch upstream_fix-arm-FTBFS.patch.
+  * Backport upstream commit 956bb80db4f300e4f8edeaf19d24fd61eb1932b2 to fix
+    build on platforms where char is unsigned; patch
+    upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Sep 2016 07:48:13 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index f7513c0..33d7b48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 upstream_fix-arm-FTBFS.patch
+upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch
 add_keywords_to_desktop_files.patch
 cmake-xbase64.patch
 libwps-0.4.patch
diff --git a/debian/patches/upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch b/debian/patches/upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch
new file mode 100644
index 0000000..a3049d2
--- /dev/null
+++ b/debian/patches/upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch
@@ -0,0 +1,29 @@
+From 956bb80db4f300e4f8edeaf19d24fd61eb1932b2 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau at kde.org>
+Date: Mon, 31 Aug 2015 13:47:07 +0200
+Subject: [PATCH] Fix compilation of PsCommentLexer.cpp on platforms where char
+ is unsigned
+
+REVIEW: 124883
+
+Thanks Tom Hall for the fix
+---
+ filters/karbon/eps/PsCommentLexer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/filters/karbon/eps/PsCommentLexer.cpp b/filters/karbon/eps/PsCommentLexer.cpp
+index 6487df6..dd928d6 100644
+--- a/filters/karbon/eps/PsCommentLexer.cpp
++++ b/filters/karbon/eps/PsCommentLexer.cpp
+@@ -63,7 +63,7 @@ const char*statetoa(State state)
+ 
+ typedef struct {
+     State oldState;
+-    char c;
++    signed char c;
+     State newState;
+     Action action;
+ } Transition;
+-- 
+2.9.3
+

-- 
Calligra suite packaging