[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

["Jason A. Donenfeld" <zx2c4@gentoo.org>]

commit:     178e455e0d340ab8b4b79273a80acde620df6653
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  6 19:44:25 2024 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 19:47:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178e455e

media-sound/musescore: update missing headers patch for 4.2.1

Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 ...patch => musescore-4.2.1-missing-headers.patch} | 22 ++++++++++++++++++++++
 ...e-4.2.1-r1.ebuild => musescore-4.2.1-r2.ebuild} |  2 +-
 media-sound/musescore/musescore-9999.ebuild        |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
similarity index 61%
rename from media-sound/musescore/files/musescore-4.2.0-missing-headers.patch
rename to media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
index 2a40ccc00c35..56ae1f4fa2d6 100644
--- a/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch
+++ b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
@@ -18,6 +18,17 @@
  
  #include "modularity/ioc.h"
  #include "../iinteractiveprovider.h"
+--- a/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp
++++ b/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp
+@@ -34,6 +34,8 @@
+ 
+ #include "log.h"
+ 
++#include <QXmlStreamReader>
++
+ using AccidentalType = mu::engraving::AccidentalType;
+ using SymId = mu::engraving::SymId;
+ const static std::map<mu::String, AccidentalType> smuflAccidentalTypes {
 --- a/src/importexport/videoexport/internal/videowriter.cpp
 +++ b/src/importexport/videoexport/internal/videowriter.cpp
 @@ -32,6 +32,8 @@
@@ -39,3 +50,14 @@
  
  #include "async/asyncable.h"
  
+--- a/src/project/internal/exporttype.h
++++ b/src/project/internal/exporttype.h
+@@ -23,6 +23,8 @@
+ #define MU_PROJECT_EXPORTTYPE_H
+ 
+ #include <unordered_set>
++#include <QList>
++#include <QVariant>
+ 
+ #include "containers.h"
+ 

diff --git a/media-sound/musescore/musescore-4.2.1-r1.ebuild b/media-sound/musescore/musescore-4.2.1-r2.ebuild
similarity index 98%
rename from media-sound/musescore/musescore-4.2.1-r1.ebuild
rename to media-sound/musescore/musescore-4.2.1-r2.ebuild
index cb7e3aaf3288..de9540eac6c5 100644
--- a/media-sound/musescore/musescore-4.2.1-r1.ebuild
+++ b/media-sound/musescore/musescore-4.2.1-r2.ebuild
@@ -70,8 +70,8 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
 	"${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
-	"${FILESDIR}/${PN}-4.2.0-missing-headers.patch"
 	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+	"${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
 )
 
 src_unpack() {

diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index cb7e3aaf3288..de9540eac6c5 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -70,8 +70,8 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
 	"${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
-	"${FILESDIR}/${PN}-4.2.0-missing-headers.patch"
 	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+	"${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
 )
 
 src_unpack() {