commit: fb0b87365d7dd4fc7781c718f720ec069648f8f3 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Fri Sep 6 09:03:22 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Sep 6 09:03:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0b8736
media-sound/musescore: fixed some issues in 4.4.0 + updated live added missing dep added patch for missing main toolbar and menubar added MUE_COMPILE_USE_SYSTEM_OPUS live: added missing inlcude live: added MUE_COMPILE_USE_SYSTEM_HARFBUZZ Closes: https://bugs.gentoo.org/938586 Closes: https://bugs.gentoo.org/938970 Bug: https://bugs.gentoo.org/938968 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> ...escore-4.4.0-fix-main-toolbar-and-menubar.patch | 38 ++++++++++++++++++++++ .../files/musescore-4.5.0-missing-include.patch | 10 ++++++ ...core-4.4.0.ebuild => musescore-4.4.0-r1.ebuild} | 3 ++ media-sound/musescore/musescore-9999.ebuild | 6 +++- 4 files changed, 56 insertions(+), 1 deletion(-) diff --git a/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch b/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch new file mode 100644 index 000000000000..6abc9e4fbd95 --- /dev/null +++ b/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch @@ -0,0 +1,38 @@ +From b274f13311ad0b2bce339634a006ba22fbd3379e Mon Sep 17 00:00:00 2001 +From: Ken Bloom <[email protected]> +Date: Fri, 30 Aug 2024 09:17:27 -0400 +Subject: [PATCH] Fix MainToolbar, and AppMenuBar in Qt 6.5+ + +The problem was that a ListView lazily creates delegates as needed to +actually display them. If the size of the ListView is 0, then it doesn't +need to display anything, so it may not create any of the delegates. If +it doesn't create any delegates, then we can't make it size itself to +fit its contents. By setting a minimum size of 1, we force the ListView +to create a delegate that we can then use to determine the ListView's +actual size. + +Fixes: #24097 +--- a/src/appshell/qml/MainToolBar.qml ++++ b/src/appshell/qml/MainToolBar.qml +@@ -70,8 +70,8 @@ Item { + + model: toolBarModel + +- width: contentItem.childrenRect.width +- height: contentItem.childrenRect.height ++ width: Math.max(1, contentItem.childrenRect.width) ++ height: Math.max(1, contentItem.childrenRect.height) + + delegate: PageTabButton { + id: radioButtonDelegate +--- a/src/appshell/qml/platform/AppMenuBar.qml ++++ b/src/appshell/qml/platform/AppMenuBar.qml +@@ -28,7 +28,7 @@ import MuseScore.AppShell 1.0 + ListView { + id: root + +- height: contentItem.childrenRect.height ++ height: Math.max(1,contentItem.childrenRect.height) + width: contentWidth + + property alias appWindow: appMenuModel.appWindow diff --git a/media-sound/musescore/files/musescore-4.5.0-missing-include.patch b/media-sound/musescore/files/musescore-4.5.0-missing-include.patch new file mode 100644 index 000000000000..b4a510dddd5b --- /dev/null +++ b/media-sound/musescore/files/musescore-4.5.0-missing-include.patch @@ -0,0 +1,10 @@ +--- a/src/framework/extensions/devtools/apidumpmodel.cpp ++++ b/src/framework/extensions/devtools/apidumpmodel.cpp +@@ -22,6 +22,7 @@ + #include "apidumpmodel.h" + + #include <QClipboard> ++#include <QGuiApplication> + + #include "extensions/api/extapi.h" + diff --git a/media-sound/musescore/musescore-4.4.0.ebuild b/media-sound/musescore/musescore-4.4.0-r1.ebuild similarity index 96% rename from media-sound/musescore/musescore-4.4.0.ebuild rename to media-sound/musescore/musescore-4.4.0-r1.ebuild index 7dc814a8631c..b25aa78b2e6c 100644 --- a/media-sound/musescore/musescore-4.4.0.ebuild +++ b/media-sound/musescore/musescore-4.4.0-r1.ebuild @@ -36,6 +36,7 @@ BDEPEND=" RDEPEND=" dev-libs/tinyxml2:= dev-qt/qtbase[concurrent,dbus,gui,network,opengl,widgets,xml] + dev-qt/qt5compat:6[qml] dev-qt/qtdeclarative:6 dev-qt/qtnetworkauth:6 dev-qt/qtscxml:6 @@ -62,6 +63,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch" "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch" "${FILESDIR}/${PN}-4.4.0-include.patch" + "${FILESDIR}/${PN}-4.4.0-fix-main-toolbar-and-menubar.patch" ) src_unpack() { @@ -97,6 +99,7 @@ src_configure() { -DMUE_COMPILE_USE_CCACHE=OFF -DMUE_COMPILE_USE_SYSTEM_FLAC=ON -DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON + -DMUE_COMPILE_USE_SYSTEM_OPUS=ON -DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON -DMUE_COMPILE_USE_SYSTEM_TINYXML=ON -DMUE_DOWNLOAD_SOUNDFONT=OFF diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index 7dc814a8631c..a301de148da8 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -36,6 +36,7 @@ BDEPEND=" RDEPEND=" dev-libs/tinyxml2:= dev-qt/qtbase[concurrent,dbus,gui,network,opengl,widgets,xml] + dev-qt/qt5compat:6[qml] dev-qt/qtdeclarative:6 dev-qt/qtnetworkauth:6 dev-qt/qtscxml:6 @@ -59,9 +60,10 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch" "${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch" - "${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch" "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch" "${FILESDIR}/${PN}-4.4.0-include.patch" + "${FILESDIR}/${PN}-4.4.0-fix-main-toolbar-and-menubar.patch" + "${FILESDIR}/${PN}-4.5.0-missing-include.patch" ) src_unpack() { @@ -97,8 +99,10 @@ src_configure() { -DMUE_COMPILE_USE_CCACHE=OFF -DMUE_COMPILE_USE_SYSTEM_FLAC=ON -DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON + -DMUE_COMPILE_USE_SYSTEM_OPUS=ON -DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON -DMUE_COMPILE_USE_SYSTEM_TINYXML=ON + -DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON -DMUE_DOWNLOAD_SOUNDFONT=OFF -DMUSE_APP_BUILD_MODE="release" -DMUSE_MODULE_AUDIO_JACK="$(usex jack)"
