[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=f7b3945

The following commit has been merged in the master branch:
commit f7b394533c7b0acd479cce27293c0e00b49d0e08
Author: Scott Kitterman <scott at kitterman.com>
Date:   Mon Sep 7 12:36:52 2009 -0400

    mandlebrot.cpp armel fixes and release 4.3.1-0ubuntu3
---
 debian/changelog                               |  7 ++++++
 debian/patches/kubuntu_01_fix_armel_build.diff | 35 +++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f263258..de3f294 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdeplasma-addons (4:4.3.1-0ubuntu3) karmic; urgency=low
+
+  * Add wallpapers/mandelbrot/mandelbrot.cpp armel fixes to
+    kubuntu_01_fix_armel_build.diff
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 07 Sep 2009 12:29:57 -0400
+
 kdeplasma-addons (4:4.3.1-0ubuntu2) karmic; urgency=low
 
   * Add another fix to kubuntu_01_fix_armel_build.diff
diff --git a/debian/patches/kubuntu_01_fix_armel_build.diff b/debian/patches/kubuntu_01_fix_armel_build.diff
index 7160914..1aa267c 100644
--- a/debian/patches/kubuntu_01_fix_armel_build.diff
+++ b/debian/patches/kubuntu_01_fix_armel_build.diff
@@ -1,7 +1,7 @@
 Index: kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp
 ===================================================================
---- kdeplasma-addons-4.3.1.orig/applets/pastebin/pastebin.cpp	2009-07-29 07:13:00.000000000 -0400
-+++ kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp	2009-09-02 23:36:13.000000000 -0400
+--- kdeplasma-addons-4.3.1.orig/applets/pastebin/pastebin.cpp	2009-09-02 23:48:32.000000000 -0400
++++ kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp	2009-09-07 12:26:17.000000000 -0400
 @@ -253,7 +253,7 @@
  {
      if (constraints & (Plasma::FormFactorConstraint | Plasma::SizeConstraint)) {
@@ -13,8 +13,8 @@ Index: kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp
      }
 Index: kdeplasma-addons-4.3.1/applets/mediaplayer/mediaplayer.cpp
 ===================================================================
---- kdeplasma-addons-4.3.1.orig/applets/mediaplayer/mediaplayer.cpp	2009-09-02 23:36:40.000000000 -0400
-+++ kdeplasma-addons-4.3.1/applets/mediaplayer/mediaplayer.cpp	2009-09-02 23:47:07.000000000 -0400
+--- kdeplasma-addons-4.3.1.orig/applets/mediaplayer/mediaplayer.cpp	2009-09-02 23:48:32.000000000 -0400
++++ kdeplasma-addons-4.3.1/applets/mediaplayer/mediaplayer.cpp	2009-09-07 12:26:17.000000000 -0400
 @@ -223,10 +223,10 @@
          PlayPause();
          break;
@@ -28,3 +28,30 @@ Index: kdeplasma-addons-4.3.1/applets/mediaplayer/mediaplayer.cpp
          break;
      case Qt::Key_R:
          RaiseLower();
+Index: kdeplasma-addons-4.3.1/wallpapers/mandelbrot/mandelbrot.cpp
+===================================================================
+--- kdeplasma-addons-4.3.1.orig/wallpapers/mandelbrot/mandelbrot.cpp	2009-09-07 12:26:41.000000000 -0400
++++ kdeplasma-addons-4.3.1/wallpapers/mandelbrot/mandelbrot.cpp	2009-09-07 12:29:03.000000000 -0400
+@@ -340,16 +340,16 @@
+     m_center += (oldResolution - newResolution) * (at - QPointF(width()/2, height()/2));
+ 
+     // now scale part the old image and merge it immediately into m_image to give the user a sense of speed
+-    qreal srcwidth = width() * qMin(zoomFactor,1.);
+-    qreal srcheight = height() * qMin(zoomFactor,1.);
++    qreal srcwidth = width() * qMin(zoomFactor,(qreal)(1.0));
++    qreal srcheight = height() * qMin(zoomFactor,(qreal)(1.0));
+     qreal srcleft = at.x() - srcwidth/2.;
+     qreal srcright = at.x() + srcwidth/2.;
+     qreal srctop = at.y() - srcheight/2.;
+     qreal srcbottom = at.y() + srcheight/2.;
+-    qreal srcleft_c = CLAMP(srcleft, 0., (qreal)width());
+-    qreal srcright_c = CLAMP(srcright, 0., (qreal)width());
+-    qreal srctop_c = CLAMP(srctop, 0., (qreal)height());
+-    qreal srcbottom_c = CLAMP(srcbottom, 0., (qreal)height());
++    qreal srcleft_c = CLAMP(srcleft, (qreal)(0.0), (qreal)width());
++    qreal srcright_c = CLAMP(srcright, (qreal)(0.0), (qreal)width());
++    qreal srctop_c = CLAMP(srctop, (qreal)(0.0), (qreal)height());
++    qreal srcbottom_c = CLAMP(srcbottom, (qreal)(0.0), (qreal)height());
+     qreal srcwidth_c = srcright_c - srcleft_c;
+     qreal srcheight_c = srcbottom_c - srctop_c;
+     qreal dstwidth = width() * qMin(1./zoomFactor,1.);

-- 
KDE Plasma Addons module packaging