[SCM] supercollider/master: Fix FTBFS in arm* architectures

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Mon Jul 9 23:56:09 UTC 2012


The following commit has been merged in the master branch:
commit 30f4a669302b54e81ae8f4bd9937d6b0d1ddb7b3
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Jul 9 19:44:47 2012 -0400

    Fix FTBFS in arm* architectures
    
    QcMultiSlider had a wrong prototype for valueRect

diff --git a/debian/patches/arm-qreal-is-float.patch b/debian/patches/arm-qreal-is-float.patch
new file mode 100644
index 0000000..fd10ac4
--- /dev/null
+++ b/debian/patches/arm-qreal-is-float.patch
@@ -0,0 +1,27 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Mon, 9 Jul 2012 18:57:51 -0400
+Subject: [PATCH] QcMultiSlider::valueRect takes in a qreal, not a double
+
+Usually qreal is double (which is why it works), but on ARM systems qreal
+is float instead.
+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
+     void setStartIndex( int i ) { startIndex = qBound(0, i, _values.count()-1); update(); }
+ 
+     QRect contentsRect();
+-    QRect valueRect( int count, double & spacing );
++    QRect valueRect( int count, qreal & spacing );
+     inline float valueFromPos( float pos, float range );
+     inline void setValue( int index, double value );
+     double rounded ( double value );
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 897f4ba..117fe3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 update_boostlockfree_prefixhpp.patch
+arm-qreal-is-float.patch

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list