From ddaa9c51156a814eb8dd81a5ed312636f1055e1b Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Mar 22 2020 16:54:55 +0000 Subject: Update to 19.12 Some spec cleanup --- diff --git a/.gitignore b/.gitignore index 2d991d9..892e6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ rosegarden-10.04.2.tar.bz2 /rosegarden-15.10.2.tar.bz2 /rosegarden-16.02.tar.bz2 /rosegarden-17.12.tar.bz2 +/rosegarden-19.12.tar.bz2 diff --git a/qmake-qt5.sh b/qmake-qt5.sh deleted file mode 100755 index 09d9fe6..0000000 --- a/qmake-qt5.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -/usr/bin/qmake-qt5 \ - "$@" \ - QMAKE_CFLAGS_RELEASE="${CFLAGS}" \ - QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \ - QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \ - QMAKE_STRIP= diff --git a/rosegarden-17.12.README b/rosegarden-17.12.README deleted file mode 100644 index 9122529..0000000 --- a/rosegarden-17.12.README +++ /dev/null @@ -1,69 +0,0 @@ -ROSEGARDEN 17.12, codename "Ultimate Pleasure" RELEASED - -The Rosegarden team is proud to announce the release of version 17.12 of -Rosegarden, a MIDI sequencer that features a rich understanding of music -notation along with basic support for digital audio. - -http://www.rosegardenmusic.com/ - -17.12 brings us numerous bug fixes by Yves Guillemot and Ted Felix. Ted -has also continued his work on cleaning up the source base with a -rewrite of the Audio Mixer window and simplified handling of the volume, -pan, etc... control change knobs and faders. - -BUG FIXES - - * Fix progress dialog lockups in KDE (bug #1546, r15031-r15034) - - * Fix disappearing lyrics in lyrics editor (bug #1547, r15035-r15036) - - * Fix bug #1548: Last syllable of lyrics is not copied between two - linked segments. (r15037) - - * Fix bug #1550: Crash with lyric editor and linked segments (r15038) - - * Fix bug #1551: No sound from an audio file when pressing rewind then - play. (r15039) - - * Fix bug #1549: Matrix Editor: Velocity ruler not updated correctly - when changing velocity using the velocity tool (r15041-r15046) - - * Fix alias change not updating label on the audio instrument - parameters. (r15058) - - * Fix miscellaneous cosmetic issues related to the ThornStyle upgrade. - (r15076-r15081) - - * Fix time mode toolbar buttons on the Event List and other windows. - (r15083) - - * Fix incorrect window titles on the preferences and document - properties windows. (r15084) - - * Fix garbage property names in Event Edit window. (r15085) - - * Display velocities modified from the velocity ruler in the status - bar for the notation editor. (r15088) - - * Fix bug #1552: Rosegarden fails to build with cmake-3.9.0. (r15089) - - * Fix crash when launching plugin dialog introduced by r14648. - (r15091) - - * Fix external controller audio volume/pan bug (r15107) - - * Fix crash in rulers when pressing mouse buttons (r15116) - - * Export to LilyPond as a repeat sequence several consecutive linked - segments is now possible (bug #1470, r15119) - - * Fix duplicate connection in initial autoload (r15122) - - * Fix crash when exporting to LilyPond. (bug #1553, r15135) - - * Fix lilypond options dialog too big. (r15140) - -NEW FEATURES - - * Add "Use track name for new segments" preference. (r15090) - diff --git a/rosegarden-separate-fonts.patch b/rosegarden-separate-fonts.patch deleted file mode 100644 index 578c83b..0000000 --- a/rosegarden-separate-fonts.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/data/data.qrc b/data/data.qrc -index 3b87ea7..448f9c6 100644 ---- a/data/data.qrc -+++ b/data/data.qrc -@@ -10,9 +10,6 @@ running: - DO NOT EDIT THIS FILE BY HAND! All changes will be LOST! - --> - --./fonts/LilyPond-feta-design20.pfa --./fonts/LilyPond-feta-nummer-design10.pfa --./fonts/LilyPond-parmesan-design20.pfa - ./pixmaps/icons/audio-nok.png - ./pixmaps/icons/audio-ok.png - ./pixmaps/icons/midi-nok.png -diff --git a/scripts/rebuild-qrc b/scripts/rebuild-qrc -index 9d42f93..b0db607 100755 ---- a/scripts/rebuild-qrc -+++ b/scripts/rebuild-qrc -@@ -85,7 +85,7 @@ EOF - # this script to send ts/qm entries to locale.qrc instead of - # data.qrc. - --for ext in pfa png qss rc rg rgd rgp rgt xml xpm; do -+for ext in png qss rc rg rgd rgp rgt xml xpm; do - writeEntries $ext - done - -diff --git a/src/gui/editors/notation/SystemFont.cpp b/src/gui/editors/notation/SystemFont.cpp -index da2b070..416a916 100644 ---- a/src/gui/editors/notation/SystemFont.cpp -+++ b/src/gui/editors/notation/SystemFont.cpp -@@ -108,24 +108,15 @@ void - SystemFont::unbundleFonts() - { - QStringList fontFiles; -- fontFiles << ResourceFinder().getResourceFiles("fonts", "pfa"); -- fontFiles << ResourceFinder().getResourceFiles("fonts", "pfb"); -- fontFiles << ResourceFinder().getResourceFiles("fonts", "ttf"); -- fontFiles << ResourceFinder().getResourceFiles("fonts", "otf"); -+ fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-design20.pfa"); -+ fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-nummer-design10.pfa"); -+ fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-parmesan-design20.pfa"); - - NOTATION_DEBUG << "Found font files: " << fontFiles; - - for (QStringList::const_iterator i = fontFiles.constBegin(); - i != fontFiles.constEnd(); ++i) { - QString fontFile(*i); -- QString name = QFileInfo(fontFile).fileName(); -- if (fontFile.startsWith(":")) { -- ResourceFinder().unbundleResource("fonts", name); -- fontFile = ResourceFinder().getResourcePath("fonts", name); -- if (fontFile.startsWith(":")) { // unbundling failed -- continue; -- } -- } - addFont(fontFile); - } - } diff --git a/rosegarden4.spec b/rosegarden4.spec index 5d010a3..77723ec 100644 --- a/rosegarden4.spec +++ b/rosegarden4.spec @@ -1,19 +1,12 @@ -%global maj 17.12 +%global maj 19.12 Name: rosegarden4 Version: %{maj} -Release: 8%{?dist} +Release: 1%{?dist} Summary: MIDI, audio and notation editor License: GPLv2+ URL: http://www.rosegardenmusic.com/ Source0: http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{maj}/rosegarden-%{version}.tar.bz2 -# From http://downloads.sourceforge.net/project/rosegarden/rosegarden/%%{maj}-LINUX/README -Source1: rosegarden-%{maj}.README - -Source2: qmake-qt5.sh - -# Fedora doesn't want fonts built into the final binary -Patch0: rosegarden-separate-fonts.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -34,12 +27,11 @@ BuildRequires: libsndfile-devel BuildRequires: lirc-devel BuildRequires: libappstream-glib BuildRequires: zlib-devel +# Use lilypond feta fonts +Requires: lilypond-emmentaler-fonts Provides: rosegarden = %{version}-%{release} -Requires: %{name}-feta-fonts = %{version}-%{release} -Requires: %{name}-parmesan-fonts = %{version}-%{release} - %description Rosegarden is a professional audio and MIDI sequencer, score editor, and general purpose music composition and editing environment. @@ -47,88 +39,42 @@ general purpose music composition and editing environment. Rosegarden is an easy to learn, attractive application, ideal for composers, musicians, music students, and small studio or home recording environments. -%package feta-fonts -Summary: Rosegarden feta fonts -BuildArch: noarch -Requires: fontpackages-filesystem - -%description feta-fonts -Rosegarden is a professional audio and MIDI sequencer, score editor, and -general purpose music composition and editing environment. - -This package contains Lilypond's feta musical notation fonts adapted for use -of Rosegarden. - -%package parmesan-fonts -Summary: Rosegarden parmesan fonts -BuildArch: noarch -Requires: fontpackages-filesystem - -%description parmesan-fonts -Rosegarden is a professional audio and MIDI sequencer, score editor, and -general purpose music composition and editing environment. - -This package contains Lilypond's parmesan musical notation fonts adapted for -use of Rosegarden. - %prep %setup -q -n rosegarden-%{version} -%patch0 -p1 -b .fonts - -# Release notes -cp -a %{SOURCE1} ./README.%{maj} # Fix permissions: chmod 644 src/gui/widgets/BaseTextFloat.* %build -# force use of custom/local qmake, to inject proper build flags (above) -install -m755 -D %{SOURCE2} bin/qmake-qt5 -PATH=`pwd`/bin:%{_qt5_bindir}:$PATH; export PATH - mkdir build cd build %cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -make %{?_smp_mflags} +%make_build %install -cd build -make install DESTDIR=%{buildroot} -cd .. +pushd build +%make_install +popd # Update the screenshot shown in the software center # # NOTE: It would be *awesome* if this file was pushed upstream. # # See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. # -appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/rosegarden.appdata.xml \ +appstream-util replace-screenshots %{buildroot}%{_datadir}/metainfo/rosegarden.appdata.xml \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/rosegarden/a.png \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/rosegarden/b.png \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/rosegarden/c.png desktop-file-install \ -%if %fedora < 19 - --vendor fedora \ -%endif --dir %{buildroot}%{_datadir}/applications \ --delete-original \ --remove-category X-SuSE-Sequencer \ --remove-category X-Red-Hat-Base \ %{buildroot}%{_datadir}/applications/com.rosegardenmusic.rosegarden.desktop -# Install fonts in the %%_fontdir -mkdir -p %{buildroot}/%{_fontdir} -install -pm 644 data/fonts/*.pfa %{buildroot}/%{_fontdir} - -%post -touch --no-create %{_datadir}/icons/locolor &>/dev/null || : - -%postun -touch --no-create %{_datadir}/icons/locolor &>/dev/null || : - %files - %doc AUTHORS CONTRIBUTING README -%doc README.%{maj} +%license COPYING %{_bindir}/rosegarden %{_datadir}/applications/*rosegarden.desktop %{_datadir}/icons/hicolor/*/mimetypes/application-x-rosegarden-*.png @@ -136,13 +82,11 @@ touch --no-create %{_datadir}/icons/locolor &>/dev/null || : %{_datadir}/mime/packages/rosegarden.xml %{_datadir}/metainfo/rosegarden.appdata.xml -%_font_pkg -n feta *feta*.pfa -%doc data/fonts/README COPYING - -%_font_pkg -n parmesan *parmesan*.pfa -%doc data/fonts/README COPYING - %changelog +* Wed Mar 18 2020 Guido Aulisi - 19.12-1 +- Update to 19.12 +- Some spec cleanup + * Thu Jan 30 2020 Fedora Release Engineering - 17.12-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 747121f..fce0643 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rosegarden-17.12.tar.bz2) = 109261e1a4153319eb8aea167a0fe4fdaff66c3464c0652dee30bf4a61d0bc1b4690f1885607af7dceffa34becb80596ee97e7eaa84aace573d54c92df588ea9 +SHA512 (rosegarden-19.12.tar.bz2) = 22c45346b1a4d69f009e59091bdf5f5f68633241a48df7bd6ee73462cc281ee7182be3d48c3afc0843aa551145c203a8b881501891eb84b6d3f3def5f7650fc6