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

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

[Miroslav Šulc]

commit:     67c3343e1737cac41a1685f8ba12c7bc785ac1dd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 08:32:30 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 08:32:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c3343e

media-sound/musescore: updated patch for 9999

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/musescore-9999-lambda-capture-this.patch     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch b/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
index c0bb7083324..24c33bd2f18 100644
--- a/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
+++ b/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
@@ -1,13 +1,13 @@
 diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
-index 9804e1f32..83e0c0e47 100644
+index f3fe9ce8b..3957f90c6 100644
 --- a/mscore/scoreview.cpp
 +++ b/mscore/scoreview.cpp
-@@ -2405,7 +2405,7 @@ void ScoreView::cmd(const char* s)
-                   cv->updateGrips();
-                   }},
+@@ -2649,7 +2649,7 @@ void ScoreView::cmd(const char* s)
+                 cv->updateGrips();
+             } },
        #ifdef OMR
--            {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
-+            {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
-                   if (cv->score()->masterScore()->omr())
-                         showOmr(!_score->masterScore()->showOmr());
-                   }},
+-        { { "show-omr" }, [](ScoreView* cv, const QByteArray&) {
++        { { "show-omr" }, [&](ScoreView* cv, const QByteArray&) {
+                 if (cv->score()->masterScore()->omr()) {
+                     showOmr(!_score->masterScore()->showOmr());
+                 }

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

[Miroslav Šulc]

commit:     7ff12abe917314513dce9915fe7d41b0f0c2b1c8
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 06:32:26 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 06:45:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff12abe

media-sound/musescore: scrubbed a patch

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

 media-sound/musescore/files/musescore-3.0.1-man-pages.patch | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
index fd5ade55ed42..a9e871f12d77 100644
--- a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
+++ b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6437963..2a173b9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -660,7 +660,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)

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

[Joonas Niilola]

commit:     302c23d4976a3d12e5385fee424c28a0d5bc34a8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug 28 07:15:19 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 07:25:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302c23d4

media-sound/musescore: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/musescore-9999-unbundle-deps.patch       | 120 ---------------------
 1 file changed, 120 deletions(-)

diff --git a/media-sound/musescore/files/musescore-9999-unbundle-deps.patch b/media-sound/musescore/files/musescore-9999-unbundle-deps.patch
deleted file mode 100644
index bac09d7eaa82..000000000000
--- a/media-sound/musescore/files/musescore-9999-unbundle-deps.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,7 +206,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
-@@ -112,9 +112,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}/thirdparty/tinyxml/mu_patch.h
-     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
-     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
-     ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
-@@ -132,6 +129,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()
-@@ -213,6 +212,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
-@@ -25,7 +25,7 @@
- 
- #include "global/types/string.h"
- 
--#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}
-     )

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

[Conrad Kostecki]

commit:     9bd17cd8fde4eaedc605e7c02cdd85eaf250f8d4
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 12 17:48:33 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 13:40:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd17cd8

media-sound/musescore: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/38959
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/musescore-4.4.0-unbundle-harfbuzz.patch  | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch b/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch
deleted file mode 100644
index b9a1247a78c1..000000000000
--- a/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/framework/draw/CMakeLists.txt
-+++ b/src/framework/draw/CMakeLists.txt
-@@ -123,20 +123,14 @@ else()
-     include(${local_path}/harfbuzz.cmake)
- 
-     # func from ${name}.cmake)
--    cmake_language(CALL harfbuzz_Populate ${remote_url} ${local_path} "source" "" "")
- 
--    add_subdirectory(_deps/harfbuzz/harfbuzz)
--    target_no_warning(harfbuzz -Wno-conversion)
--    target_no_warning(harfbuzz -Wno-unused-parameter)
--    target_no_warning(harfbuzz -Wno-unused-variable)
--    target_no_warning(harfbuzz -WMSVC-no-hides-previous)
--    target_no_warning(harfbuzz -WMSVC-no-unreachable)
-+    pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz)
- 
-     #add_subdirectory(thirdparty/msdfgen)
- 
-     set(MODULE_INCLUDE
-         ${FREETYPE_INCLUDE_DIRS}
--        ${CMAKE_CURRENT_LIST_DIR}/_deps/harfbuzz/harfbuzz/harfbuzz/src
-+	/usr/include/harfbuzz
-         #${CMAKE_CURRENT_LIST_DIR}/thirdparty/msdfgen/msdfgen-1.4
-     )
- 

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

[Miroslav Šulc]

commit:     7f2fc1cec976c9d3fdfa0b21123d368a4d113e25
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 22:50:53 2025 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 22:51:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2fc1ce

media-sound/musescore: fixed live ebuild

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

 .../musescore/files/musescore-4.5.0-missing-includes.patch    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/media-sound/musescore/files/musescore-4.5.0-missing-includes.patch b/media-sound/musescore/files/musescore-4.5.0-missing-includes.patch
index 3a40a5a2d070..617262bfa398 100644
--- a/media-sound/musescore/files/musescore-4.5.0-missing-includes.patch
+++ b/media-sound/musescore/files/musescore-4.5.0-missing-includes.patch
@@ -21,3 +21,14 @@
  static const QString PAD_NAMES_CODE("percussion-pad-names");
  static const QString NOTATION_PREVIEW_CODE("percussion-notation-preview");
  static const QString EDIT_LAYOUT_CODE("percussion-edit-layout");
+--- a/src/notation/view/paintedengravingitem.cpp
++++ b/src/notation/view/paintedengravingitem.cpp
+@@ -24,6 +24,8 @@
+ 
+ #include "notation/utilities/engravingitempreviewpainter.h"
+ 
++#include <QPainter>
++
+ using namespace mu::notation;
+ 
+ PaintedEngravingItem::PaintedEngravingItem(QQuickItem* parent)