Package: musescore Version: 0.9.6+dfsg-1 Severity: normal Musecore has been failing to build on armel in ubuntu. See https://bugs.edge.launchpad.net/ubuntu/+source/musescore/+bug/642117 Attached is a patch that fixes various qfloat/double/float confusion. Build tested on sid i386 but not armel
thanks -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages musescore depends on: ii desktop-file-utils 0.15-2 Utilities for .desktop files ii gawk 1:3.1.7.dfsg-5 GNU awk, a pattern scanning and pr ii libasound2 1.0.23-1 shared library for ALSA applicatio ii libc6 2.11.2-6 Embedded GNU C Library: Shared lib ii libgcc1 1:4.4.4-15 GCC support library ii libportaudio2 19+svn20071022-3+b2 Portable audio I/O - shared librar ii libqt4-designer 4:4.6.3-2 Qt 4 designer module ii libqt4-network 4:4.6.3-2 Qt 4 network module ii libqt4-script 4:4.6.3-2 Qt 4 script module ii libqt4-scripttools 4:4.6.3-2 Qt 4 script tools module ii libqt4-svg 4:4.6.3-2 Qt 4 SVG module ii libqt4-xml 4:4.6.3-2 Qt 4 XML module ii libqtcore4 4:4.6.3-2 Qt 4 core module ii libqtgui4 4:4.6.3-2 Qt 4 GUI module ii libqtscript4-qtbindi 0.1.0-3 Qt Script bindings for Qt 4 - meta ii libsndfile1 1.0.21-3 Library for reading/writing audio ii libstdc++6 4.4.4-15 The GNU Standard C++ Library v3 ii musescore-common 0.9.6+dfsg-1 Full featured WYSIWYG score editor ii musescore-soundfont- 0.9.6+dfsg-1 Small GM SoundFont for MuseScore ( ii xdg-utils 1.0.2+cvs20100307-2 desktop integration utilities from ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime Versions of packages musescore recommends: ii pulseaudio-utils 0.9.21-3 Command line tools for the PulseAu Versions of packages musescore suggests: pn fluid-soundfont-gm <none> (no description available) -- no debconf information
#! /bin/sh /usr/share/dpatch/dpatch-run ## armel-float-cast-fix.dpatch by Niall Creech <niallcre...@gmail.com> ## ## Author: Niall Creech <niallcre...@gmail.com> ## Description: Define alternative rxpos and rypos calls for armel to handle ## its differenet QpointF rx() and ry() call return values. Ensure qMax ## and qMin calls have equivalent argument types. ## Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/musecore/+bug/642117 @DPATCH@ diff -urNad musescore-0.9.6+dfsg~/mscore/mscore/beam.cpp musescore-0.9.6+dfsg/mscore/mscore/beam.cpp --- musescore-0.9.6+dfsg~/mscore/mscore/beam.cpp 2010-06-07 22:26:55.000000000 +0100 +++ musescore-0.9.6+dfsg/mscore/mscore/beam.cpp 2010-09-22 08:54:45.000000000 +0100 @@ -786,7 +786,7 @@ double x2 = npos.x(); double y1 = npos.y(); - double y = _up ? qMin(p1dy, _p1[idx].y()) : qMax(p1dy, _p1[idx].y()); + double y = _up ? qMin(qreal(p1dy), _p1[idx].y()) : qMax(qreal(p1dy), _p1[idx].y()); double y2 = y + (x2 - x1) * slope + cp.y(); double stemLen = _up ? (y1 - y2) : (y2 - y1); diff -urNad musescore-0.9.6+dfsg~/mscore/mscore/element.h musescore-0.9.6+dfsg/mscore/mscore/element.h --- musescore-0.9.6+dfsg~/mscore/mscore/element.h 2010-06-07 22:26:55.000000000 +0100 +++ musescore-0.9.6+dfsg/mscore/mscore/element.h 2010-09-22 08:54:45.000000000 +0100 @@ -189,8 +189,13 @@ void setPos(const QPointF& p) { _pos = p; } void setPos(double x, double y) { _pos.rx() = x; _pos.ry() = y; } void movePos(const QPointF& p) { _pos += p; } +#ifdef __arm__ + float& rxpos() { return _pos.rx(); } + float& rypos() { return _pos.ry(); } +#else double& rxpos() { return _pos.rx(); } double& rypos() { return _pos.ry(); } +#endif virtual void move(double xd, double yd) { _pos += QPointF(xd, yd); } virtual void move(const QPointF& s) { _pos += s; } diff -urNad musescore-0.9.6+dfsg~/mscore/mscore/mscore.cpp musescore-0.9.6+dfsg/mscore/mscore/mscore.cpp --- musescore-0.9.6+dfsg~/mscore/mscore/mscore.cpp 2010-09-22 08:54:44.000000000 +0100 +++ musescore-0.9.6+dfsg/mscore/mscore/mscore.cpp 2010-09-22 08:55:31.000000000 +0100 @@ -81,7 +81,7 @@ QString dataPath; QPaintDevice* pdev; -double PDPI, DPI, DPMM; +qreal PDPI, DPI, DPMM; double SPATIUM; QString mscoreGlobalShare; diff -urNad musescore-0.9.6+dfsg~/mscore/mscore/scoreview.cpp musescore-0.9.6+dfsg/mscore/mscore/scoreview.cpp --- musescore-0.9.6+dfsg~/mscore/mscore/scoreview.cpp 2010-06-07 22:26:55.000000000 +0100 +++ musescore-0.9.6+dfsg/mscore/mscore/scoreview.cpp 2010-09-22 08:54:45.000000000 +0100 @@ -2256,7 +2256,7 @@ // setMag //--------------------------------------------------------- -void ScoreView::setMag(double nmag) +void ScoreView::setMag(qreal nmag) { qreal m = mag();
