Skip to content

Commit 5dfd314

Browse files
chrysos349chrysos349
committed
musescore: update to 4.6.3
1 parent 64c5204 commit 5dfd314

File tree

5 files changed

+131
-54
lines changed

5 files changed

+131
-54
lines changed

‎srcpkgs/musescore/patches/840f8b7ded19cdc5d2dc78d32e396494aaf8c4c0.patch‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
From b67be2bace728c870bde6e327649a3f9441346ea Mon Sep 17 00:00:00 2001
2+
From: Doron Behar <[email protected]>
3+
Date: Wed, 22 Oct 2025 18:52:04 +0300
4+
Subject: [PATCH 1/3] kddockwidgets: find_package Qt::GuiPrivate
5+
6+
---
7+
src/framework/dockwindow/thirdparty/KDDockWidgets/CMakeLists.txt | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/src/framework/dockwindow/thirdparty/KDDockWidgets/CMakeLists.txt b/src/framework/dockwindow/thirdparty/KDDockWidgets/CMakeLists.txt
11+
index 1f155153d8f5b..ce81f4ecff861 100644
12+
--- a/src/framework/dockwindow/thirdparty/KDDockWidgets/CMakeLists.txt
13+
+++ b/src/framework/dockwindow/thirdparty/KDDockWidgets/CMakeLists.txt
14+
@@ -139,6 +139,7 @@ set(${PROJECT_NAME}_DEPS "widgets")
15+
if(${PROJECT_NAME}_QTQUICK)
16+
find_package(Qt${Qt_VERSION_MAJOR}Quick)
17+
find_package(Qt${Qt_VERSION_MAJOR}QuickControls2)
18+
+ find_package(Qt${Qt_VERSION_MAJOR} REQUIRED COMPONENTS GuiPrivate)
19+
add_definitions(-DKDDOCKWIDGETS_QTQUICK)
20+
set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} quick quickcontrols2")
21+
else()
22+
23+
From 17aeb1ec256b20bf2cd61b336ffeae16920ca592 Mon Sep 17 00:00:00 2001
24+
From: Sarun Intaralawan <[email protected]>
25+
Date: Thu, 23 Oct 2025 15:36:09 +0700
26+
Subject: [PATCH 2/3] accessibility: link with Qt6::CorePrivate
27+
28+
---
29+
src/framework/accessibility/CMakeLists.txt | 3 ++-
30+
1 file changed, 2 insertions(+), 1 deletion(-)
31+
32+
diff --git a/src/framework/accessibility/CMakeLists.txt b/src/framework/accessibility/CMakeLists.txt
33+
index 9d0f42ac6182a..bf5e3b94abfa5 100644
34+
--- a/src/framework/accessibility/CMakeLists.txt
35+
+++ b/src/framework/accessibility/CMakeLists.txt
36+
@@ -48,7 +48,8 @@ set(MODULE_SRC
37+
38+
if (OS_IS_LIN)
39+
# it needed to send a spontaneous event by activating navigation
40+
- set(MODULE_INCLUDE_PRIVATE ${Qt6Core_PRIVATE_INCLUDE_DIRS})
41+
+ find_package(Qt6 REQUIRED COMPONENTS CorePrivate)
42+
+ set(MODULE_LINK ${MODULE_LINK} Qt6::CorePrivate)
43+
endif()
44+
45+
46+
47+
From 650e05645f1c45993ec566c98c3d9743650cf8c1 Mon Sep 17 00:00:00 2001
48+
From: Sarun Intaralawan <[email protected]>
49+
Date: Thu, 23 Oct 2025 17:23:51 +0700
50+
Subject: [PATCH 3/3] appshell: link with Qt6::GuiPrivate
51+
52+
---
53+
src/appshell/CMakeLists.txt | 3 ++-
54+
1 file changed, 2 insertions(+), 1 deletion(-)
55+
56+
diff --git a/src/appshell/CMakeLists.txt b/src/appshell/CMakeLists.txt
57+
index 4e90bf8dfbca1..cff28a5a45b10 100644
58+
--- a/src/appshell/CMakeLists.txt
59+
+++ b/src/appshell/CMakeLists.txt
60+
@@ -132,7 +132,8 @@ if (NOT OS_IS_MAC)
61+
)
62+
63+
# we use QKeyMapper to fix https://github.com/musescore/MuseScore/issues/10181
64+
- set(MODULE_INCLUDE_PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS} )
65+
+ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
66+
+ set(MODULE_LINK ${MODULE_LINK} Qt6::GuiPrivate)
67+
endif(NOT OS_IS_MAC)
68+
69+
if (QT_SUPPORT)

