[SCM] supercollider/master: update/remove patches for 3.5.4

[danstowell-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ff1141726b49909d8a472acb66156abb29c4a5de
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Sun Aug 12 21:58:09 2012 +0100

    update/remove patches for 3.5.4

diff --git a/debian/patches/arm-qreal-is-float.patch b/debian/patches/arm-qreal-is-float.patch
index e542775..5ada7a5 100644
--- a/debian/patches/arm-qreal-is-float.patch
+++ b/debian/patches/arm-qreal-is-float.patch
@@ -9,17 +9,6 @@ This causes sc to fail to build on ARM systems.
  QtCollider/widgets/QcMultiSlider.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/QtCollider/widgets/QcMultiSlider.h
-+++ b/QtCollider/widgets/QcMultiSlider.h
-@@ -109,7 +109,7 @@
-     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 );
 --- a/QtCollider/widgets/QcMultiSlider.cpp
 +++ b/QtCollider/widgets/QcMultiSlider.cpp
 @@ -182,7 +182,7 @@
@@ -31,26 +20,3 @@ This causes sc to fail to build on ARM systems.
  
    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();
- 
diff --git a/debian/patches/boost-big-endian-typo.patch b/debian/patches/boost-big-endian-typo.patch
deleted file mode 100644
index 5646a18..0000000
--- a/debian/patches/boost-big-endian-typo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Description: Remove extra (typo) ')' in statement
---- a/external_libraries/boost_endian/boost/integer/endian.hpp
-+++ b/external_libraries/boost_endian/boost/integer/endian.hpp
-@@ -282,7 +282,7 @@
- #     endif
- #   endif
- #   ifdef BOOST_BIG_ENDIAN  
--        endian & operator=(T val) { m_value = val); return *this; }
-+        endian & operator=(T val) { m_value = val; return *this; }
-         operator T() const        { return m_value; }
- #   else  
-         endian & operator=(T val) { detail::store_big_endian<T, sizeof(T)>(&m_value, val); return *this; }
diff --git a/debian/patches/series b/debian/patches/series
index 2ae64ea..5e333d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
 update_boostlockfree_prefixhpp.patch
 arm-qreal-is-float.patch
-boost-big-endian-typo.patch
 deactivate_perf_counter.patch
 boostatomic_ppc_build.patch
-strip_gremlin_characters.patch
 no-inline-ppc-ftbfs.patch
 perf-counter-include.patch
diff --git a/debian/patches/strip_gremlin_characters.patch b/debian/patches/strip_gremlin_characters.patch
deleted file mode 100644
index 071fa42..0000000
--- a/debian/patches/strip_gremlin_characters.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Dan Stowell
-Description: Strip accidental gremlin characters that can cause problems for users in some locales. (Backported from upstream commit aeab35e3103d35)
---- a/SCClassLibrary/JITLib/ProxySpace/wrapForNodeProxy.sc
-+++ b/SCClassLibrary/JITLib/ProxySpace/wrapForNodeProxy.sc
-@@ -65,7 +65,7 @@
- 
- 	prepareForProxySynthDef { arg proxy;
- 		proxy.initBus(\control, 1);
--		^{ÊDC.multiNewList([proxy.rate] ++ this) };
-+		^{DC.multiNewList([proxy.rate] ++ this) };
- 	}
- }
- 
-@@ -82,7 +82,7 @@
- +RawArray {
- 	prepareForProxySynthDef { arg proxy;
- 		proxy.initBus(\control, this.size);
--		^{ÊDC.multiNewList([proxy.rate] ++ this) };
-+		^{DC.multiNewList([proxy.rate] ++ this) };
- 	}
- }
- 

-- 
supercollider packaging