Package: rosegarden4
Version: 1.0-1
Severity: serious
Tags: patch
When building 'rosegarden4' on amd64/unstable,
I get the following error:
g++ -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/include/kde -I/usr/include/qt3 -I.
-DQT_THREAD_SUPPORT -D_REENTRANT -DRGKDE3 -Wnon-virtual-dtor -Wno-long-long
-Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion
-Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2
-Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new
-fno-common -fno-gcse -fexceptions -MT Colour.lo -MD -MP -MF .deps/Colour.Tpo
-c Colour.C -fPIC -DPIC -o .libs/Colour.o
Colour.C:166: error: explicit qualification in declaration of
`Rosegarden::Colour Rosegarden::getCombinationColour(const Rosegarden::Colour&,
const Rosegarden::Colour&)'
make[3]: *** [Colour.lo] Error 1
make[3]: Leaving directory `/rosegarden4-1.0/base'
With the attached patch 'rosegarden4' can be compiled on amd64
using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/rosegarden4-1.0/base/Colour.C ./base/Colour.C
--- ../tmp-orig/rosegarden4-1.0/base/Colour.C 2005-02-08 14:55:22.000000000
+0000
+++ ./base/Colour.C 2005-09-03 13:09:23.000000000 +0000
@@ -163,7 +163,7 @@
// Generic Colour routines:
Colour
-Rosegarden::getCombinationColour(const Colour &input1, const Colour &input2)
+getCombinationColour(const Colour &input1, const Colour &input2)
{
Colour ret((input1.getRed()+input2.getRed())/2,
(input1.getGreen()+input2.getGreen())/2,
diff -urN ../tmp-orig/rosegarden4-1.0/gui/mmapper.cpp ./gui/mmapper.cpp
--- ../tmp-orig/rosegarden4-1.0/gui/mmapper.cpp 2005-02-09 10:44:38.000000000
+0000
+++ ./gui/mmapper.cpp 2005-09-03 13:09:23.000000000 +0000
@@ -896,7 +896,7 @@
return QString("%1/segment_%2")
.arg(tmpDirs.last())
- .arg((unsigned int)segment, 0, 16);
+ .arg((unsigned long)segment, 0, 16);
}
QString CompositionMmapper::getSegmentFileName(Segment* s)
diff -urN ../tmp-orig/rosegarden4-1.0/gui/qcanvasgroupableitem.h
./gui/qcanvasgroupableitem.h
--- ../tmp-orig/rosegarden4-1.0/gui/qcanvasgroupableitem.h 2005-02-08
14:56:08.000000000 +0000
+++ ./gui/qcanvasgroupableitem.h 2005-09-04 12:18:46.000000000 +0000
@@ -24,6 +24,7 @@
#include <qcanvas.h>
+class QCanvasItemGroup;
/**
* This class is meant to be inherited by QCanvasItem children to make
* them groupable.
diff -urN ../tmp-orig/rosegarden4-1.0/gui/segmentcanvas.cpp
./gui/segmentcanvas.cpp
--- ../tmp-orig/rosegarden4-1.0/gui/segmentcanvas.cpp 2005-02-08
14:56:26.000000000 +0000
+++ ./gui/segmentcanvas.cpp 2005-09-03 13:09:23.000000000 +0000
@@ -444,7 +444,7 @@
if (e->type() == QEvent::User + 1) {
QCustomEvent *ev = dynamic_cast<QCustomEvent *>(e);
if (ev) {
- int token = (int)ev->data();
+ long token = (long)ev->data();
AudioPreviewThread &thread =
m_parent.getDocument()->getAudioPreviewThread();
RG_DEBUG << "SegmentAudioPreview::token " << token << ", my token "
<< m_previewToken <<endl;
diff -urN ../tmp-orig/rosegarden4-1.0/gui/segmenttool.h ./gui/segmenttool.h
--- ../tmp-orig/rosegarden4-1.0/gui/segmenttool.h 2005-02-08
14:56:27.000000000 +0000
+++ ./gui/segmenttool.h 2005-09-04 18:07:39.000000000 +0000
@@ -51,6 +51,8 @@
typedef std::pair<QPoint, SegmentItem *> SegmentItemPair;
typedef std::vector<SegmentItemPair> SegmentItemList;
+class SegmentToolBox;
+
class SegmentTool : public BaseTool
{
Q_OBJECT
diff -urN ../tmp-orig/rosegarden4-1.0/sound/MappedStudio.cpp
./sound/MappedStudio.cpp
--- ../tmp-orig/rosegarden4-1.0/sound/MappedStudio.cpp 2005-02-14
10:04:22.000000000 +0000
+++ ./sound/MappedStudio.cpp 2005-09-03 13:09:23.000000000 +0000
@@ -1715,7 +1715,7 @@
} else if (property == Default) {
m_default = value;
} else if (property == DisplayHint) {
- m_displayHint = PluginPort::PortDisplayHint(value);
+ m_displayHint = PluginPort::PortDisplayHint(value);
} else if (property == Value) {
setValue(value);
} else {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
