[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=00a908b

The following commit has been merged in the master branch:
commit 00a908b6a748ee91a10e2645628ed5eae1d5802b
Author: Michael Casadevall <sonicmctails at gmail.com>
Date:   Thu Jan 1 00:31:46 2009 -0500

    * debian/patches/kubuntu_01_qreal_portability_fixes.diff
      - Upcasts qreal in templated functions to fix ARM FTBFSes
---
 debian/changelog                                   |  7 ++++-
 .../kubuntu_01_qreal_portability_fixes.diff        | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0858ab3..33864ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 kdeplasma-addons (4:4.1.85-0ubuntu3) UNRELEASED; urgency=low
 
+  [ Harald Sitter ]
   * Change Vcs-Browser to Launchpad and replace Vcs-Svn with Vcs-Bzr
 
- -- Harald Sitter <apachelogger at ubuntu.com>  Thu, 18 Dec 2008 10:04:25 -0500
+  [ Michael Casadevall ] 
+  * debian/patches/kubuntu_01_qreal_portability_fixes.diff
+    - Upcasts qreal in templated functions to fix ARM FTBFSes
+
+ -- Michael Casadevall <sonicmctails at gmail.com>  Thu, 01 Jan 2009 00:30:12 -0500
 
 kdeplasma-addons (4:4.1.85-0ubuntu2) jaunty; urgency=low
 
diff --git a/debian/patches/kubuntu_01_qreal_portability_fixes.diff b/debian/patches/kubuntu_01_qreal_portability_fixes.diff
new file mode 100644
index 0000000..cc5569f
--- /dev/null
+++ b/debian/patches/kubuntu_01_qreal_portability_fixes.diff
@@ -0,0 +1,35 @@
+Index: kdeplasma-addons-4.1.85/applets/comic/fadingitem.cpp
+===================================================================
+--- kdeplasma-addons-4.1.85.orig/applets/comic/fadingitem.cpp	2008-12-31 01:25:37.000000000 +0000
++++ kdeplasma-addons-4.1.85/applets/comic/fadingitem.cpp	2008-12-31 01:25:50.000000000 +0000
+@@ -61,7 +61,7 @@
+     QPainter tempPainter( &temp );
+     QColor color = Qt::black;
+ 
+-    color.setAlphaF( qMin( mOpacity, 0.99 ) );
++    color.setAlphaF( qMin( double(mOpacity), 0.99 ) );
+     tempPainter.setCompositionMode( QPainter::CompositionMode_DestinationIn );
+     tempPainter.fillRect( mParent.rect(), color );
+     painter->drawPixmap( QPoint( 0, 0 ), temp );
+Index: kdeplasma-addons-4.1.85/applets/previewer/previewwidget.cpp
+===================================================================
+--- kdeplasma-addons-4.1.85.orig/applets/previewer/previewwidget.cpp	2008-12-31 02:09:49.000000000 +0000
++++ kdeplasma-addons-4.1.85/applets/previewer/previewwidget.cpp	2008-12-31 18:43:09.000000000 +0000
+@@ -359,7 +359,7 @@
+ void PreviewWidget::expandingSlot(qreal progress)
+ {
+     const int min = s_topBorder + bottomBorderHeight();
+-    if (qFuzzyCompare(1.0, progress)) {
++    if (qFuzzyCompare(1.0, double(progress))) {
+         m_animId = -1;
+ 
+         if (m_closeStatus) {
+@@ -374,7 +374,7 @@
+             }
+         }
+     } else {
+-        m_animationHeight = qMax(qreal(min),
++        m_animationHeight = qMax(double(min),
+                                  min - 1 + ((size().height() - min)  * 
+                                             (m_closeStatus ? 1.0 - progress : progress)));
+     }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..087aea1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_01_qreal_portability_fixes.diff

-- 
KDE Plasma Addons module packaging