diff --git a/gcc13_fix.patch b/gcc13_fix.patch deleted file mode 100644 index e66a166..0000000 --- a/gcc13_fix.patch +++ /dev/null @@ -1,86 +0,0 @@ -commit a2577f635de569d9ece4dc042c000a1b5a810ac7 -Author: kerkovits -Date: Thu Mar 23 21:16:02 2023 +0100 - - Fix compile-time errors with GCC 13 https://github.com/GrandOrgue/grandorgue/discussions/1434 - - * Added cstdint where it was neccessary for gcc13. - - * Document bugfix - - * Fixed typo and error in BUILD.md - -diff --git a/BUILD.md b/BUILD.md -index 0c449dca..e263bfcd 100644 ---- a/BUILD.md -+++ b/BUILD.md -@@ -25,7 +25,7 @@ You can download the source code archive from GitHub - 1. `RtAudio`: Download [the source archive](https://github.com/thestk/rtaudio/archive/refs/heads/master.zip) end extract the contents of the ``rtaudio-master`` subdirectory from the archive to the ``submodules/RtAudio`` subdirectory of GrandOrgue source tree. - 2. `RtMidi`: Download [the source archive](https://github.com/thestk/rtmidi/archive/refs/heads/master.zip) and extract the contents of the ``rtmidi-master`` subdirectory from the archive to the ``submodules/RtMidi`` subdirectory of GrandOrgue source tree. - 3. `PortAudio`: Download [the source archive](https://github.com/PortAudio/portaudio/archive/refs/heads/master.zip) and extract the contents of the ``portaudio-master`` subdirectory from the archive to the ``submodules/PortAudio`` subdirectory of GrandOrgue source tree. -- 4. `ZitaConvolver`: Download the source archive](https://salsa.debian.org/multimedia-team/zita-convolver/-/archive/master/zita-convolver-master.zip) and extract the contents of the ``portaudio-master`` subdirectory from the archive to the ``submodules/ZitaConvolver`` subdirectory of GrandOrgue source tree. -+ 4. `ZitaConvolver`: Download [the source archive](https://salsa.debian.org/multimedia-team/zita-convolver/-/archive/master/zita-convolver-master.zip) and extract the contents of the ``zita-convolver-master`` subdirectory from the archive to the ``submodules/ZitaConvolver`` subdirectory of GrandOrgue source tree. - - ## Building for Linux on Linux - 1. Make sure that GrandOrgue source tree has been extracted to some subdirectory ```` -diff --git a/src/core/GOHash.h b/src/core/GOHash.h -index 1d1aeb9d..feae0866 100644 ---- a/src/core/GOHash.h -+++ b/src/core/GOHash.h -@@ -8,6 +8,7 @@ - #ifndef GOHASH_H - #define GOHASH_H - -+#include - #include - - #include "contrib/sha1.h" -diff --git a/src/core/archive/GOArchiveFile.h b/src/core/archive/GOArchiveFile.h -index 0564fcd7..6a58b020 100644 ---- a/src/core/archive/GOArchiveFile.h -+++ b/src/core/archive/GOArchiveFile.h -@@ -8,6 +8,7 @@ - #ifndef GOARCHIVEFILE_H - #define GOARCHIVEFILE_H - -+#include - #include - - #include -diff --git a/src/core/config/GOConfigFileWriter.h b/src/core/config/GOConfigFileWriter.h -index 8766f6a9..928c6304 100644 ---- a/src/core/config/GOConfigFileWriter.h -+++ b/src/core/config/GOConfigFileWriter.h -@@ -8,6 +8,7 @@ - #ifndef GOCONFIGFILEWRITER_H - #define GOCONFIGFILEWRITER_H - -+#include - #include - - #include -diff --git a/src/core/midi/GOMidiEvent.h b/src/core/midi/GOMidiEvent.h -index 80634b9e..5e34cafa 100644 ---- a/src/core/midi/GOMidiEvent.h -+++ b/src/core/midi/GOMidiEvent.h -@@ -8,6 +8,8 @@ - #ifndef GOMIDIEVENT_H - #define GOMIDIEVENT_H - -+#include -+ - #include - - #include "GOTime.h" -diff --git a/src/grandorgue/model/GOTremulant.h b/src/grandorgue/model/GOTremulant.h -index adbfcaa8..52684029 100644 ---- a/src/grandorgue/model/GOTremulant.h -+++ b/src/grandorgue/model/GOTremulant.h -@@ -8,6 +8,7 @@ - #ifndef GOTREMULANT_H - #define GOTREMULANT_H - -+#include - #include - - #include "GOCacheObject.h" diff --git a/grandorgue-3.10.1-1.tar.gz b/grandorgue-3.10.1-1.tar.gz deleted file mode 100644 index 904a10c..0000000 --- a/grandorgue-3.10.1-1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38940c10744dab674aca46cc363dbb5dceac2bf0af4c10c05324383d3efef3d3 -size 28068903 diff --git a/grandorgue-3.11.0-1.tar.gz b/grandorgue-3.11.0-1.tar.gz new file mode 100644 index 0000000..3910b61 --- /dev/null +++ b/grandorgue-3.11.0-1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45a75681418cf42418df6160d52fa8d92a2fc3aca364446dc7240836972e181a +size 28153868 diff --git a/grandorgue.changes b/grandorgue.changes index 114269d..2bcc203 100644 --- a/grandorgue.changes +++ b/grandorgue.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Apr 21 10:52:40 UTC 2023 - Lukas Müller + +- Update to version 3.11.0. + Changelog: https://github.com/GrandOrgue/grandorgue/releases/tag/3.11.0-1 + - Added capability of navigating over, loading and saving the YAML combinations files on the Combination Setter panel https://github.com/GrandOrgue/grandorgue/issues/1196 + - Added capability of exporting and importing combinations in yaml format files https://github.com/GrandOrgue/grandorgue/issues/1195 + - Removed support of old linux distros (with libc6 versions before 2.31) https://github.com/GrandOrgue/grandorgue/discussions/1334 + - Fixed the translation of the desktop icon on Linux https://github.com/GrandOrgue/grandorgue/issues/1429 + - Added support of labels without a background image by specifying DispImageNum=0 https://github.com/GrandOrgue/grandorgue/issues/1386 + - Added capability of overriding wav MIDIPitchFraction with the Pipe999MIDIPitchFraction key https://github.com/GrandOrgue/grandorgue/issues/1378 +- Remove gcc13_fix.patch since it is included in this version. + ------------------------------------------------------------------- Mon Mar 27 23:29:28 UTC 2023 - Lukas Müller diff --git a/grandorgue.spec b/grandorgue.spec index 732ff6b..375bce9 100644 --- a/grandorgue.spec +++ b/grandorgue.spec @@ -19,14 +19,12 @@ %define version_suffix 1 Name: grandorgue -Version: 3.10.1 +Version: 3.11.0 Release: 0 Summary: Virtual Pipe Organ Software License: GPL-2.0-or-later URL: https://github.com/GrandOrgue/grandorgue Source: https://github.com/GrandOrgue/grandorgue/archive/%{version}-%{version_suffix}.tar.gz#/%{name}-%{version}-%{version_suffix}.tar.gz -# Upstream patch for GCC13 compatibility. -Patch0: gcc13_fix.patch BuildRequires: ImageMagick BuildRequires: cmake BuildRequires: docbook-xsl-stylesheets @@ -47,6 +45,7 @@ BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(rtaudio) BuildRequires: pkgconfig(rtmidi) BuildRequires: pkgconfig(wavpack) +BuildRequires: pkgconfig(yaml-cpp) BuildRequires: pkgconfig(zlib) Recommends: grandorgue-demo @@ -64,7 +63,6 @@ This package contains the demo sampleset for GrandOrgue. %prep %setup -qn %{name}-%{version}-%{version_suffix} -%patch0 -p1 %build %cmake -DDOC_INSTALL_DIR=%{_docdir} \