[SCM] supercollider/master: Fix ARM FTBFS: more qreal->double assumptions. Closes: #682361

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e6bc1e2e8cab1e08993b06f29e60b7037a220b7d
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sat Jul 28 19:45:46 2012 -0400

    Fix ARM FTBFS: more qreal->double assumptions. Closes: #682361

diff --git a/debian/patches/arm-qreal-is-float.patch b/debian/patches/arm-qreal-is-float.patch
index fd10ac4..e542775 100644
--- a/debian/patches/arm-qreal-is-float.patch
+++ b/debian/patches/arm-qreal-is-float.patch
@@ -9,11 +9,9 @@ This causes sc to fail to build on ARM systems.
  QtCollider/widgets/QcMultiSlider.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/QtCollider/widgets/QcMultiSlider.h b/QtCollider/widgets/QcMultiSlider.h
-index 2f3c7e0..675858d 100644
 --- a/QtCollider/widgets/QcMultiSlider.h
 +++ b/QtCollider/widgets/QcMultiSlider.h
-@@ -109,7 +109,7 @@ class QcMultiSlider : public QWidget, QcHelper, QtCollider::Style::Client
+@@ -109,7 +109,7 @@
      void setStartIndex( int i ) { startIndex = qBound(0, i, _values.count()-1); update(); }
  
      QRect contentsRect();
@@ -22,6 +20,37 @@ index 2f3c7e0..675858d 100644
      inline float valueFromPos( float pos, float range );
      inline void setValue( int index, double value );
      double rounded ( double value );
--- 
-1.7.10.4
-
+--- a/QtCollider/widgets/QcMultiSlider.cpp
++++ b/QtCollider/widgets/QcMultiSlider.cpp
+@@ -182,7 +182,7 @@
+   if( !c ) return;
+ 
+   bool horiz = ort == Qt::Horizontal;
+-  double spacing;
++  qreal spacing;
+ 
+   QRect r( valueRect( c - startIndex, spacing ) );
+ 
+@@ -226,7 +226,7 @@
+     return;
+   }
+ 
+-  double xStep;
++  qreal xStep;
+ 
+   QRect r( valueRect( c - startIndex, xStep ) );
+ 
+@@ -336,10 +336,10 @@
+   }
+ 
+   int count = _values.count() - startIndex;
+-  double spacing, width, yscale;
++  qreal spacing, width, yscale;
+ 
+-  spacing = elastic ? (double) bounds.width() / count : thumbSize.width() + gap;
+-  width = elastic ? qMin( spacing, (double) thumbSize.width() ) : thumbSize.width();
++  spacing = elastic ? (qreal) bounds.width() / count : thumbSize.width() + gap;
++  width = elastic ? qMin( spacing, (qreal) thumbSize.width() ) : thumbSize.width();
+   yscale = bounds.height();
+   if( !isFilled ) yscale -= thumbSize.height();
+ 

-- 
supercollider packaging