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

[Miroslav Šulc]

commit:     a49eb83682dfb7204a6c463f198555fc292de51a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 26 08:59:28 2025 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 26 08:59:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49eb836

media-sound/musescore: updated live ebuild - added missing include, scrubbed 
patches

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/musescore-4.6.0-missing-includes.patch   | 24 ++++++----------------
 .../files/musescore-4.6.0-unbundle-gtest.patch     |  6 ------
 media-sound/musescore/musescore-9999.ebuild        |  1 +
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/media-sound/musescore/files/musescore-4.6.0-missing-includes.patch 
b/media-sound/musescore/files/musescore-4.6.0-missing-includes.patch
index fbc7f03ef53d..ca95a50b80db 100644
--- a/media-sound/musescore/files/musescore-4.6.0-missing-includes.patch
+++ b/media-sound/musescore/files/musescore-4.6.0-missing-includes.patch
@@ -1,22 +1,10 @@
---- a/src/framework/ui/view/internal/widgetdialogadapter.h
-+++ b/src/framework/ui/view/internal/widgetdialogadapter.h
-@@ -22,6 +22,8 @@
- #pragma once
+--- a/src/framework/ui/view/internal/widgetdialogadapter.cpp
++++ b/src/framework/ui/view/internal/widgetdialogadapter.cpp
+@@ -22,6 +22,7 @@
+ #include "widgetdialogadapter.h"
  
- #include <QObject>
-+#include <QDialog>
-+#include <QWindow>
+ #include <QGuiApplication>
++#include <QKeyEvent>
  
- namespace muse::ui {
- class WidgetDialogAdapter : public QObject
---- a/src/notation/internal/notationactioncontroller.cpp
-+++ b/src/notation/internal/notationactioncontroller.cpp
-@@ -34,6 +34,8 @@
- #include "translation.h"
  #include "log.h"
  
-+#include <QGuiApplication>
-+
- using namespace mu;
- using namespace muse;
- using namespace muse::io;

diff --git a/media-sound/musescore/files/musescore-4.6.0-unbundle-gtest.patch 
b/media-sound/musescore/files/musescore-4.6.0-unbundle-gtest.patch
index 58a27ee68277..174b59f435d0 100644
--- a/media-sound/musescore/files/musescore-4.6.0-unbundle-gtest.patch
+++ b/media-sound/musescore/files/musescore-4.6.0-unbundle-gtest.patch
@@ -1,6 +1,4 @@
 unbundle gtest
-diff --git a/buildscripts/cmake/DeclareModuleSetup.cmake 
b/buildscripts/cmake/DeclareModuleSetup.cmake
-index a40159ea51..2e697d6791 100644
 --- a/buildscripts/cmake/DeclareModuleSetup.cmake
 +++ b/buildscripts/cmake/DeclareModuleSetup.cmake
 @@ -182,13 +182,11 @@ macro(setup_module)
@@ -17,8 +15,6 @@ index a40159ea51..2e697d6791 100644
          # end compat
  
          ${MODULE_INCLUDE_PRIVATE}
-diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
-index 7db7bbd36d..cf17f4aafb 100644
 --- a/src/framework/CMakeLists.txt
 +++ b/src/framework/CMakeLists.txt
 @@ -123,8 +123,6 @@ if (MUSE_ENABLE_UNIT_TESTS)
@@ -30,8 +26,6 @@ index 7db7bbd36d..cf17f4aafb 100644
  endif()
  
  # Stubs
-diff --git a/src/framework/testing/gtest.cmake 
b/src/framework/testing/gtest.cmake
-index eb6b059674..30fdff0049 100644
 --- a/src/framework/testing/gtest.cmake
 +++ b/src/framework/testing/gtest.cmake
 @@ -50,13 +50,11 @@ target_include_directories(${MODULE_TEST} PRIVATE

diff --git a/media-sound/musescore/musescore-9999.ebuild 
b/media-sound/musescore/musescore-9999.ebuild
index 821d415b4ed0..81d62e7f2473 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -59,6 +59,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
        "${FILESDIR}/${PN}-4.5.0-unbundle-deps.patch"
        "${FILESDIR}/${PN}-4.6.0-unbundle-gtest.patch"
+       "${FILESDIR}/${PN}-4.6.0-missing-includes.patch"
 )
 
 src_unpack() {