gentoo resync : 25.08.2020

4 files changed, 16 insertions, 113 deletions

diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 3a357dab020e..0e57daa2c8f1 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,6 +1,5 @@
-AUX minuet-19.08.3-fluidsynth-2.patch 3582 BLAKE2B b9ec13c676c9b8c1dd922d12179dba5bda5c1e7badc7e58d2fad38287ae3e5a75ab7b13eac6137beddad1cfbc16b3085d29f456390ec61cb3eca7b7ac76d44ff SHA512 c0bd1bf3e59e3fcc60111a91b9cf78d554dd0d94d43d71a86c7ec76f2fb4ad202f6bd94da7092a058693ba13f4ce6c9e39c47a63a2562f0a2fe15f67f9439e64
-DIST minuet-19.12.3.tar.xz 27597900 BLAKE2B db1672eff9df0e7bb8cf45ec6933b8baf63e42e810f35b3b605f3e2389ca68a181415f8c033244d54f314cf77966d487d7f7769c478a636e7505bf6c38f9916e SHA512 545e4ef25965d8d614644b4d897382edd65a92f835b6f4a461c1dec819388608e05dbe1000f26b37430e91fd4d3949d3ff39ed92cc8f8a36d77391e01c0d0fb0
-DIST minuet-20.04.2.tar.xz 27602656 BLAKE2B 6ee6636c290906bd03b636e4093af34fe21abc8276afa40fa8173a1c974053eb581534015562e29210387862148702cfc5499a03190d6286bd67b06441bcf518 SHA512 cfb6a1eb0e4b35d49f9aef7d8665c4233761146d50a890bb03727636fbdccab49b7e429f8d34e59d653f209bd546990c0b412a2c187d7fe95a3948171d06c2bc
-EBUILD minuet-19.12.3.ebuild 733 BLAKE2B 039d1a87fb7d6061a9a3119d8670a28df5042b1ed4efa6b43a7799647918ae2ed35afd44a76efa12c47cc9e93b46134011da57abbd20b7a4456089a638d5566a SHA512 d1c5f851ea47e87cfa6a4ff106b940034f6873dea45f27d8aae3584a4f8cad2e5a16fffb8bf8b76b0ae57523765db37b6b7f2ba4f081a8eb67f5e29e606dff1e
-EBUILD minuet-20.04.2.ebuild 676 BLAKE2B 407436437bb2d97636cf0f34f708842791e7d5cd37a1851fb24b672bb1a74a5c482c3788002aae4e63ebefa8239030c3c871b568df03e4f63d3db89ef3d935f8 SHA512 31f7ebb2aa8790aaab01ff8cb6a33f58c6d5ee5204a45159afc027a2be39c9531619ef269be809f75a65578f860b22d034756c626b0f2333b2dfd00f1a2a7e70
+DIST minuet-20.04.3.tar.xz 27602116 BLAKE2B c02fea28c659adff4027daddbe8e8381cc31c80826eabe5070c70e0583621a463774145c85054c7898b25ad194d8a4fd0cd34515c0d342672f82c7835586e5e4 SHA512 5353e7c2461b5d53ed119d1ecdd27e2561068347ac244e17a9eda961d269fd0b4ce41a3c61ecdc0f8c48a8f7cca40f4bd3e0dcaa49fb800b598e8809d3c25073
+DIST minuet-20.08.0.tar.xz 27726724 BLAKE2B 934135464bba30209429fb51c88c6514b86d8febd416283f8287b16cf8ee1fdb75754ead483686899e8a75d754bb3de7d0082a44db554a9f27445f5b77c04860 SHA512 e26ccecbecdfb6bbc161fd96dd210b9cd8154ec37cac09ff8a1c9478295d6eef72a702420dfc5519543cdb2e10ebc5386ed43206395b8708bd02de1e17322789
+EBUILD minuet-20.04.3.ebuild 673 BLAKE2B f7c725cfe076faf068b8bbab3766a3aa6880a99f7795feb66c88c1cfad19731b52169074904558bfd559c6d774f5d7bba87f6a925e355931c858b852b396cfd4 SHA512 974674116ff5e9c74d45ccb89c235dcf5353516bd6de5740f4fc9c6dcb0e454a0604d8095307e8cc65c186c234ab8ba229c01222ee6297ffe976b19a498c7cf3
+EBUILD minuet-20.08.0.ebuild 676 BLAKE2B d747d503216c1ca656ee24d981b054b209ff6d3f98a5f325d4698affa36e566c9629fd803a077c0cf392f95a60d1a9cff948c5d09fef07de648eb7689fc2044f SHA512 c4ec0648d40715021dc58d81a02895c217bf7bdc1618691b1360f39d1b7f8181d8da73381fffbadeed97db718adfe1aa532441e04ba1bbc585a12b80a436c1a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch b/kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch
deleted file mode 100644
index 9bb3c5bad1b9..000000000000
--- a/kde-apps/minuet/files/minuet-19.08.3-fluidsynth-2.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From d707ab85c60d68e0310559df4608d86680cc811a Mon Sep 17 00:00:00 2001
-From: Tom Moebert <tom.mbrt@googlemail.com>
-Date: Sat, 18 Jan 2020 00:26:30 +0100
-Subject: Port to fluidsynth 2.0.0 API
-
-Summary:
-This includes necessary adaptations for fluidsynth 2.0. All changes are backward-compatible to fluidsynth 1.1. For details, see:
-
-http://www.fluidsynth.org/api/index.html#NewIn2_0_0
-
-Reviewers: #minuet
-
-Subscribers: asturmlechner, aacid, kde-edu
-
-Tags: #minuet, #kde_edu
-
-Differential Revision: https://phabricator.kde.org/D26558
----
- .../fluidsynthsoundcontroller.cpp                  | 22 ++++++++++++++++++----
- .../fluidsynthsoundcontroller.h                    |  1 +
- 2 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp
-index 67e6826..7252914 100644
---- a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp
-+++ b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp
-@@ -34,13 +34,14 @@ FluidSynthSoundController::FluidSynthSoundController(QObject *parent)
-     : Minuet::ISoundController(parent),
-       m_audioDriver(0),
-       m_sequencer(0),
--      m_song(0)
-+      m_song(0),
-+      m_unregisteringEvent(0)
- {
-     m_tempo = 60;
- 
-     m_settings = new_fluid_settings();
--    fluid_settings_setstr(m_settings, "synth.reverb.active", "no");
--    fluid_settings_setstr(m_settings, "synth.chorus.active", "no");
-+    fluid_settings_setint(m_settings, "synth.reverb.active", 0);
-+    fluid_settings_setint(m_settings, "synth.chorus.active", 0);
- 
-     m_synth = new_fluid_synth(m_settings);
- 
-@@ -55,6 +56,9 @@ FluidSynthSoundController::FluidSynthSoundController(QObject *parent)
-     if (fluid_res == FLUID_FAILED)
-         qCritical() << "Error when loading soundfont!";
- 
-+    m_unregisteringEvent = new_fluid_event();
-+    fluid_event_set_source(m_unregisteringEvent, -1);
-+
-     resetEngine();
- }
- 
-@@ -63,6 +67,7 @@ FluidSynthSoundController::~FluidSynthSoundController()
-     deleteEngine();
-     if (m_synth) delete_fluid_synth(m_synth);
-     if (m_settings) delete_fluid_settings(m_settings);
-+    if (m_unregisteringEvent) delete_fluid_event(m_unregisteringEvent);
- }
- 
- void FluidSynthSoundController::setPitch(qint8 pitch)
-@@ -240,7 +245,16 @@ void FluidSynthSoundController::resetEngine()
- 
- void FluidSynthSoundController::deleteEngine()
- {
--    if (m_sequencer) delete_fluid_sequencer(m_sequencer);
-+    if (m_sequencer) {
-+#if FLUIDSYNTH_VERSION_MAJOR >= 2
-+        // explicit client unregistering required
-+        fluid_sequencer_unregister_client(m_sequencer, m_callbackSeqID);
-+        fluid_event_set_dest(m_unregisteringEvent, m_synthSeqID);
-+        fluid_event_unregistering(m_unregisteringEvent);
-+        fluid_sequencer_send_now(m_sequencer, m_unregisteringEvent);
-+#endif
-+        delete_fluid_sequencer(m_sequencer);
-+    }
-     if (m_audioDriver) delete_fluid_audio_driver(m_audioDriver);
- }
- 
-diff --git a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h
-index afad46b..ed111c2 100644
---- a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h
-+++ b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h
-@@ -63,6 +63,7 @@ private:
-     fluid_audio_driver_t *m_audioDriver;
-     fluid_sequencer_t *m_sequencer;
-     fluid_synth_t *m_synth;
-+    fluid_event_t *m_unregisteringEvent;
- 
-     short m_synthSeqID;
-     short m_callbackSeqID;
--- 
-cgit v1.1
diff --git a/kde-apps/minuet/minuet-19.12.3.ebuild b/kde-apps/minuet/minuet-20.04.3.ebuild
index 1c764b9daaa9..8556c90560f7 100644
--- a/kde-apps/minuet/minuet-19.12.3.ebuild
+++ b/kde-apps/minuet/minuet-20.04.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Music Education software by KDE"
@@ -20,15 +20,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
 	media-sound/fluidsynth:=
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-19.08.3-fluidsynth-2.patch" )
diff --git a/kde-apps/minuet/minuet-20.04.2.ebuild b/kde-apps/minuet/minuet-20.08.0.ebuild
index 3006d3292720..16a18cddb688 100644
--- a/kde-apps/minuet/minuet-20.04.2.ebuild
+++ b/kde-apps/minuet/minuet-20.08.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Music Education software by KDE"
@@ -20,13 +20,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
 	media-sound/fluidsynth:=
 "
 RDEPEND="${DEPEND}"