gentoo auto-resync : 21:01:2024 - 02:09:25

4 files changed, 200 insertions, 0 deletions

diff --git a/media-sound/musescore/files/musescore-4.2.0-dynamic_cast-crash.patch b/media-sound/musescore/files/musescore-4.2.0-dynamic_cast-crash.patch
new file mode 100644
index 000000000000..0c9c43d11877
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-dynamic_cast-crash.patch
@@ -0,0 +1,11 @@
+--- a/src/engraving/style/style.cpp
++++ b/src/engraving/style/style.cpp
+@@ -42,7 +42,7 @@ using namespace mu::engraving;
+ 
+ const PropertyValue& MStyle::value(Sid idx) const
+ {
+-    if (idx == Sid::NOSTYLE) {
++    if (idx == Sid::NOSTYLE || size_t(idx) >= m_values.size()) {
+         static PropertyValue dummy;
+         return dummy;
+     }
diff --git a/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch b/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch
new file mode 100644
index 000000000000..2a40ccc00c35
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch
@@ -0,0 +1,41 @@
+--- a/src/framework/ui/uimodule.h
++++ b/src/framework/ui/uimodule.h
+@@ -24,6 +24,7 @@
+ #define MU_UI_UIMODULE_H
+ 
+ #include "modularity/imodulesetup.h"
++#include <QtGlobal>
+ 
+ namespace mu::ui {
+ class UiConfiguration;
+--- a/src/framework/ui/view/interactiveprovider.h
++++ b/src/framework/ui/view/interactiveprovider.h
+@@ -26,6 +26,7 @@
+ #include <QVariant>
+ #include <QMap>
+ #include <QStack>
++#include <QEventLoop>
+ 
+ #include "modularity/ioc.h"
+ #include "../iinteractiveprovider.h"
+--- a/src/importexport/videoexport/internal/videowriter.cpp
++++ b/src/importexport/videoexport/internal/videowriter.cpp
+@@ -32,6 +32,8 @@
+ 
+ #include "log.h"
+ 
++#include <QPainter>
++
+ using namespace mu::iex::videoexport;
+ using namespace mu::project;
+ using namespace mu::notation;
+--- a/src/learn/view/learnpagemodel.h
++++ b/src/learn/view/learnpagemodel.h
+@@ -23,6 +23,7 @@
+ #define MU_LEARN_LEARNPAGEMODEL_H
+ 
+ #include <QObject>
++#include <QVariant>
+ 
+ #include "async/asyncable.h"
+ 
diff --git a/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
new file mode 100644
index 000000000000..50b388814680
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
@@ -0,0 +1,119 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,7 +185,7 @@ if (MUE_BUILD_UNIT_TESTS)
+         FULL_DOCS "List XML files outputted by google test."
+     )
+ 
+-    add_subdirectory(thirdparty/googletest)
++    find_package(GTest REQUIRED)
+ endif(MUE_BUILD_UNIT_TESTS)
+ 
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
++++ b/src/framework/audio/CMakeLists.txt
+@@ -268,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT)
+         ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+         )
+ 
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
++    pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
++    pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
++    pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
++    pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
+ 
+-    set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
++    set(MODULE_LINK
++        ${MODULE_LINK}
++        PkgConfig::lame
++        PkgConfig::libopusenc
++        PkgConfig::flac
++        PkgConfig::flacpp
++    )
+ endif()
+ 
+ if (ARCH_IS_X86_64)
+--- a/src/framework/audio/internal/encoders/mp3encoder.cpp
++++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "mp3encoder.h"
+ 
+-#include "lame.h"
++#include "lame/lame.h"
+ 
+ using namespace mu;
+ using namespace mu::audio;
+--- a/src/framework/audio/internal/encoders/oggencoder.cpp
++++ b/src/framework/audio/internal/encoders/oggencoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "oggencoder.h"
+ 
+-#include "opusenc.h"
++#include "opus/opusenc.h"
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/CMakeLists.txt
++++ b/src/framework/global/CMakeLists.txt
+@@ -111,8 +111,6 @@ set(MODULE_SRC
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
+-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp
+-    ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
+     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
+@@ -130,6 +128,8 @@ set(MODULE_SRC
+     ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
+ )
+ 
++find_package(tinyxml2 REQUIRED)
++
+ if (GLOBAL_NO_INTERNAL)
+     set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
+ else()
+@@ -209,6 +209,7 @@ list(APPEND MODULE_INCLUDE
+ list(APPEND MODULE_LINK
+     ${FS_LIB}
+     ${Z_LIB}
++    tinyxml2::tinyxml2
+ )
+ 
+ if (MUE_ENABLE_CUSTOM_ALLOCATOR)
+--- a/src/framework/global/serialization/xmldom.cpp
++++ b/src/framework/global/serialization/xmldom.cpp
+@@ -21,7 +21,7 @@
+  */
+ #include "xmldom.h"
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/serialization/xmlstreamreader.cpp
++++ b/src/framework/global/serialization/xmlstreamreader.cpp
+@@ -23,7 +23,7 @@
+ 
+ #include <cstring>
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+ 
+ #include "log.h"
+ 
+--- a/src/framework/testing/gtest.cmake
++++ b/src/framework/testing/gtest.cmake
+@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED)
+ target_link_libraries(${MODULE_TEST}
+     Qt5::Core
+     Qt5::Gui
+-    gmock
++    GTest::gmock
+     global
+     ${MODULE_TEST_LINK}
+     )
diff --git a/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
new file mode 100644
index 000000000000..12bcb0f2f42b
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
@@ -0,0 +1,29 @@
+--- a/build/cmake/SetupAppImagePackaging.cmake
++++ b/build/cmake/SetupAppImagePackaging.cmake
+@@ -99,7 +99,7 @@ configure_file(${MAN_TARGET} ${MAN_BUILD})
+ # Note: Compressing man pages is normal on Linux but not OpenBSD
+ find_program(GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional).")
+ 
+-if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+     message(STATUS "Found 'gzip'. Man pages will be compressed.")
+     set(MAN_TARGET ${MAN_BUILD})
+     set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
+@@ -116,7 +116,7 @@ if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+         COMMAND echo "Man pages have been compressed ready for installation."
+         VERBATIM
+     )
+-else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+     if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+         message(STATUS "System is OpenBSD: Man pages will not be compressed.")
+     else(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -127,7 +127,7 @@ else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+         COMMAND echo "Man pages will be installed uncompressed."
+         VERBATIM
+     )
+-endif(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++endif(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+ 
+ # Install man pages in either compressed or uncompressed form
+ install(FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)