[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.2-3-6-g4bcced3

[Adrien Grellier]

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

The following commit has been merged in the tip branch:
commit 48bfc291e1fbd954083186c9ba2f483cb77e3ff6
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Mon Jun 4 08:55:24 2012 +0200

    Pull a patch from upstream to make calligra build on arm
---
 debian/changelog                   |    1 +
 debian/patches/compile_on_arm.diff |   23 +++++++++++++++++++++++
 debian/patches/series              |    1 +
 3 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 243f722..abd9bba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 calligra (1:2.4.2-1r0) UNRELEASED; urgency=low
 
+  * Pull a patch from upstream to make calligra build on arm
 
  -- Sune Vuorela <sune at debian.org>  Mon, 04 Jun 2012 08:53:30 +0200
 
diff --git a/debian/patches/compile_on_arm.diff b/debian/patches/compile_on_arm.diff
new file mode 100644
index 0000000..a1d43ec
--- /dev/null
+++ b/debian/patches/compile_on_arm.diff
@@ -0,0 +1,23 @@
+commit 58db794d10ab882a2ca9683476184758a58e4a2a
+Author: Marijn Kruisselbrink <mkruisselbrink at kde.org>
+Date:   Tue May 8 02:14:15 2012 +0200
+
+    compile on arm
+
+diff --git a/plugins/pathshapes/rectangle/RectangleShape.cpp b/plugins/pathshapes/rectangle/RectangleShape.cpp
+index 7c42b70..e83874d 100644
+--- a/plugins/pathshapes/rectangle/RectangleShape.cpp
++++ b/plugins/pathshapes/rectangle/RectangleShape.cpp
+@@ -60,9 +60,9 @@ bool RectangleShape::loadOdf(const KoXmlElement &element, KoShapeLoadingContext
+     } else {
+         QString cornerRadius = element.attributeNS(KoXmlNS::draw, "corner-radius", "");
+         if (! cornerRadius.isEmpty()) {
+-            float radius = KoUnit::parseValue(cornerRadius);
+-            m_cornerRadiusX = qMin(radius / (0.5 * size().width()) * 100, qreal(100));
+-            m_cornerRadiusY = qMin(radius / (0.5 * size().height()) * 100, qreal(100));
++            qreal radius = KoUnit::parseValue(cornerRadius);
++            m_cornerRadiusX = qMin<qreal>(radius / (0.5 * size().width()) * 100, qreal(100));
++            m_cornerRadiusY = qMin<qreal>(radius / (0.5 * size().height()) * 100, qreal(100));
+         }
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7dc314a..560506f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 do_not_link_blas.diff
+compile_on_arm.diff

-- 
Calligra suite packaging