diff options
| author | Nicolas PARLANT <nicolas.parlant@parhuet.fr> | 2025-11-26 21:34:31 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-11-27 00:24:58 +0000 |
| commit | 8e692a77fac95379eaba735a17e70fe6be22055d (patch) | |
| tree | 7b2d03b05bac557a73cc4130062c1992a5b372e8 | |
| parent | 798f3b081bd063862470bc0d93ce4b0f7dc9bd4f (diff) | |
| download | gentoo-8e692a77fac95379eaba735a17e70fe6be22055d.tar.gz gentoo-8e692a77fac95379eaba735a17e70fe6be22055d.tar.bz2 gentoo-8e692a77fac95379eaba735a17e70fe6be22055d.zip | |
media-sound/musescore: fix build w/o qt_debug
Closes: https://bugs.gentoo.org/966628
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/44788
Closes: https://github.com/gentoo/gentoo/pull/44788
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | media-sound/musescore/files/musescore-4.6.3-fix_noqtdebug.patch | 15 | ||||
| -rw-r--r-- | media-sound/musescore/musescore-4.6.3.ebuild | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/media-sound/musescore/files/musescore-4.6.3-fix_noqtdebug.patch b/media-sound/musescore/files/musescore-4.6.3-fix_noqtdebug.patch new file mode 100644 index 000000000000..72d500692f56 --- /dev/null +++ b/media-sound/musescore/files/musescore-4.6.3-fix_noqtdebug.patch @@ -0,0 +1,15 @@ +See https://bugs.gentoo.org/966628 +PR merged https://github.com/musescore/MuseScore/pull/30422.patch +--- a/src/importexport/midi/internal/midiimport/importmidi_tuplet.cpp ++++ b/src/importexport/midi/internal/midiimport/importmidi_tuplet.cpp +@@ -895,9 +895,9 @@ void addTupletEvents(std::multimap<ReducedFraction, TupletData>& tupletEvents, + message += QString::number(tiedTuplet.voice) + ", chord voice = "; + message += QString::number(midiChord.voice) + ", bar number (from 1) = "; + message += QString::number(midiChord.barIndex + 1); +-#endif + Q_ASSERT_X(tiedTuplet.voice == midiChord.voice, + "MidiTuplet::addTupletEvents", message.toLatin1().data()); ++#endif + + for (int j: tiedTuplet.tiedNoteIndexes) { + midiChord.notes[j].tuplet = it; diff --git a/media-sound/musescore/musescore-4.6.3.ebuild b/media-sound/musescore/musescore-4.6.3.ebuild index ecbe66e67fd4..ef7d4de411b0 100644 --- a/media-sound/musescore/musescore-4.6.3.ebuild +++ b/media-sound/musescore/musescore-4.6.3.ebuild @@ -70,6 +70,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.6.3-rm_tinyxml.patch" "${FILESDIR}/${PN}-4.6.3-missing_includes.patch" "${FILESDIR}/${PN}-4.6.3-fix_qt610.patch" + "${FILESDIR}/${PN}-4.6.3-fix_noqtdebug.patch" # unbundle 3rd libs "${FILESDIR}/${PN}-4.6.3-unbundle-lame.patch" "${FILESDIR}/${PN}-4.6.3-unbundle-pugixml.patch" |