commit: 30edd37b7c0d76fdf0932c32e11841f4ef3d2251 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Thu Oct 23 10:22:43 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Oct 26 18:25:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30edd37b
media-sound/musescore: comment CMAKE_QA_COMPAT_SKIP, fix patches amend comment for CMAKE_QA_COMPAT_SKIP find PkgConfig each time it's needed (fix configure w/ qt-6.10) Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44297 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/musescore/files/musescore-4.7-unbundle-gtest.patch | 3 ++- media-sound/musescore/files/musescore-4.7-unbundle-lame.patch | 3 ++- media-sound/musescore/files/musescore-4.7-unbundle-pugixml.patch | 3 ++- media-sound/musescore/musescore-9999.ebuild | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/media-sound/musescore/files/musescore-4.7-unbundle-gtest.patch b/media-sound/musescore/files/musescore-4.7-unbundle-gtest.patch index c7396f9885cd..36119e6e2d61 100644 --- a/media-sound/musescore/files/musescore-4.7-unbundle-gtest.patch +++ b/media-sound/musescore/files/musescore-4.7-unbundle-gtest.patch @@ -51,10 +51,11 @@ unbundle gmock/gtest # end compat ${MODULE_TEST_INCLUDE} -@@ -74,11 +69,15 @@ endif() +@@ -74,11 +69,16 @@ endif() find_package(Qt6Core REQUIRED) find_package(Qt6Gui REQUIRED) ++find_package(PkgConfig REQUIRED) +pkg_check_modules(gtest REQUIRED IMPORTED_TARGET gtest) +pkg_check_modules(gmock REQUIRED IMPORTED_TARGET gmock) +list(APPEND MODULE_TEST_INCLUDE ${gtest_INCLUDE_DIRS} ${gmock_INCLUDE_DIRS}) diff --git a/media-sound/musescore/files/musescore-4.7-unbundle-lame.patch b/media-sound/musescore/files/musescore-4.7-unbundle-lame.patch index 407489f9ef45..996b1701e149 100644 --- a/media-sound/musescore/files/musescore-4.7-unbundle-lame.patch +++ b/media-sound/musescore/files/musescore-4.7-unbundle-lame.patch @@ -1,12 +1,13 @@ unbundle lame --- a/src/framework/audio/engine/audio_engine.cmake +++ b/src/framework/audio/engine/audio_engine.cmake -@@ -185,8 +185,9 @@ if (MUSE_MODULE_AUDIO_EXPORT) +@@ -185,8 +185,10 @@ if (MUSE_MODULE_AUDIO_EXPORT) ${CMAKE_CURRENT_LIST_DIR}/internal/export/wavencoder.h ) - add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../thirdparty/lame lame EXCLUDE_FROM_ALL) - list(APPEND AUDIO_ENGINE_LINK lame) ++ find_package(PkgConfig REQUIRED) + pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame) + list(APPEND AUDIO_ENGINE_LINK PkgConfig::lame) + list(APPEND MODULE_INCLUDE_PRIVATE ${lame_INCLUDE_DIRS}) diff --git a/media-sound/musescore/files/musescore-4.7-unbundle-pugixml.patch b/media-sound/musescore/files/musescore-4.7-unbundle-pugixml.patch index 09fbd5ee670b..3f1dec82beb2 100644 --- a/media-sound/musescore/files/musescore-4.7-unbundle-pugixml.patch +++ b/media-sound/musescore/files/musescore-4.7-unbundle-pugixml.patch @@ -11,13 +11,14 @@ unbundle pugixml ) if (MUSE_THREADS_SUPPORT) -@@ -274,9 +271,9 @@ else () +@@ -274,9 +271,10 @@ else () set(Z_LIB z) endif () -list(APPEND MODULE_INCLUDE_PRIVATE - ${CMAKE_CURRENT_LIST_DIR}/thirdparty/pugixml -) ++find_package(PkgConfig REQUIRED) +pkg_check_modules(pugixml REQUIRED IMPORTED_TARGET pugixml) +list(APPEND MODULE_LINK PkgConfig::pugixml) +list(APPEND MODULE_INCLUDE_PRIVATE ${pugixml_INCLUDE_DIRS}) diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index b52803e02549..4ecfbacb3dc2 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -5,6 +5,7 @@ EAPI=8 # https://bugs.gentoo.org/958256, bundled fluidsynth: # src/framework/audio/thirdparty/fluidsynth/fluidsynth-2.3.3/src/gentables/CMakeLists.txt +# upstream files are >=3.16, KDDockWidgets is 3.12 CMAKE_QA_COMPAT_SKIP=yes CHECKREQS_DISK_BUILD=3500M inherit cmake flag-o-matic xdg check-reqs
