rpms/rosegarden4/devel rosegarden-1.6.1-gcc43.patch, NONE, 1.1 rosegarden4.spec, 1.8, 1.9
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Apr 2 16:00:09 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/rosegarden4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7145
Modified Files:
rosegarden4.spec
Added Files:
rosegarden-1.6.1-gcc43.patch
Log Message:
* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.1-2
- fix rawhide build (#434424)
- drop: Requires: kdebase3 (don't want a hard dep here)
- drop scriptlet deps (undesirable)
- fix 64bit platform %if
rosegarden-1.6.1-gcc43.patch:
--- NEW FILE rosegarden-1.6.1-gcc43.patch ---
diff -up rosegarden-1.6.1/src/base/AudioPluginInstance.cpp.gcc43 rosegarden-1.6.1/src/base/AudioPluginInstance.cpp
--- rosegarden-1.6.1/src/base/AudioPluginInstance.cpp.gcc43 2007-12-19 07:42:34.000000000 -0600
+++ rosegarden-1.6.1/src/base/AudioPluginInstance.cpp 2008-04-02 10:17:51.000000000 -0500
@@ -22,6 +22,7 @@
#include "Instrument.h"
#include <iostream>
+#include <cstring>
#if (__GNUC__ < 3)
#include <strstream>
diff -up rosegarden-1.6.1/src/base/ScriptAPI.h.gcc43 rosegarden-1.6.1/src/base/ScriptAPI.h
--- rosegarden-1.6.1/src/base/ScriptAPI.h.gcc43 2007-12-19 07:42:34.000000000 -0600
+++ rosegarden-1.6.1/src/base/ScriptAPI.h 2008-04-02 10:29:21.000000000 -0500
@@ -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 id2);
- std::string getEventType(ScriptId id, EventId id);
+ std::string getEventType(ScriptId id, EventId id2);
std::string getProperty(ScriptId id, EventId event, std::string property);
void setProperty(ScriptId id, EventId event, std::string property, std::string value);
diff -up rosegarden-1.6.1/src/base/XmlExportable.cpp.gcc43 rosegarden-1.6.1/src/base/XmlExportable.cpp
--- rosegarden-1.6.1/src/base/XmlExportable.cpp.gcc43 2007-12-19 07:42:34.000000000 -0600
+++ rosegarden-1.6.1/src/base/XmlExportable.cpp 2008-04-02 10:29:47.000000000 -0500
@@ -21,6 +21,7 @@
#include "XmlExportable.h"
#include <iostream>
#include <cstdlib>
+#include <cstring>
namespace Rosegarden
{
diff -up rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp.gcc43 rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp
--- rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp.gcc43 2007-12-19 07:42:35.000000000 -0600
+++ rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp 2008-04-02 10:47:16.000000000 -0500
@@ -59,6 +59,7 @@
#include <qstringlist.h>
#include <qtabwidget.h>
#include <qwidget.h>
+#include <algorithm>
namespace Rosegarden
diff -up rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp.gcc43 rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp
--- rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp.gcc43 2007-12-19 07:42:35.000000000 -0600
+++ rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp 2008-04-02 10:48:06.000000000 -0500
@@ -44,6 +44,7 @@
#include <qvbox.h>
#include <qwidget.h>
#include <qcheckbox.h>
+#include <algorithm>
namespace Rosegarden
diff -up rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp.gcc43 rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp
--- rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp.gcc43 2007-12-19 07:42:38.000000000 -0600
+++ rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp 2008-04-02 10:55:09.000000000 -0500
@@ -28,6 +28,7 @@
#include "OSCMessage.h"
#include <cstdlib>
+#include <cstring>
namespace Rosegarden
{
diff -up rosegarden-1.6.1/src/sound/RingBuffer.h.gcc43 rosegarden-1.6.1/src/sound/RingBuffer.h
--- rosegarden-1.6.1/src/sound/RingBuffer.h.gcc43 2007-12-19 07:42:39.000000000 -0600
+++ rosegarden-1.6.1/src/sound/RingBuffer.h 2008-04-02 10:31:07.000000000 -0500
@@ -24,6 +24,7 @@
#include <sys/types.h>
#include <sys/mman.h>
+#include <cstring>
#include "Scavenger.h"
Index: rosegarden4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/rosegarden4.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rosegarden4.spec 26 Feb 2008 00:18:49 -0000 1.8
+++ rosegarden4.spec 2 Apr 2008 15:59:30 -0000 1.9
@@ -1,16 +1,17 @@
Name: rosegarden4
Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MIDI, audio and notation editor
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.rosegardenmusic.com/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2
Patch0: rosegarden-1.6.0-fix-cmake-optflags.patch
Patch1: rosegarden-1.5.1-desktop-file.patch
Patch2: rosegarden-1.5.1-lib64.patch
+Patch3: rosegarden-1.6.1-gcc43.patch
BuildRequires: cmake
BuildRequires: gettext
@@ -24,10 +25,6 @@
BuildRequires: dssi-devel
BuildRequires: lirc-devel
-Requires: kdebase3
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
%description
Rosegarden is a professional audio and MIDI sequencer, score editor, and
general purpose music composition and editing environment.
@@ -39,10 +36,11 @@
%setup -q -n rosegarden-%{version}
%patch0 -p1
%patch1 -p1
-# Look for LADSPA/DSSI plugins in the correct place on x86_64
-%ifarch x86_64
+# Look for LADSPA/DSSI plugins in the correct place on 64bit platforms
+%if "%{_lib}" == "lib64"
%patch2 -p1
%endif
+%patch3 -p1 -b .gcc43
%build
%cmake .
@@ -111,6 +109,12 @@
%{_datadir}/mimelnk/audio/x-soundfont.desktop
%changelog
+* Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.1-2
+- fix rawhide build (#434424)
+- drop: Requires: kdebase3 (don't want a hard dep here)
+- drop scriptlet deps (undesirable)
+- fix 64bit platform %%if
+
* Wed Feb 13 2008 Callum Lerwick <seg at haxxed.com> - 1.6.1-1
- New upstream version.
More information about the fedora-extras-commits
mailing list