Hello community,
here is the log from the commit of package rosegarden4
checked in at Fri Nov 9 00:44:53 CET 2007.
--------
--- rosegarden4/rosegarden4.changes 2007-09-03 18:02:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/rosegarden4/rosegarden4.changes 2007-11-07 14:40:24.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 7 17:46:36 CET 2007 - tiwai@suse.de
+
+- fix build with gcc 4.3.
+
+-------------------------------------------------------------------
New:
----
rosegarden-gcc43-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rosegarden4.spec ++++++
--- /var/tmp/diff_new_pack.D16982/_old 2007-11-09 00:44:23.000000000 +0100
+++ /var/tmp/diff_new_pack.D16982/_new 2007-11-09 00:44:23.000000000 +0100
@@ -14,14 +14,15 @@
BuildRequires: cmake dssi fdupes fftw3-devel kdelibs3-devel kdemultimedia3-sound ladspa-devel liblo-devel liblrdf-devel libraptor-devel
Summary: MIDI/Audio Sequencer and Notation Editor
Version: 1.5.1
-Release: 70
+Release: 104
License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Midi
Source: rosegarden-%{version}.tar.bz2
Source1: rosegarden.desktop
Patch: rosegarden-%{version}.diff
+Patch1: rosegarden-gcc43-fixes.diff
Requires: ladspa libsndfile-progs
-URL: http://www.rosegardenmusic.com/
+Url: http://www.rosegardenmusic.com/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -44,6 +45,7 @@
%prep
%setup -q -n rosegarden-%{version}
%patch
+%patch1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -58,7 +60,6 @@
rm -f $RPM_BUILD_ROOT/opt/kde3/share/applications/*.desktop
%suse_update_desktop_file -D rosegarden -i rosegarden AudioVideo Sequencer
%find_lang rosegarden
-
%fdupes -s $RPM_BUILD_ROOT
%clean
@@ -73,8 +74,9 @@
/opt/kde3/share/apps/rosegarden
/opt/kde3/share/icons/*
/opt/kde3/share/mimelnk/audio/*
-
%changelog
+* Wed Nov 07 2007 - tiwai@suse.de
+- fix build with gcc 4.3.
* Mon Sep 03 2007 - schwab@suse.de
- Fix broken compiler flags.
- Fix undefined operation.
++++++ rosegarden-gcc43-fixes.diff ++++++
--- src/gui/dialogs/KeySignatureDialog.cpp-dist 2007-11-07 17:26:43.000000000 +0100
+++ src/gui/dialogs/KeySignatureDialog.cpp 2007-11-07 17:26:49.000000000 +0100
@@ -24,6 +24,7 @@
#include "KeySignatureDialog.h"
+#include <algorithm>
#include
#include "misc/Strings.h"
--- src/gui/editors/notation/NoteFontFactory.cpp-dist 2007-11-07 17:28:47.000000000 +0100
+++ src/gui/editors/notation/NoteFontFactory.cpp 2007-11-07 17:28:56.000000000 +0100
@@ -26,6 +26,7 @@
#include "NoteFontFactory.h"
#include "misc/Debug.h"
#include
+#include <algorithm>
#include
#include
--- src/gui/editors/notation/NotationView.cpp-dist 2007-11-07 17:28:14.000000000 +0100
+++ src/gui/editors/notation/NotationView.cpp 2007-11-07 17:28:28.000000000 +0100
@@ -170,6 +170,7 @@
#include "RestInserter.h"
#include "sound/MappedEvent.h"
#include "TextInserter.h"
+#include <algorithm>
#include
#include
#include
--- src/gui/editors/segment/CompositionView.cpp-dist 2007-11-07 17:29:58.000000000 +0100
+++ src/gui/editors/segment/CompositionView.cpp 2007-11-07 17:30:05.000000000 +0100
@@ -24,6 +24,7 @@
#include "CompositionView.h"
+#include <algorithm>
#include "misc/Debug.h"
#include "AudioPreviewThread.h"
--- src/gui/editors/segment/CompositionModelImpl.cpp-dist 2007-11-07 17:29:40.000000000 +0100
+++ src/gui/editors/segment/CompositionModelImpl.cpp 2007-11-07 17:29:48.000000000 +0100
@@ -23,6 +23,7 @@
*/
#include <cmath>
+#include <algorithm>
#include "CompositionModelImpl.h"
#include "base/BaseProperties.h"
--- src/gui/editors/eventlist/EventView.cpp-dist 2007-11-07 17:26:57.000000000 +0100
+++ src/gui/editors/eventlist/EventView.cpp 2007-11-07 17:27:16.000000000 +0100
@@ -59,6 +59,7 @@
#include "gui/general/MidiPitchLabel.h"
#include "gui/kdeext/KTmpStatusMsg.h"
#include "gui/dialogs/EventFilterDialog.h"
+#include <algorithm>
#include
#include
#include
--- src/gui/editors/guitar/ChordName.cpp-dist 2007-11-07 17:27:53.000000000 +0100
+++ src/gui/editors/guitar/ChordName.cpp 2007-11-07 17:28:00.000000000 +0100
@@ -2,6 +2,7 @@
#include "base/Exception.h"
#include <sstream>
+#include <algorithm>
namespace Rosegarden
{
--- src/gui/editors/guitar/BarreList.cpp-dist 2007-11-07 17:27:33.000000000 +0100
+++ src/gui/editors/guitar/BarreList.cpp 2007-11-07 17:27:43.000000000 +0100
@@ -1,4 +1,5 @@
#include "BarreList.h"
+#include <algorithm>
namespace Rosegarden
{
--- src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp-dist 2007-11-07 17:29:07.000000000 +0100
+++ src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp 2007-11-07 17:29:13.000000000 +0100
@@ -25,6 +25,7 @@
#include "MIDIInstrumentParameterPanel.h"
#include
+#include <algorithm>
#include "sound/Midi.h"
#include
--- src/gui/configuration/NotationConfigurationPage.cpp-dist 2007-10-22 16:49:09.000000000 +0200
+++ src/gui/configuration/NotationConfigurationPage.cpp 2007-11-07 17:26:22.000000000 +0100
@@ -24,6 +24,7 @@
#include "NotationConfigurationPage.h"
+#include <algorithm>
#include
#include "misc/Strings.h"
--- src/gui/general/LinedStaff.cpp-dist 2007-11-07 17:30:25.000000000 +0100
+++ src/gui/general/LinedStaff.cpp 2007-11-07 17:30:31.000000000 +0100
@@ -24,6 +24,7 @@
#include "LinedStaff.h"
+#include <algorithm>
#include "misc/Debug.h"
#include "base/Event.h"
--- src/gui/seqmanager/MetronomeMmapper.cpp-dist 2007-11-07 17:31:03.000000000 +0100
+++ src/gui/seqmanager/MetronomeMmapper.cpp 2007-11-07 17:31:10.000000000 +0100
@@ -26,6 +26,7 @@
#include "MetronomeMmapper.h"
#include "misc/Debug.h"
#include
+#include <algorithm>
#include "sound/Midi.h"
#include
--- src/gui/seqmanager/SequenceManager.cpp-dist 2007-11-07 17:31:16.000000000 +0100
+++ src/gui/seqmanager/SequenceManager.cpp 2007-11-07 17:31:25.000000000 +0100
@@ -24,6 +24,7 @@
#include "SequenceManager.h"
+#include <algorithm>
#include "sound/Midi.h"
#include "misc/Debug.h"
--- src/gui/rulers/ControlRuler.cpp-dist 2007-11-07 17:30:43.000000000 +0100
+++ src/gui/rulers/ControlRuler.cpp 2007-11-07 17:30:50.000000000 +0100
@@ -24,6 +24,7 @@
#include "ControlRuler.h"
+#include <algorithm>
#include "base/Event.h"
#include "misc/Debug.h"
--- src/gui/rulers/VelocityColour.cpp-dist 2007-11-07 17:47:05.000000000 +0100
+++ src/gui/rulers/VelocityColour.cpp 2007-11-07 17:47:48.000000000 +0100
@@ -102,7 +102,7 @@
( m_loStartGreen + m_loStepGreen * value ) / m_multiplyFactor,
( m_loStartBlue + m_loStepBlue * value ) / m_multiplyFactor);
- } else if (value >= m_mediumKnee < m_loudKnee) {
+ } else if (value >= m_mediumKnee && value < m_loudKnee) {
int mixFactor = value - m_mediumKnee;
m_mixedColour.setRgb(
--- src/gui/studio/OSCMessage.cpp-dist 2007-10-22 16:43:56.000000000 +0200
+++ src/gui/studio/OSCMessage.cpp 2007-10-22 16:44:07.000000000 +0200
@@ -28,6 +28,7 @@
#include "OSCMessage.h"
#include <cstdlib>
+#include <cstring>
namespace Rosegarden
{
--- src/gui/studio/MidiProgramsEditor.cpp-dist 2007-11-07 17:31:55.000000000 +0100
+++ src/gui/studio/MidiProgramsEditor.cpp 2007-11-07 17:32:03.000000000 +0100
@@ -33,6 +33,7 @@
#include "base/MidiDevice.h"
#include "base/MidiProgram.h"
#include "gui/widgets/RosegardenPopupMenu.h"
+#include <algorithm>
#include
#include
#include
--- src/gui/studio/DeviceEditorDialog.cpp-dist 2007-11-07 17:31:38.000000000 +0100
+++ src/gui/studio/DeviceEditorDialog.cpp 2007-11-07 17:31:47.000000000 +0100
@@ -25,6 +25,7 @@
#include "DeviceEditorDialog.h"
+#include <algorithm>
#include
#include "misc/Debug.h"
#include "misc/Strings.h"
--- src/gui/studio/AudioPluginOSCGUI.cpp-dist 2007-10-22 16:42:40.000000000 +0200
+++ src/gui/studio/AudioPluginOSCGUI.cpp 2007-10-22 16:42:50.000000000 +0200
@@ -35,6 +35,7 @@
#include
#include
#include
+#include <cstdlib>
namespace Rosegarden
--- src/gui/widgets/HSpinBox.cpp-dist 2007-10-22 16:45:18.000000000 +0200
+++ src/gui/widgets/HSpinBox.cpp 2007-10-22 16:45:26.000000000 +0200
@@ -27,6 +27,7 @@
#include
#include <cmath>
+#include <cstdlib>
namespace Rosegarden
{
--- src/base/AudioPluginInstance.cpp-dist 2007-10-22 16:08:16.000000000 +0200
+++ src/base/AudioPluginInstance.cpp 2007-10-22 16:08:28.000000000 +0200
@@ -29,6 +29,7 @@
#else
#include <sstream>
#endif
+#include <cstring>
namespace Rosegarden
{
--- src/base/ScriptAPI.h-dist 2007-10-22 16:17:17.000000000 +0200
+++ src/base/ScriptAPI.h 2007-10-22 16:17:49.000000000 +0200
@@ -107,9 +107,9 @@ public:
EventId addEvent(ScriptId id,
std::string type, int bar, ScriptTime time, ScriptTime duration);
- void deleteEvent(ScriptId id, EventId id);
+ void deleteEvent(ScriptId id, EventId eid);
- std::string getEventType(ScriptId id, EventId id);
+ std::string getEventType(ScriptId id, EventId eid);
std::string getProperty(ScriptId id, EventId event, std::string property);
void setProperty(ScriptId id, EventId event, std::string property, std::string value);
--- src/base/Composition.cpp-dist 2007-10-22 16:11:20.000000000 +0200
+++ src/base/Composition.cpp 2007-10-22 16:12:00.000000000 +0200
@@ -31,6 +31,7 @@
#include <iomanip>
#include <algorithm>
#include <cmath>
+#include <typeinfo>
#if (__GNUC__ < 3)
#include <strstream>
--- src/base/MidiDevice.cpp-dist 2007-10-22 16:12:57.000000000 +0200
+++ src/base/MidiDevice.cpp 2007-10-22 16:13:17.000000000 +0200
@@ -25,6 +25,7 @@
#include "ControlParameter.h"
#include <cstdio>
+#include <cstdlib>
#include <iostream>
#include <set>
--- src/base/Segment.cpp-dist 2007-10-22 16:18:32.000000000 +0200
+++ src/base/Segment.cpp 2007-10-22 16:18:38.000000000 +0200
@@ -30,6 +30,7 @@
#include <algorithm>
#include <iterator>
#include <cstdio>
+#include <typeinfo>
namespace Rosegarden
{
--- src/base/Property.cpp-dist 2007-10-22 16:16:04.000000000 +0200
+++ src/base/Property.cpp 2007-10-22 16:16:19.000000000 +0200
@@ -22,6 +22,7 @@
#include "Property.h"
#include <cstdio>
+#include <cstdlib>
#include <string>
namespace Rosegarden
--- src/base/SoftSynthDevice.cpp-dist 2007-10-22 16:19:13.000000000 +0200
+++ src/base/SoftSynthDevice.cpp 2007-10-22 16:19:21.000000000 +0200
@@ -24,7 +24,7 @@
#include "MidiTypes.h"
#include <cstdio>
-
+#include <cstdlib>
#if (__GNUC__ < 3)
#include <strstream>
--- src/base/XmlExportable.cpp-dist 2007-10-22 16:19:59.000000000 +0200
+++ src/base/XmlExportable.cpp 2007-10-22 16:20:21.000000000 +0200
@@ -20,6 +20,8 @@
#include "XmlExportable.h"
#include <iostream>
+#include <cstring>
+#include <cstdlib>
namespace Rosegarden
{
--- src/sound/DSSIPluginFactory.cpp-dist 2007-10-22 16:27:19.000000000 +0200
+++ src/sound/DSSIPluginFactory.cpp 2007-10-22 16:27:24.000000000 +0200
@@ -21,6 +21,7 @@
#include "DSSIPluginFactory.h"
#include <iostream>
+#include <cstdlib>
#ifdef HAVE_DSSI
--- src/sound/AudioFileTimeStretcher.cpp-dist 2007-10-22 16:21:42.000000000 +0200
+++ src/sound/AudioFileTimeStretcher.cpp 2007-10-22 16:23:23.000000000 +0200
@@ -22,6 +22,7 @@
COPYING included with this distribution for more information.
*/
+#include <cstdlib>
#include "AudioFileTimeStretcher.h"
#include "AudioTimeStretcher.h"
#include "AudioFileManager.h"
--- src/sound/AudioTimeStretcher.cpp-dist 2007-10-22 16:26:35.000000000 +0200
+++ src/sound/AudioTimeStretcher.cpp 2007-10-22 16:26:45.000000000 +0200
@@ -18,6 +18,7 @@
#include <iostream>
#include <fstream>
#include <cassert>
+#include <cstring>
namespace Rosegarden
{
--- src/sound/PeakFile.cpp-dist 2007-10-22 16:29:33.000000000 +0200
+++ src/sound/PeakFile.cpp 2007-10-22 16:29:40.000000000 +0200
@@ -19,6 +19,7 @@
*/
#include <cmath>
+#include <cstdlib>
#include
#include
--- src/sound/SampleWindow.h-dist 2007-10-22 16:24:56.000000000 +0200
+++ src/sound/SampleWindow.h 2007-10-22 16:25:00.000000000 +0200
@@ -41,6 +41,7 @@
#define _SAMPLE_WINDOW_H_
#include <cmath>
+#include <cstdlib>
#include <iostream>
#include <map>
--- src/sound/LADSPAPluginFactory.cpp-dist 2007-10-22 16:28:05.000000000 +0200
+++ src/sound/LADSPAPluginFactory.cpp 2007-10-22 16:28:23.000000000 +0200
@@ -27,6 +27,7 @@
#include
#include
#include <cmath>
+#include <cstdlib>
#include "AudioPluginInstance.h"
#include "LADSPAPluginInstance.h"
--- src/sound/AudioFileManager.cpp-dist 2007-10-22 16:20:48.000000000 +0200
+++ src/sound/AudioFileManager.cpp 2007-10-22 16:53:12.000000000 +0200
@@ -25,6 +25,8 @@
#include <string>
#include // for new recording file
#include <cstdio> // sprintf
+#include <cstring>
+#include <cstdlib>
#include
#if (__GNUC__ < 3)
--- src/sound/RecordableAudioFile.cpp-dist 2007-10-22 16:29:47.000000000 +0200
+++ src/sound/RecordableAudioFile.cpp 2007-10-22 16:30:03.000000000 +0200
@@ -20,6 +20,7 @@
*/
#include "RecordableAudioFile.h"
+#include <cstdlib>
//#define DEBUG_RECORDABLE 1
--- src/sound/DSSIPluginInstance.cpp-dist 2007-10-22 16:27:30.000000000 +0200
+++ src/sound/DSSIPluginInstance.cpp 2007-10-22 16:27:55.000000000 +0200
@@ -21,6 +21,7 @@
#include <iostream>
#include <cassert>
+#include <cstdlib>
#include "DSSIPluginInstance.h"
#include "PluginIdentifier.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org