[Demudi-commits] r1506 - in rosegarden/trunk/debian: . patches
stew-guest at alioth.debian.org
stew-guest at alioth.debian.org
Fri Jul 13 06:15:20 UTC 2007
Author: stew-guest
Date: 2007-07-13 06:15:19 +0000 (Fri, 13 Jul 2007)
New Revision: 1506
Added:
rosegarden/trunk/debian/patches/20-gcc-4.2.dpatch
Modified:
rosegarden/trunk/debian/changelog
rosegarden/trunk/debian/patches/00list
Log:
applying patch for gcc-4.2
Modified: rosegarden/trunk/debian/changelog
===================================================================
--- rosegarden/trunk/debian/changelog 2007-07-11 23:07:33 UTC (rev 1505)
+++ rosegarden/trunk/debian/changelog 2007-07-13 06:15:19 UTC (rev 1506)
@@ -1,3 +1,9 @@
+rosegarden (1:1.5.1-3) unstable; urgency=low
+
+ * applying patch from Martin Michlmayr for gcc 4.2 (Closes: #421327)
+
+ -- Mike O'Connor <stew at vireo.org> Fri, 13 Jul 2007 02:14:55 -0400
+
rosegarden (1:1.5.1-2) unstable; urgency=low
* Updated README.Debian (Closes: 392181)
Modified: rosegarden/trunk/debian/patches/00list
===================================================================
--- rosegarden/trunk/debian/patches/00list 2007-07-11 23:07:33 UTC (rev 1505)
+++ rosegarden/trunk/debian/patches/00list 2007-07-13 06:15:19 UTC (rev 1506)
@@ -1 +1,381 @@
10-x-www-browser.dpatch
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-gcc-4.2.dpatch by <stew at vireo.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad rosegarden-1.5.1~/src/base/Composition.cpp rosegarden-1.5.1/src/base/Composition.cpp
+--- rosegarden-1.5.1~/src/base/Composition.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/Composition.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -31,6 +31,7 @@
+ #include <iomanip>
+ #include <algorithm>
+ #include <cmath>
++#include <typeinfo>
+
+ #if (__GNUC__ < 3)
+ #include <strstream>
+diff -urNad rosegarden-1.5.1~/src/base/Event.cpp rosegarden-1.5.1/src/base/Event.cpp
+--- rosegarden-1.5.1~/src/base/Event.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/Event.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -442,4 +442,4 @@
+ else return a.getSubOrdering() < b.getSubOrdering();
+ }
+
+-}
+\ No newline at end of file
++}
+diff -urNad rosegarden-1.5.1~/src/base/MidiDevice.cpp rosegarden-1.5.1/src/base/MidiDevice.cpp
+--- rosegarden-1.5.1~/src/base/MidiDevice.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/MidiDevice.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include "ControlParameter.h"
+
+ #include <cstdio>
++#include <cstdlib>
+ #include <iostream>
+ #include <set>
+
+diff -urNad rosegarden-1.5.1~/src/base/Property.cpp rosegarden-1.5.1/src/base/Property.cpp
+--- rosegarden-1.5.1~/src/base/Property.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/Property.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -22,6 +22,7 @@
+
+ #include "Property.h"
+ #include <cstdio>
++#include <cstdlib>
+ #include <string>
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/base/Segment.cpp rosegarden-1.5.1/src/base/Segment.cpp
+--- rosegarden-1.5.1~/src/base/Segment.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/Segment.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -30,6 +30,7 @@
+ #include <algorithm>
+ #include <iterator>
+ #include <cstdio>
++#include <typeinfo>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/base/SoftSynthDevice.cpp rosegarden-1.5.1/src/base/SoftSynthDevice.cpp
+--- rosegarden-1.5.1~/src/base/SoftSynthDevice.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/SoftSynthDevice.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include "MidiTypes.h"
+
+ #include <cstdio>
++#include <cstdlib>
+
+
+ #if (__GNUC__ < 3)
+diff -urNad rosegarden-1.5.1~/src/base/XmlExportable.cpp rosegarden-1.5.1/src/base/XmlExportable.cpp
+--- rosegarden-1.5.1~/src/base/XmlExportable.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/XmlExportable.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -20,6 +20,7 @@
+
+ #include "XmlExportable.h"
+ #include <iostream>
++#include <cstdlib>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/gui/application/LircClient.cpp rosegarden-1.5.1/src/gui/application/LircClient.cpp
+--- rosegarden-1.5.1~/src/gui/application/LircClient.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/application/LircClient.cpp 2007-07-13 02:07:53.000000000 -0400
+@@ -35,6 +35,7 @@
+ #include <qobject.h>
+ #include <qsocketnotifier.h>
+ #include <fcntl.h>
++#include <cstdlib>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/gui/application/RosegardenApplication.cpp rosegarden-1.5.1/src/gui/application/RosegardenApplication.cpp
+--- rosegarden-1.5.1~/src/gui/application/RosegardenApplication.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/application/RosegardenApplication.cpp 2007-07-13 02:07:53.000000000 -0400
+@@ -142,4 +142,4 @@
+
+ }
+
+-#include "RosegardenApplication.moc"
+\ No newline at end of file
++#include "RosegardenApplication.moc"
+diff -urNad rosegarden-1.5.1~/src/gui/configuration/NotationConfigurationPage.cpp rosegarden-1.5.1/src/gui/configuration/NotationConfigurationPage.cpp
+--- rosegarden-1.5.1~/src/gui/configuration/NotationConfigurationPage.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/configuration/NotationConfigurationPage.cpp 2007-07-13 02:11:52.000000000 -0400
+@@ -59,6 +59,7 @@
+ #include <qstringlist.h>
+ #include <qtabwidget.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/dialogs/KeySignatureDialog.cpp rosegarden-1.5.1/src/gui/dialogs/KeySignatureDialog.cpp
+--- rosegarden-1.5.1~/src/gui/dialogs/KeySignatureDialog.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/dialogs/KeySignatureDialog.cpp 2007-07-13 02:09:11.000000000 -0400
+@@ -43,6 +43,7 @@
+ #include <qtooltip.h>
+ #include <qvbox.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/eventlist/EventView.cpp rosegarden-1.5.1/src/gui/editors/eventlist/EventView.cpp
+--- rosegarden-1.5.1~/src/gui/editors/eventlist/EventView.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/eventlist/EventView.cpp 2007-07-13 02:11:00.000000000 -0400
+@@ -85,6 +85,7 @@
+ #include <qsize.h>
+ #include <qstring.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/guitar/BarreList.cpp rosegarden-1.5.1/src/gui/editors/guitar/BarreList.cpp
+--- rosegarden-1.5.1~/src/gui/editors/guitar/BarreList.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/guitar/BarreList.cpp 2007-07-13 02:10:33.000000000 -0400
+@@ -1,5 +1,7 @@
+ #include "BarreList.h"
+
++#include <algorithm>
++
+ namespace Rosegarden
+ {
+
+diff -urNad rosegarden-1.5.1~/src/gui/editors/guitar/ChordName.cpp rosegarden-1.5.1/src/gui/editors/guitar/ChordName.cpp
+--- rosegarden-1.5.1~/src/gui/editors/guitar/ChordName.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/guitar/ChordName.cpp 2007-07-13 02:10:33.000000000 -0400
+@@ -1,6 +1,7 @@
+ #include "ChordName.h"
+ #include "base/Exception.h"
+
++#include <algorithm>
+ #include <sstream>
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/notation/NotationView.cpp rosegarden-1.5.1/src/gui/editors/notation/NotationView.cpp
+--- rosegarden-1.5.1~/src/gui/editors/notation/NotationView.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/notation/NotationView.cpp 2007-07-13 02:10:45.000000000 -0400
+@@ -205,6 +205,7 @@
+ #include <qtimer.h>
+ #include <qwidget.h>
+ #include <qvalidator.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/notation/NoteFontFactory.cpp rosegarden-1.5.1/src/gui/editors/notation/NoteFontFactory.cpp
+--- rosegarden-1.5.1~/src/gui/editors/notation/NoteFontFactory.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/notation/NoteFontFactory.cpp 2007-07-13 02:10:45.000000000 -0400
+@@ -41,6 +41,7 @@
+ #include <qdir.h>
+ #include <qstring.h>
+ #include <qstringlist.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp rosegarden-1.5.1/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+--- rosegarden-1.5.1~/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp 2007-07-13 02:09:57.000000000 -0400
+@@ -54,6 +54,7 @@
+ #include <qsignalmapper.h>
+ #include <qstring.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/segment/CompositionModelImpl.cpp rosegarden-1.5.1/src/gui/editors/segment/CompositionModelImpl.cpp
+--- rosegarden-1.5.1~/src/gui/editors/segment/CompositionModelImpl.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/segment/CompositionModelImpl.cpp 2007-07-13 02:10:15.000000000 -0400
+@@ -23,6 +23,7 @@
+ */
+
+ #include <cmath>
++#include <algorithm>
+ #include "CompositionModelImpl.h"
+
+ #include "base/BaseProperties.h"
+diff -urNad rosegarden-1.5.1~/src/gui/editors/segment/CompositionView.cpp rosegarden-1.5.1/src/gui/editors/segment/CompositionView.cpp
+--- rosegarden-1.5.1~/src/gui/editors/segment/CompositionView.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/segment/CompositionView.cpp 2007-07-13 02:10:15.000000000 -0400
+@@ -65,6 +65,7 @@
+ #include <qwidget.h>
+ #include <kapplication.h>
+ #include <kconfig.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/general/LinedStaff.cpp rosegarden-1.5.1/src/gui/general/LinedStaff.cpp
+--- rosegarden-1.5.1~/src/gui/general/LinedStaff.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/general/LinedStaff.cpp 2007-07-13 02:11:24.000000000 -0400
+@@ -43,6 +43,7 @@
+ #include <qpen.h>
+ #include <qrect.h>
+ #include <qstring.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/rulers/ControlRuler.cpp rosegarden-1.5.1/src/gui/rulers/ControlRuler.cpp
+--- rosegarden-1.5.1~/src/gui/rulers/ControlRuler.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/rulers/ControlRuler.cpp 2007-07-13 02:11:14.000000000 -0400
+@@ -49,6 +49,7 @@
+ #include <qscrollview.h>
+ #include <qstring.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/seqmanager/MetronomeMmapper.cpp rosegarden-1.5.1/src/gui/seqmanager/MetronomeMmapper.cpp
+--- rosegarden-1.5.1~/src/gui/seqmanager/MetronomeMmapper.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/seqmanager/MetronomeMmapper.cpp 2007-07-13 02:11:38.000000000 -0400
+@@ -43,6 +43,7 @@
+ #include <kconfig.h>
+ #include <kglobal.h>
+ #include <qstring.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/seqmanager/SequenceManager.cpp rosegarden-1.5.1/src/gui/seqmanager/SequenceManager.cpp
+--- rosegarden-1.5.1~/src/gui/seqmanager/SequenceManager.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/seqmanager/SequenceManager.cpp 2007-07-13 02:11:38.000000000 -0400
+@@ -76,6 +76,7 @@
+ #include <qstring.h>
+ #include <qstringlist.h>
+ #include <qtimer.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/studio/AudioPluginOSCGUI.cpp rosegarden-1.5.1/src/gui/studio/AudioPluginOSCGUI.cpp
+--- rosegarden-1.5.1~/src/gui/studio/AudioPluginOSCGUI.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/studio/AudioPluginOSCGUI.cpp 2007-07-13 02:08:52.000000000 -0400
+@@ -35,6 +35,7 @@
+ #include <qdir.h>
+ #include <qfileinfo.h>
+ #include <qstring.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/studio/DeviceEditorDialog.cpp rosegarden-1.5.1/src/gui/studio/DeviceEditorDialog.cpp
+--- rosegarden-1.5.1~/src/gui/studio/DeviceEditorDialog.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/studio/DeviceEditorDialog.cpp 2007-07-13 02:08:52.000000000 -0400
+@@ -49,6 +49,7 @@
+ #include <qtable.h>
+ #include <qvbox.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/studio/MidiProgramsEditor.cpp rosegarden-1.5.1/src/gui/studio/MidiProgramsEditor.cpp
+--- rosegarden-1.5.1~/src/gui/studio/MidiProgramsEditor.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/studio/MidiProgramsEditor.cpp 2007-07-13 02:08:52.000000000 -0400
+@@ -54,6 +54,7 @@
+ #include <qtooltip.h>
+ #include <qvgroupbox.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/gui/widgets/HSpinBox.cpp rosegarden-1.5.1/src/gui/widgets/HSpinBox.cpp
+--- rosegarden-1.5.1~/src/gui/widgets/HSpinBox.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/widgets/HSpinBox.cpp 2007-07-13 02:09:22.000000000 -0400
+@@ -27,6 +27,7 @@
+
+ #include <qstring.h>
+ #include <cmath>
++#include <algorithm>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/sound/AudioFileManager.cpp rosegarden-1.5.1/src/sound/AudioFileManager.cpp
+--- rosegarden-1.5.1~/src/sound/AudioFileManager.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/AudioFileManager.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <string>
+ #include <dirent.h> // for new recording file
+ #include <cstdio> // sprintf
++#include <cstdlib>
+ #include <pthread.h>
+
+ #if (__GNUC__ < 3)
+diff -urNad rosegarden-1.5.1~/src/sound/DSSIPluginFactory.cpp rosegarden-1.5.1/src/sound/DSSIPluginFactory.cpp
+--- rosegarden-1.5.1~/src/sound/DSSIPluginFactory.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/DSSIPluginFactory.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -21,6 +21,7 @@
+
+ #include "DSSIPluginFactory.h"
+ #include <iostream>
++#include <cstdlib>
+
+ #ifdef HAVE_DSSI
+
+diff -urNad rosegarden-1.5.1~/src/sound/DSSIPluginInstance.cpp rosegarden-1.5.1/src/sound/DSSIPluginInstance.cpp
+--- rosegarden-1.5.1~/src/sound/DSSIPluginInstance.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/DSSIPluginInstance.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -21,6 +21,7 @@
+
+ #include <iostream>
+ #include <cassert>
++#include <cstdlib>
+
+ #include "DSSIPluginInstance.h"
+ #include "PluginIdentifier.h"
+diff -urNad rosegarden-1.5.1~/src/sound/LADSPAPluginFactory.cpp rosegarden-1.5.1/src/sound/LADSPAPluginFactory.cpp
+--- rosegarden-1.5.1~/src/sound/LADSPAPluginFactory.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/LADSPAPluginFactory.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -21,6 +21,7 @@
+
+ #include "LADSPAPluginFactory.h"
+ #include <iostream>
++#include <cstdlib>
+
+ #ifdef HAVE_LADSPA
+
+diff -urNad rosegarden-1.5.1~/src/sound/PeakFile.cpp rosegarden-1.5.1/src/sound/PeakFile.cpp
+--- rosegarden-1.5.1~/src/sound/PeakFile.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/PeakFile.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -19,6 +19,7 @@
+ */
+
+ #include <cmath>
++#include <cstdlib>
+ #include <kapplication.h>
+
+ #include <qdatetime.h>
+diff -urNad rosegarden-1.5.1~/src/sound/RecordableAudioFile.cpp rosegarden-1.5.1/src/sound/RecordableAudioFile.cpp
+--- rosegarden-1.5.1~/src/sound/RecordableAudioFile.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/RecordableAudioFile.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -21,6 +21,8 @@
+
+ #include "RecordableAudioFile.h"
+
++#include <cstdlib>
++
+ //#define DEBUG_RECORDABLE 1
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/sound/SampleWindow.h rosegarden-1.5.1/src/sound/SampleWindow.h
+--- rosegarden-1.5.1~/src/sound/SampleWindow.h 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/SampleWindow.h 2007-07-13 02:06:35.000000000 -0400
+@@ -41,6 +41,7 @@
+ #define _SAMPLE_WINDOW_H_
+
+ #include <cmath>
++#include <cstdlib>
+ #include <iostream>
+ #include <map>
+
Added: rosegarden/trunk/debian/patches/20-gcc-4.2.dpatch
===================================================================
--- rosegarden/trunk/debian/patches/20-gcc-4.2.dpatch (rev 0)
+++ rosegarden/trunk/debian/patches/20-gcc-4.2.dpatch 2007-07-13 06:15:19 UTC (rev 1506)
@@ -0,0 +1,380 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-gcc-4.2.dpatch by <stew at vireo.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad rosegarden-1.5.1~/src/base/Composition.cpp rosegarden-1.5.1/src/base/Composition.cpp
+--- rosegarden-1.5.1~/src/base/Composition.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/Composition.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -31,6 +31,7 @@
+ #include <iomanip>
+ #include <algorithm>
+ #include <cmath>
++#include <typeinfo>
+
+ #if (__GNUC__ < 3)
+ #include <strstream>
+diff -urNad rosegarden-1.5.1~/src/base/Event.cpp rosegarden-1.5.1/src/base/Event.cpp
+--- rosegarden-1.5.1~/src/base/Event.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/Event.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -442,4 +442,4 @@
+ else return a.getSubOrdering() < b.getSubOrdering();
+ }
+
+-}
+\ No newline at end of file
++}
+diff -urNad rosegarden-1.5.1~/src/base/MidiDevice.cpp rosegarden-1.5.1/src/base/MidiDevice.cpp
+--- rosegarden-1.5.1~/src/base/MidiDevice.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/MidiDevice.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include "ControlParameter.h"
+
+ #include <cstdio>
++#include <cstdlib>
+ #include <iostream>
+ #include <set>
+
+diff -urNad rosegarden-1.5.1~/src/base/Property.cpp rosegarden-1.5.1/src/base/Property.cpp
+--- rosegarden-1.5.1~/src/base/Property.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/Property.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -22,6 +22,7 @@
+
+ #include "Property.h"
+ #include <cstdio>
++#include <cstdlib>
+ #include <string>
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/base/Segment.cpp rosegarden-1.5.1/src/base/Segment.cpp
+--- rosegarden-1.5.1~/src/base/Segment.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/Segment.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -30,6 +30,7 @@
+ #include <algorithm>
+ #include <iterator>
+ #include <cstdio>
++#include <typeinfo>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/base/SoftSynthDevice.cpp rosegarden-1.5.1/src/base/SoftSynthDevice.cpp
+--- rosegarden-1.5.1~/src/base/SoftSynthDevice.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/SoftSynthDevice.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include "MidiTypes.h"
+
+ #include <cstdio>
++#include <cstdlib>
+
+
+ #if (__GNUC__ < 3)
+diff -urNad rosegarden-1.5.1~/src/base/XmlExportable.cpp rosegarden-1.5.1/src/base/XmlExportable.cpp
+--- rosegarden-1.5.1~/src/base/XmlExportable.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/base/XmlExportable.cpp 2007-07-13 02:07:10.000000000 -0400
+@@ -20,6 +20,7 @@
+
+ #include "XmlExportable.h"
+ #include <iostream>
++#include <cstdlib>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/gui/application/LircClient.cpp rosegarden-1.5.1/src/gui/application/LircClient.cpp
+--- rosegarden-1.5.1~/src/gui/application/LircClient.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/application/LircClient.cpp 2007-07-13 02:07:53.000000000 -0400
+@@ -35,6 +35,7 @@
+ #include <qobject.h>
+ #include <qsocketnotifier.h>
+ #include <fcntl.h>
++#include <cstdlib>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/gui/application/RosegardenApplication.cpp rosegarden-1.5.1/src/gui/application/RosegardenApplication.cpp
+--- rosegarden-1.5.1~/src/gui/application/RosegardenApplication.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/application/RosegardenApplication.cpp 2007-07-13 02:07:53.000000000 -0400
+@@ -142,4 +142,4 @@
+
+ }
+
+-#include "RosegardenApplication.moc"
+\ No newline at end of file
++#include "RosegardenApplication.moc"
+diff -urNad rosegarden-1.5.1~/src/gui/configuration/NotationConfigurationPage.cpp rosegarden-1.5.1/src/gui/configuration/NotationConfigurationPage.cpp
+--- rosegarden-1.5.1~/src/gui/configuration/NotationConfigurationPage.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/configuration/NotationConfigurationPage.cpp 2007-07-13 02:11:52.000000000 -0400
+@@ -59,6 +59,7 @@
+ #include <qstringlist.h>
+ #include <qtabwidget.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/dialogs/KeySignatureDialog.cpp rosegarden-1.5.1/src/gui/dialogs/KeySignatureDialog.cpp
+--- rosegarden-1.5.1~/src/gui/dialogs/KeySignatureDialog.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/dialogs/KeySignatureDialog.cpp 2007-07-13 02:09:11.000000000 -0400
+@@ -43,6 +43,7 @@
+ #include <qtooltip.h>
+ #include <qvbox.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/eventlist/EventView.cpp rosegarden-1.5.1/src/gui/editors/eventlist/EventView.cpp
+--- rosegarden-1.5.1~/src/gui/editors/eventlist/EventView.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/eventlist/EventView.cpp 2007-07-13 02:11:00.000000000 -0400
+@@ -85,6 +85,7 @@
+ #include <qsize.h>
+ #include <qstring.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/guitar/BarreList.cpp rosegarden-1.5.1/src/gui/editors/guitar/BarreList.cpp
+--- rosegarden-1.5.1~/src/gui/editors/guitar/BarreList.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/guitar/BarreList.cpp 2007-07-13 02:10:33.000000000 -0400
+@@ -1,5 +1,7 @@
+ #include "BarreList.h"
+
++#include <algorithm>
++
+ namespace Rosegarden
+ {
+
+diff -urNad rosegarden-1.5.1~/src/gui/editors/guitar/ChordName.cpp rosegarden-1.5.1/src/gui/editors/guitar/ChordName.cpp
+--- rosegarden-1.5.1~/src/gui/editors/guitar/ChordName.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/guitar/ChordName.cpp 2007-07-13 02:10:33.000000000 -0400
+@@ -1,6 +1,7 @@
+ #include "ChordName.h"
+ #include "base/Exception.h"
+
++#include <algorithm>
+ #include <sstream>
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/notation/NotationView.cpp rosegarden-1.5.1/src/gui/editors/notation/NotationView.cpp
+--- rosegarden-1.5.1~/src/gui/editors/notation/NotationView.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/notation/NotationView.cpp 2007-07-13 02:10:45.000000000 -0400
+@@ -205,6 +205,7 @@
+ #include <qtimer.h>
+ #include <qwidget.h>
+ #include <qvalidator.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/notation/NoteFontFactory.cpp rosegarden-1.5.1/src/gui/editors/notation/NoteFontFactory.cpp
+--- rosegarden-1.5.1~/src/gui/editors/notation/NoteFontFactory.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/notation/NoteFontFactory.cpp 2007-07-13 02:10:45.000000000 -0400
+@@ -41,6 +41,7 @@
+ #include <qdir.h>
+ #include <qstring.h>
+ #include <qstringlist.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp rosegarden-1.5.1/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+--- rosegarden-1.5.1~/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp 2007-07-13 02:09:57.000000000 -0400
+@@ -54,6 +54,7 @@
+ #include <qsignalmapper.h>
+ #include <qstring.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/editors/segment/CompositionModelImpl.cpp rosegarden-1.5.1/src/gui/editors/segment/CompositionModelImpl.cpp
+--- rosegarden-1.5.1~/src/gui/editors/segment/CompositionModelImpl.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/segment/CompositionModelImpl.cpp 2007-07-13 02:10:15.000000000 -0400
+@@ -23,6 +23,7 @@
+ */
+
+ #include <cmath>
++#include <algorithm>
+ #include "CompositionModelImpl.h"
+
+ #include "base/BaseProperties.h"
+diff -urNad rosegarden-1.5.1~/src/gui/editors/segment/CompositionView.cpp rosegarden-1.5.1/src/gui/editors/segment/CompositionView.cpp
+--- rosegarden-1.5.1~/src/gui/editors/segment/CompositionView.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/editors/segment/CompositionView.cpp 2007-07-13 02:10:15.000000000 -0400
+@@ -65,6 +65,7 @@
+ #include <qwidget.h>
+ #include <kapplication.h>
+ #include <kconfig.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/general/LinedStaff.cpp rosegarden-1.5.1/src/gui/general/LinedStaff.cpp
+--- rosegarden-1.5.1~/src/gui/general/LinedStaff.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/general/LinedStaff.cpp 2007-07-13 02:11:24.000000000 -0400
+@@ -43,6 +43,7 @@
+ #include <qpen.h>
+ #include <qrect.h>
+ #include <qstring.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/rulers/ControlRuler.cpp rosegarden-1.5.1/src/gui/rulers/ControlRuler.cpp
+--- rosegarden-1.5.1~/src/gui/rulers/ControlRuler.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/rulers/ControlRuler.cpp 2007-07-13 02:11:14.000000000 -0400
+@@ -49,6 +49,7 @@
+ #include <qscrollview.h>
+ #include <qstring.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/seqmanager/MetronomeMmapper.cpp rosegarden-1.5.1/src/gui/seqmanager/MetronomeMmapper.cpp
+--- rosegarden-1.5.1~/src/gui/seqmanager/MetronomeMmapper.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/seqmanager/MetronomeMmapper.cpp 2007-07-13 02:11:38.000000000 -0400
+@@ -43,6 +43,7 @@
+ #include <kconfig.h>
+ #include <kglobal.h>
+ #include <qstring.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/seqmanager/SequenceManager.cpp rosegarden-1.5.1/src/gui/seqmanager/SequenceManager.cpp
+--- rosegarden-1.5.1~/src/gui/seqmanager/SequenceManager.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/seqmanager/SequenceManager.cpp 2007-07-13 02:11:38.000000000 -0400
+@@ -76,6 +76,7 @@
+ #include <qstring.h>
+ #include <qstringlist.h>
+ #include <qtimer.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/studio/AudioPluginOSCGUI.cpp rosegarden-1.5.1/src/gui/studio/AudioPluginOSCGUI.cpp
+--- rosegarden-1.5.1~/src/gui/studio/AudioPluginOSCGUI.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/studio/AudioPluginOSCGUI.cpp 2007-07-13 02:08:52.000000000 -0400
+@@ -35,6 +35,7 @@
+ #include <qdir.h>
+ #include <qfileinfo.h>
+ #include <qstring.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/studio/DeviceEditorDialog.cpp rosegarden-1.5.1/src/gui/studio/DeviceEditorDialog.cpp
+--- rosegarden-1.5.1~/src/gui/studio/DeviceEditorDialog.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/studio/DeviceEditorDialog.cpp 2007-07-13 02:08:52.000000000 -0400
+@@ -49,6 +49,7 @@
+ #include <qtable.h>
+ #include <qvbox.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/gui/studio/MidiProgramsEditor.cpp rosegarden-1.5.1/src/gui/studio/MidiProgramsEditor.cpp
+--- rosegarden-1.5.1~/src/gui/studio/MidiProgramsEditor.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/studio/MidiProgramsEditor.cpp 2007-07-13 02:08:52.000000000 -0400
+@@ -54,6 +54,7 @@
+ #include <qtooltip.h>
+ #include <qvgroupbox.h>
+ #include <qwidget.h>
++#include <algorithm>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/gui/widgets/HSpinBox.cpp rosegarden-1.5.1/src/gui/widgets/HSpinBox.cpp
+--- rosegarden-1.5.1~/src/gui/widgets/HSpinBox.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/gui/widgets/HSpinBox.cpp 2007-07-13 02:09:22.000000000 -0400
+@@ -27,6 +27,7 @@
+
+ #include <qstring.h>
+ #include <cmath>
++#include <algorithm>
+
+ namespace Rosegarden
+ {
+diff -urNad rosegarden-1.5.1~/src/sound/AudioFileManager.cpp rosegarden-1.5.1/src/sound/AudioFileManager.cpp
+--- rosegarden-1.5.1~/src/sound/AudioFileManager.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/AudioFileManager.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <string>
+ #include <dirent.h> // for new recording file
+ #include <cstdio> // sprintf
++#include <cstdlib>
+ #include <pthread.h>
+
+ #if (__GNUC__ < 3)
+diff -urNad rosegarden-1.5.1~/src/sound/DSSIPluginFactory.cpp rosegarden-1.5.1/src/sound/DSSIPluginFactory.cpp
+--- rosegarden-1.5.1~/src/sound/DSSIPluginFactory.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/DSSIPluginFactory.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -21,6 +21,7 @@
+
+ #include "DSSIPluginFactory.h"
+ #include <iostream>
++#include <cstdlib>
+
+ #ifdef HAVE_DSSI
+
+diff -urNad rosegarden-1.5.1~/src/sound/DSSIPluginInstance.cpp rosegarden-1.5.1/src/sound/DSSIPluginInstance.cpp
+--- rosegarden-1.5.1~/src/sound/DSSIPluginInstance.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/DSSIPluginInstance.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -21,6 +21,7 @@
+
+ #include <iostream>
+ #include <cassert>
++#include <cstdlib>
+
+ #include "DSSIPluginInstance.h"
+ #include "PluginIdentifier.h"
+diff -urNad rosegarden-1.5.1~/src/sound/LADSPAPluginFactory.cpp rosegarden-1.5.1/src/sound/LADSPAPluginFactory.cpp
+--- rosegarden-1.5.1~/src/sound/LADSPAPluginFactory.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/LADSPAPluginFactory.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -21,6 +21,7 @@
+
+ #include "LADSPAPluginFactory.h"
+ #include <iostream>
++#include <cstdlib>
+
+ #ifdef HAVE_LADSPA
+
+diff -urNad rosegarden-1.5.1~/src/sound/PeakFile.cpp rosegarden-1.5.1/src/sound/PeakFile.cpp
+--- rosegarden-1.5.1~/src/sound/PeakFile.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/PeakFile.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -19,6 +19,7 @@
+ */
+
+ #include <cmath>
++#include <cstdlib>
+ #include <kapplication.h>
+
+ #include <qdatetime.h>
+diff -urNad rosegarden-1.5.1~/src/sound/RecordableAudioFile.cpp rosegarden-1.5.1/src/sound/RecordableAudioFile.cpp
+--- rosegarden-1.5.1~/src/sound/RecordableAudioFile.cpp 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/RecordableAudioFile.cpp 2007-07-13 02:06:35.000000000 -0400
+@@ -21,6 +21,8 @@
+
+ #include "RecordableAudioFile.h"
+
++#include <cstdlib>
++
+ //#define DEBUG_RECORDABLE 1
+
+ namespace Rosegarden
+diff -urNad rosegarden-1.5.1~/src/sound/SampleWindow.h rosegarden-1.5.1/src/sound/SampleWindow.h
+--- rosegarden-1.5.1~/src/sound/SampleWindow.h 2007-03-13 08:50:32.000000000 -0400
++++ rosegarden-1.5.1/src/sound/SampleWindow.h 2007-07-13 02:06:35.000000000 -0400
+@@ -41,6 +41,7 @@
+ #define _SAMPLE_WINDOW_H_
+
+ #include <cmath>
++#include <cstdlib>
+ #include <iostream>
+ #include <map>
+
Property changes on: rosegarden/trunk/debian/patches/20-gcc-4.2.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Demudi-commits
mailing list