mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-09 00:07:57 +03:00
media-sound/musescore/files: drop unused patches
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44297 Closes: https://github.com/gentoo/gentoo/pull/44297 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
parent
30edd37b7c
commit
611c41493f
@ -1,10 +0,0 @@
|
||||
--- a/src/framework/ui/view/internal/widgetdialogadapter.cpp
|
||||
+++ b/src/framework/ui/view/internal/widgetdialogadapter.cpp
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "widgetdialogadapter.h"
|
||||
|
||||
#include <QGuiApplication>
|
||||
+#include <QKeyEvent>
|
||||
|
||||
#include "log.h"
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
unbundle gtest
|
||||
--- a/buildscripts/cmake/DeclareModuleSetup.cmake
|
||||
+++ b/buildscripts/cmake/DeclareModuleSetup.cmake
|
||||
@@ -182,13 +182,11 @@ macro(setup_module)
|
||||
${MUSE_FRAMEWORK_PATH}
|
||||
${MUSE_FRAMEWORK_PATH}/framework
|
||||
${MUSE_FRAMEWORK_PATH}/framework/global
|
||||
- ${MUSE_FRAMEWORK_PATH}/framework/testing/thirdparty/googletest/googletest/include
|
||||
|
||||
# compat
|
||||
${MUSE_FRAMEWORK_PATH}/src
|
||||
${MUSE_FRAMEWORK_PATH}/src/framework
|
||||
${MUSE_FRAMEWORK_PATH}/src/framework/global
|
||||
- ${MUSE_FRAMEWORK_PATH}/src/framework/testing/thirdparty/googletest/googletest/include
|
||||
# end compat
|
||||
|
||||
${MODULE_INCLUDE_PRIVATE}
|
||||
--- a/src/framework/CMakeLists.txt
|
||||
+++ b/src/framework/CMakeLists.txt
|
||||
@@ -123,8 +123,6 @@ if (MUSE_ENABLE_UNIT_TESTS)
|
||||
FULL_DOCS "List XML files outputted by google test."
|
||||
)
|
||||
|
||||
- set(INSTALL_GTEST OFF)
|
||||
- add_subdirectory(testing/thirdparty/googletest)
|
||||
endif()
|
||||
|
||||
# Stubs
|
||||
--- a/src/framework/testing/gtest.cmake
|
||||
+++ b/src/framework/testing/gtest.cmake
|
||||
@@ -50,13 +50,11 @@ target_include_directories(${MODULE_TEST} PRIVATE
|
||||
${MUSE_FRAMEWORK_PATH}
|
||||
${MUSE_FRAMEWORK_PATH}/framework
|
||||
${MUSE_FRAMEWORK_PATH}/framework/global
|
||||
- ${MUSE_FRAMEWORK_PATH}/framework/testing/thirdparty/googletest/googletest/include
|
||||
|
||||
# compat
|
||||
${MUSE_FRAMEWORK_PATH}/src
|
||||
${MUSE_FRAMEWORK_PATH}/src/framework
|
||||
${MUSE_FRAMEWORK_PATH}/src/framework/global
|
||||
- ${MUSE_FRAMEWORK_PATH}/src/framework/testing/thirdparty/googletest/googletest/include
|
||||
# end compat
|
||||
|
||||
${MODULE_TEST_INCLUDE}
|
||||
@@ -74,10 +72,12 @@ endif()
|
||||
|
||||
find_package(Qt6Core REQUIRED)
|
||||
find_package(Qt6Gui REQUIRED)
|
||||
+find_package(GTest REQUIRED)
|
||||
|
||||
target_link_libraries(${MODULE_TEST}
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
+ gtest
|
||||
gmock
|
||||
muse_global
|
||||
${MODULE_TEST_LINK}
|
||||
Loading…
x
Reference in New Issue
Block a user