‎srcpkgs/musescore/patches/8a9a871c47b934423eb1d6568d7dbcd5c8c8b3b1.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 8a9a871c47b934423eb1d6568d7dbcd5c8c8b3b1 Mon Sep 17 00:00:00 2001
2+
From: Jerry James <[email protected]>
3+
Date: Thu, 9 Oct 2025 09:36:05 -0600
4+
Subject: [PATCH] Fix build failure when !QT_DEBUG
5+
6+
---
7+
src/importexport/midi/internal/midiimport/importmidi_tuplet.cpp | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/importexport/midi/internal/midiimport/importmidi_tuplet.cpp b/src/importexport/midi/internal/midiimport/importmidi_tuplet.cpp
11+
index 729e928a09d80..21c0ee1853cbd 100644
12+
--- a/src/importexport/midi/internal/midiimport/importmidi_tuplet.cpp
13+
+++ b/src/importexport/midi/internal/midiimport/importmidi_tuplet.cpp
14+
@@ -895,9 +895,9 @@ void addTupletEvents(std::multimap<ReducedFraction, TupletData>& tupletEvents,
15+
message += QString::number(tiedTuplet.voice) + ", chord voice = ";
16+
message += QString::number(midiChord.voice) + ", bar number (from 1) = ";
17+
message += QString::number(midiChord.barIndex + 1);
18+
-#endif
19+
Q_ASSERT_X(tiedTuplet.voice == midiChord.voice,
20+
"MidiTuplet::addTupletEvents", message.toLatin1().data());
21+
+#endif
22+
23+
for (int j: tiedTuplet.tiedNoteIndexes) {
24+
midiChord.notes[j].tuplet = it;

‎srcpkgs/musescore/patches/gcc14.patch‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎srcpkgs/musescore/patches/unbundle-lame.patch‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
unbundle lame
2+
--- a/src/framework/audio/worker/audio_worker.cmake
3+
+++ b/src/framework/audio/worker/audio_worker.cmake
4+
@@ -159,8 +159,10 @@ if (MUSE_MODULE_AUDIO_EXPORT)
5+
${CMAKE_CURRENT_LIST_DIR}/internal/export/wavencoder.h
6+
)
7+
8+
- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../thirdparty/lame lame EXCLUDE_FROM_ALL)
9+
- list(APPEND AUDIO_WORKER_LINK lame)
10+
+ find_package(PkgConfig REQUIRED)
11+
+ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
12+
+ list(APPEND AUDIO_WORKER_LINK PkgConfig::lame)
13+
+ list(APPEND MODULE_INCLUDE_PRIVATE ${lame_INCLUDE_DIRS})
14+
15+
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/SetupOpusEnc.cmake)
16+
list(APPEND AUDIO_WORKER_LINK ${LIBOPUSENC_TARGETS})

‎srcpkgs/musescore/template‎

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,28 @@
11
# Template file for 'musescore'
22
pkgname=musescore
3-
version=3.6.2
4-
revision=3
5-
build_style=gnu-makefile
6-
make_build_args="USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
7-
DOWNLOAD_SOUNDFONT=OFF MUSESCORE_BUILD_CONFIG=release"
8-
make_install_args="-C build.release"
9-
hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-tools"
10-
makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
11-
portmidi-devel pulseaudio-devel qt5-declarative-devel qt5-script-devel
12-
qt5-svg-devel qt5-tools-devel qt5-webchannel-devel
13-
qt5-location-devel qt5-xmlpatterns-devel qt5-plugin-mysql qt5-plugin-odbc
14-
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
15-
depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
3+
version=4.6.3
4+
revision=1
5+
build_style=cmake
6+
build_helper=qmake6
7+
configure_args="-DMUE_BUILD_BRAILLE_TESTS=OFF -DMUE_BUILD_CONVERTER_TESTS=OFF
8+
-DMUE_BUILD_ENGRAVING_TESTS=OFF -DMUE_BUILD_IMPORTEXPORT_TESTS=OFF
9+
-DMUE_BUILD_NOTATION_TESTS=OFF -DMUE_BUILD_PLAYBACK_TESTS=OFF
10+
-DMUE_BUILD_PROJECT_TESTS=OFF -DMUE_COMPILE_USE_SYSTEM_FLAC=ON
11+
-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON -DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON
12+
-DMUE_COMPILE_USE_SYSTEM_OPUS=ON -DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
13+
-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON -DMUE_INSTALL_SOUNDFONT=ON
14+
-DMUSESCORE_BUILD_CONFIGURATION=app -DMUSE_APP_BUILD_MODE=release
15+
-DMUSE_ENABLE_UNIT_TESTS=OFF -DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF
16+
-DMUSE_MODULE_UPDATE=OFF -Wno-dev"
17+
hostmakedepends="pkg-config qt6-declarative-host-tools qt6-shadertools qt6-tools"
18+
makedepends="libflac-devel libopusenc-devel libsndfile-devel
19+
qt6-base-private-devel qt6-declarative-devel qt6-networkauth-devel
20+
qt6-qt5compat-devel qt6-scxml-devel qt6-shadertools-devel qt6-svg-devel
21+
tinyxml2-devel"
22+
depends="qt6-plugin-tls-openssl"
1623
short_desc="Create, play and print beautiful sheet music"
1724
maintainer="Orphaned <[email protected]>"
1825
license="GPL-2.0-or-later"
1926
homepage="https://musescore.org/"
20-
_soundfont_url="https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General"
21-
distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz
22-
${_soundfont_url}/MuseScore_General.sf3
23-
${_soundfont_url}/MuseScore_General_License.md"
24-
checksum="c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45
25-
5b85b6c2c61d10b2b91cddd41efcce7b25cd31c8271d511c73afafbef20b6fa3
26-
5ad8d737e13c7f01f5b9674872a82a92b4ba253603e8ed14b9db12293550b4b9"
27-
skip_extraction="MuseScore_General.sf3 MuseScore_General_License.md"
28-
29-
post_extract() {
30-
cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/MuseScore_General.sf3" "${wrksrc}/share/sound/"
31-
cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/MuseScore_General_License.md" "${wrksrc}/share/sound/"
32-
}
33-
34-
post_patch() {
35-
vsed -i CMakeLists.txt -e 's/CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0/CMAKE_MINIMUM_REQUIRED(VERSION 3.5.0/g'
36-
}
27+
distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
28+
checksum=507f4e8566b693fe27b08ea3e5861a0fe1cecf3bbc72cbac13657bd4f49234d5

0 commit comments

Comments
 (0)