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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 8c99aaba6ea8e3f981ca04ed6fdcf70479434bdc
Author: Pino Toscano <pino at debian.org>
Date:   Sat Sep 17 07:59:58 2016 +0200

    fix build on armel/armhf
    
    backport upstream commit 04d61e92515f19cbd2dbb0cc06d4340ba4514a8a
---
 debian/changelog                            |  2 ++
 debian/patches/series                       |  1 +
 debian/patches/upstream_fix-arm-FTBFS.patch | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2f93010..d2c3aa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ calligra (1:2.9.11+dfsg-2) UNRELEASED; urgency=medium
   * Drop from calligra-data the two mimetype definitions msooxml-all.xml, and
     x-iwork-keynote-sffkey.xml, since shared-mime-info provides them already.
   * Remove unused calligra-map-shape.install.
+  * Backport upstream commit 04d61e92515f19cbd2dbb0cc06d4340ba4514a8a to fix
+    build on armel/armhf; patch upstream_fix-arm-FTBFS.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 c1e409e..f7513c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream_fix-arm-FTBFS.patch
 add_keywords_to_desktop_files.patch
 cmake-xbase64.patch
 libwps-0.4.patch
diff --git a/debian/patches/upstream_fix-arm-FTBFS.patch b/debian/patches/upstream_fix-arm-FTBFS.patch
new file mode 100644
index 0000000..1b42a6a
--- /dev/null
+++ b/debian/patches/upstream_fix-arm-FTBFS.patch
@@ -0,0 +1,25 @@
+From 04d61e92515f19cbd2dbb0cc06d4340ba4514a8a Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Sat, 11 Jun 2016 09:49:41 -0500
+Subject: [PATCH] fix arm FTBFS
+
+---
+ libs/flake/KoSnapStrategy.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/flake/KoSnapStrategy.cpp b/libs/flake/KoSnapStrategy.cpp
+index fd9de8e..e644e35 100644
+--- a/libs/flake/KoSnapStrategy.cpp
++++ b/libs/flake/KoSnapStrategy.cpp
+@@ -181,7 +181,7 @@ bool ExtensionSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy * pro
+     Q_ASSERT(isfinite(maxSnapDistance));
+ 
+     const qreal maxDistance = maxSnapDistance * maxSnapDistance;
+-    qreal minDistances[2] = { HUGE_VAL, HUGE_VAL };
++    qreal minDistances[2] = { (qreal)HUGE_VAL, (qreal)HUGE_VAL };
+ 
+     QPointF snappedPoints[2] = { mousePosition, mousePosition };
+     QPointF startPoints[2];
+-- 
+2.9.3
+

-- 
Calligra suite packaging