From 6d07c9d8f56a7903eb2aa66779a05a438c7d14a1 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Apr 23 2010 04:38:22 +0000 Subject: - Update to 10.04 - BR qt-devel instead of kdelibs-devel - Add release notes to %doc - Patch for build against qt-4.7 --- diff --git a/.cvsignore b/.cvsignore index 1a335e0..c128cf1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rosegarden-10.02.1.tar.bz2 +rosegarden-10.04.tar.bz2 diff --git a/rosegarden-10.04.txt b/rosegarden-10.04.txt new file mode 100644 index 0000000..e848143 --- /dev/null +++ b/rosegarden-10.04.txt @@ -0,0 +1,30 @@ +ROSEGARDEN 10.04, codename "Abraham Darby" RELEASED + +The Rosegarden team is proud to announce the release of version 10.04 of Rosegarden, an audio and MIDI sequencer and musical notation editor for Linux. + +http://www.rosegardenmusic.com/ + +This release marks 10 years since the creation of our project at SourceForge. Rosegarden itself has been around in one form or another since 1993, but the current codebase has survived longer than any previous incarnation of the project. Rosegarden has overcome many obstacles in the last 10 years, including the incredibly brutal transition to Qt 4. + +This is a routine maintenance release with a number of bug fixes. All users of 10.02 are recommended to update to 10.04. + + +Abraham Darby + +This release, “Abraham Darby”, is the first of a possible series titled after rose cultivars with interesting names. Long before contributing his name to a modern pink hybrid rose, Abraham Darby III was an English industrialist best known as the engineer and ironmaster for the Iron Bridge at Coalbrookdale in Shropshire, the world's first cast-iron arch bridge which opened in 1781. The bridge still stands and makes for a rather beautiful tourist attraction. + + +Changes Since 10.02 + +* Fixes to crashes and incorrect updating in the notation editor (Thorsten Alteholz, Yves Guillemot and Alexander Kulikov) + +* Restore duration-change shortcuts in notation forgotten in 10.02 (Thorsten Alteholz) + +* Various small efficiency improvements (Chris Cannam) + +* Fixes to LIRC support (Thorsten Alteholz and “Andrew”) + +* Fixed to configure process to permit user override of CXXFLAGS and improve platform compatibility (Chris Cannam and Orcan Ogetbil) + +* Minor improvements to desktop file definition (Dave Plater and Michael McIntyre) + diff --git a/rosegarden-qt47.patch b/rosegarden-qt47.patch new file mode 100644 index 0000000..2569e3e --- /dev/null +++ b/rosegarden-qt47.patch @@ -0,0 +1,40 @@ +diff -rupN rosegarden-10.04.old/src/base/UrlHash.cpp rosegarden-10.04/src/base/UrlHash.cpp +--- rosegarden-10.04.old/src/base/UrlHash.cpp 2010-04-22 16:43:56.000000000 -0400 ++++ rosegarden-10.04/src/base/UrlHash.cpp 2010-04-22 23:02:09.000000000 -0400 +@@ -16,10 +16,10 @@ + + #include + #include // to ensure correct qHash(const QString &) is found +- ++#if QT_VERSION < 0x040700 + unsigned int + qHash(const QUrl &u) + { + return qHash(u.toString()); + } +- ++#endif +diff -rupN rosegarden-10.04.old/src/gui/dialogs/KeySignatureDialog.h rosegarden-10.04/src/gui/dialogs/KeySignatureDialog.h +--- rosegarden-10.04.old/src/gui/dialogs/KeySignatureDialog.h 2010-04-22 16:43:42.000000000 -0400 ++++ rosegarden-10.04/src/gui/dialogs/KeySignatureDialog.h 2010-04-22 23:24:30.000000000 -0400 +@@ -57,7 +57,7 @@ public: + Rosegarden::Key::DefaultKey, + bool showApplyToAll = true, + bool showConversionOptions = true, +- QString explanatoryText = 0); ++ QString explanatoryText = ""); + + bool isValid() const; + ::Rosegarden::Key getKey() const; +diff -rupN rosegarden-10.04.old/src/gui/dialogs/TimeSignatureDialog.h rosegarden-10.04/src/gui/dialogs/TimeSignatureDialog.h +--- rosegarden-10.04.old/src/gui/dialogs/TimeSignatureDialog.h 2010-04-22 16:43:42.000000000 -0400 ++++ rosegarden-10.04/src/gui/dialogs/TimeSignatureDialog.h 2010-04-22 23:14:09.000000000 -0400 +@@ -49,7 +49,7 @@ public: + TimeSignature defaultSig = + TimeSignature::DefaultTimeSignature, + bool timeEditable = false, +- QString explanatoryText = 0); ++ QString explanatoryText = ""); + + TimeSignature getTimeSignature() const; + diff --git a/rosegarden4.spec b/rosegarden4.spec index b0aa985..d8fc423 100644 --- a/rosegarden4.spec +++ b/rosegarden4.spec @@ -1,16 +1,20 @@ Name: rosegarden4 -Version: 10.02.1 +Version: 10.04 Release: 1%{?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://downloads.sourceforge.net/project/rosegarden/rosegarden/10.02/rosegarden-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{version}/rosegarden-%{version}.tar.bz2 +Source1: http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{version}/rosegarden-%{version}.txt +# Upstream is informed about all these patches in their mailing list # Fedora doesn't want fonts built into the final binary Patch0: rosegarden-separate-fonts.patch # Look for LADSPA/DSSI plugins in the correct place on 64bit platforms Patch1: rosegarden-pluginpath.patch +# Fix build issue against new version of qt +Patch2: rosegarden-qt47.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -19,7 +23,7 @@ BuildRequires: fftw-devel BuildRequires: fontpackages-devel BuildRequires: imake BuildRequires: jack-audio-connection-kit-devel -BuildRequires: kdelibs4-devel +BuildRequires: qt4-devel BuildRequires: ladspa-devel BuildRequires: liblo-devel BuildRequires: liblrdf-devel @@ -31,6 +35,7 @@ Provides: rosegarden = %{version}-%{release} Requires: %{name}-feta-fonts = %{version}-%{release} Requires: %{name}-parmesan-fonts = %{version}-%{release} +%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} %description Rosegarden is a professional audio and MIDI sequencer, score editor, and @@ -69,6 +74,10 @@ use of Rosegarden. %setup -q -n rosegarden-%{version} %patch0 -p1 -b .fonts %patch1 -p1 -b .pluginpath +%patch2 -p1 -b .qt47 + +# Release notes +cp -a %{SOURCE1} . # Fix permissions: chmod 644 src/commands/segment/SegmentSplitTwiceCommand.* @@ -77,14 +86,9 @@ chmod 644 src/gui/widgets/BaseTextFloat.* # Add GenericName to the desktop file: echo "GenericName=Audio and MIDI Sequencer" >> data/desktop/rosegarden.desktop -# To force our Fedora flags -sed -i 's|@CXXFLAGS@|%optflags|' Makefile.in - %build # The following is needed if kdelibs3 is installed #unset QTDIR -# Fix DSO linking -export LIBS="-lz -lX11 -ldl" %configure make %{?_smp_mflags} @@ -127,7 +131,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files %defattr(-,root,root,-) -%doc AUTHORS COPYING CONTRIBUTING README +%doc AUTHORS COPYING CONTRIBUTING README rosegarden-%{version}.txt %{_bindir}/rosegarden %{_datadir}/applications/fedora-rosegarden.desktop %{_datadir}/icons/hicolor/*/mimetypes/audio-x-rosegarden-*.png @@ -141,6 +145,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc data/fonts/README %changelog +* Thu Apr 22 2010 Orcan Ogetbil - 10.04-1 +- Update to 10.04 +- BR qt-devel instead of kdelibs-devel +- Add release notes to %%doc +- Patch for build against qt-4.7 + * Thu Feb 18 2010 Orcan Ogetbil - 10.02.1-1 - Update to 10.02.1 (Qt4 version) diff --git a/sources b/sources index 5a1ba82..8d137e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f5ccf2df85850e51b378388303be67d rosegarden-10.02.1.tar.bz2 +b25f2f629f31ecf24b84db3ccbe555c9 rosegarden-10.04.tar.bz2