rev 14388 - in trunk/packages/kdeartwork/debian: . patches

[Michael Casadevall]

Author: ncommander-guest
Date: 2009-04-14 07:50:14 +0000 (Tue, 14 Apr 2009)
New Revision: 14388

Added:
   trunk/packages/kdeartwork/debian/patches/
   trunk/packages/kdeartwork/debian/patches/01_fix_qreals_on_arm.diff
   trunk/packages/kdeartwork/debian/patches/series
Modified:
   trunk/packages/kdeartwork/debian/
   trunk/packages/kdeartwork/debian/changelog
Log:
* debian/patches/01_fix_qreals_on_arm.diff
  - Casts qreal/double mismatch to allow successful build on
    the ARM architecture where qreal's are float vs. double


Property changes on: trunk/packages/kdeartwork/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/packages/kdeartwork/debian/changelog
===================================================================
--- trunk/packages/kdeartwork/debian/changelog	2009-04-14 07:21:51 UTC (rev 14387)
+++ trunk/packages/kdeartwork/debian/changelog	2009-04-14 07:50:14 UTC (rev 14388)
@@ -1,3 +1,11 @@
+kdeartwork (4:4.2.2-2) UNRELEASED; urgency=low
+
+  * debian/patches/01_fix_qreals_on_arm.diff
+    - Casts qreal/double mismatch to allow successful build on
+      the ARM architecture where qreal's are float vs. double
+
+ -- Michael Casadevall <mcasadevall at debian.org>  Tue, 14 Apr 2009 03:41:39 -0400
+
 kdeartwork (4:4.2.2-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/kdeartwork/debian/patches/01_fix_qreals_on_arm.diff
===================================================================
--- trunk/packages/kdeartwork/debian/patches/01_fix_qreals_on_arm.diff	                        (rev 0)
+++ trunk/packages/kdeartwork/debian/patches/01_fix_qreals_on_arm.diff	2009-04-14 07:50:14 UTC (rev 14388)
@@ -0,0 +1,13 @@
+Index: kdeartwork-4.2.2/styles/phase/phasestyle.cpp
+===================================================================
+--- kdeartwork-4.2.2.orig/styles/phase/phasestyle.cpp	2009-04-14 03:46:48.901023833 -0400
++++ kdeartwork-4.2.2/styles/phase/phasestyle.cpp	2009-04-14 03:47:48.612029486 -0400
+@@ -2052,7 +2052,7 @@
+           qreal cx = rect.center().x();
+           qreal cy = rect.center().y();
+           qreal radius = (qMin(w, h) / 2.0) - 2.0;
+-          qreal tick = qMax(radius / 6, 4.0);
++          qreal tick = qMax(radius / 6, static_cast<qreal>(4.0));
+ 
+           if (dial->subControls & SC_DialGroove) {
+               QRectF groove = QRectF(cx-radius+tick, cy-radius+tick,


Property changes on: trunk/packages/kdeartwork/debian/patches/01_fix_qreals_on_arm.diff
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: trunk/packages/kdeartwork/debian/patches/series
===================================================================
--- trunk/packages/kdeartwork/debian/patches/series	                        (rev 0)
+++ trunk/packages/kdeartwork/debian/patches/series	2009-04-14 07:50:14 UTC (rev 14388)
@@ -0,0 +1 @@
+01_fix_qreals_on_arm.diff