[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=c01ee7a

The following commit has been merged in the master branch:
commit c01ee7a48895fe19e1dad84c39d3abe99365990b
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Dec 23 17:56:45 2011 +0100

    Fix FTBFS on arm* due to qreal/double mismatch.
---
 debian/changelog                            |  2 ++
 debian/patches/kubuntu_fix_qreal_float.diff | 14 ++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0c43cf9..07d0a8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kdeplasma-addons (4:4.7.90-0ubuntu2) UNRELEASED; urgency=low
 
   * Fix lintian warning description-contains-duplicated-word.
   * Drop all kubuntu patches that were commented out.
+  * Fix FTBFS on arm* due to qreal/double mismatch.
+    - Add kubuntu_fix_qreal_float.diff.
 
  -- Felix Geyer <debfx at ubuntu.com>  Thu, 22 Dec 2011 14:57:05 +0100
 
diff --git a/debian/patches/kubuntu_fix_qreal_float.diff b/debian/patches/kubuntu_fix_qreal_float.diff
new file mode 100644
index 0000000..061d2b7
--- /dev/null
+++ b/debian/patches/kubuntu_fix_qreal_float.diff
@@ -0,0 +1,14 @@
+Description: Fix FTBFS on arm* due to qreal/double mismatch.
+Author: Felix Geyer <debfx at ubuntu.com>
+
+--- kdeplasma-addons-4.7.90.orig/applets/icontasks/taskitemlayout.cpp
++++ kdeplasma-addons-4.7.90/applets/icontasks/taskitemlayout.cpp
+@@ -369,7 +369,7 @@ void TaskItemLayout::layoutItems()
+     }
+ 
+     QRectF groupRect(m_groupItem->boundingRect());
+-    qreal cellSize(qMin(m_applet->launcherIcons() || !m_applet->autoIconScaling() ? 272.0 : 80, qMin(groupRect.width(), groupRect.height())));
++    qreal cellSize(qMin(m_applet->launcherIcons() || !m_applet->autoIconScaling() ? qreal(272) : qreal(80), qMin(groupRect.width(), groupRect.height())));
+     QSizeF maximumCellSize(cellSize, cellSize);
+ 
+     setHorizontalSpacing(m_applet->spacing());
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..74afa41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_fix_qreal_float.diff

-- 
KDE Plasma Addons module packaging