pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/musescore
Module Name: pkgsrc
Committed By: gutteridge
Date: Sun Nov 23 03:20:56 UTC 2025
Modified Files:
pkgsrc/audio/musescore: Makefile PLIST distinfo
Added Files:
pkgsrc/audio/musescore/patches: patch-buildscripts_cmake_SetupQt6.cmake
patch-src_appshell_CMakeLists.txt
patch-src_framework_accessibility_CMakeLists.txt
patch-src_framework_dockwindow_thirdparty_KDDockWidgets_CMakeLists.txt
patch-src_importexport_midi_internal_midiimport_importmidi__tuplet.cpp
Log Message:
musescore: fix builds with Qt 6.10 and consistent localization
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/audio/musescore/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/musescore/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/audio/musescore/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/audio/musescore/patches/patch-buildscripts_cmake_SetupQt6.cmake \
pkgsrc/audio/musescore/patches/patch-src_appshell_CMakeLists.txt \
pkgsrc/audio/musescore/patches/patch-src_framework_accessibility_CMakeLists.txt \
pkgsrc/audio/musescore/patches/patch-src_framework_dockwindow_thirdparty_KDDockWidgets_CMakeLists.txt \
pkgsrc/audio/musescore/patches/patch-src_importexport_midi_internal_midiimport_importmidi__tuplet.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/musescore/Makefile
diff -u pkgsrc/audio/musescore/Makefile:1.62 pkgsrc/audio/musescore/Makefile:1.63
--- pkgsrc/audio/musescore/Makefile:1.62 Sun Nov 2 23:02:53 2025
+++ pkgsrc/audio/musescore/Makefile Sun Nov 23 03:20:55 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2025/11/02 23:02:53 gutteridge Exp $
+# $NetBSD: Makefile,v 1.63 2025/11/23 03:20:55 gutteridge Exp $
DISTNAME= musescore-4.6.3
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=musescore/}
GITHUB_PROJECT= MuseScore
@@ -15,6 +16,8 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
USE_CXX_FEATURES= c++11
+DEPENDS+= qt6-qttranslations-[0-9]*:../../x11/qt6-qttranslations
+
CONFIGURE_DIRS= bindir
CMAKE_ARG_PATH= ..
Index: pkgsrc/audio/musescore/PLIST
diff -u pkgsrc/audio/musescore/PLIST:1.11 pkgsrc/audio/musescore/PLIST:1.12
--- pkgsrc/audio/musescore/PLIST:1.11 Wed Oct 15 01:32:00 2025
+++ pkgsrc/audio/musescore/PLIST Sun Nov 23 03:20:55 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2025/10/15 01:32:00 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.12 2025/11/23 03:20:55 gutteridge Exp $
bin/mscore
bin/musescore
share/mscore-4.6/autobotscripts/TC1.1_CreateSimpleScore.js
@@ -182,19 +182,80 @@ share/mscore-4.6/locale/musescore_vi.qm
share/mscore-4.6/locale/musescore_zh_CN.qm
share/mscore-4.6/locale/musescore_zh_HK.qm
share/mscore-4.6/locale/musescore_zh_TW.qm
+share/mscore-4.6/locale/qt_ar.qm
share/mscore-4.6/locale/qt_bg.qm
+share/mscore-4.6/locale/qt_ca.qm
+share/mscore-4.6/locale/qt_cs.qm
+share/mscore-4.6/locale/qt_da.qm
+share/mscore-4.6/locale/qt_de.qm
share/mscore-4.6/locale/qt_el.qm
+share/mscore-4.6/locale/qt_es.qm
share/mscore-4.6/locale/qt_eu.qm
+share/mscore-4.6/locale/qt_fa.qm
+share/mscore-4.6/locale/qt_fi.qm
+share/mscore-4.6/locale/qt_fr.qm
share/mscore-4.6/locale/qt_gd.qm
+share/mscore-4.6/locale/qt_gl.qm
+share/mscore-4.6/locale/qt_he.qm
+share/mscore-4.6/locale/qt_hr.qm
+share/mscore-4.6/locale/qt_hu.qm
share/mscore-4.6/locale/qt_id.qm
+share/mscore-4.6/locale/qt_it.qm
+share/mscore-4.6/locale/qt_ja.qm
+share/mscore-4.6/locale/qt_ka.qm
+share/mscore-4.6/locale/qt_ko.qm
+share/mscore-4.6/locale/qt_lg.qm
+share/mscore-4.6/locale/qt_lt.qm
share/mscore-4.6/locale/qt_lv.qm
share/mscore-4.6/locale/qt_nb.qm
share/mscore-4.6/locale/qt_nl.qm
share/mscore-4.6/locale/qt_nl_BE.qm
+share/mscore-4.6/locale/qt_nn.qm
+share/mscore-4.6/locale/qt_pl.qm
share/mscore-4.6/locale/qt_pt_BR.qm
+share/mscore-4.6/locale/qt_pt_PT.qm
share/mscore-4.6/locale/qt_ro.qm
+share/mscore-4.6/locale/qt_ru.qm
+share/mscore-4.6/locale/qt_sk.qm
+share/mscore-4.6/locale/qt_sl.qm
+share/mscore-4.6/locale/qt_sv.qm
share/mscore-4.6/locale/qt_tr.qm
+share/mscore-4.6/locale/qt_uk.qm
share/mscore-4.6/locale/qt_vi.qm
+share/mscore-4.6/locale/qt_zh_CN.qm
+share/mscore-4.6/locale/qt_zh_TW.qm
+share/mscore-4.6/locale/qtbase_ar.qm
+share/mscore-4.6/locale/qtbase_bg.qm
+share/mscore-4.6/locale/qtbase_ca.qm
+share/mscore-4.6/locale/qtbase_cs.qm
+share/mscore-4.6/locale/qtbase_da.qm
+share/mscore-4.6/locale/qtbase_de.qm
+share/mscore-4.6/locale/qtbase_en.qm
+share/mscore-4.6/locale/qtbase_es.qm
+share/mscore-4.6/locale/qtbase_fa.qm
+share/mscore-4.6/locale/qtbase_fi.qm
+share/mscore-4.6/locale/qtbase_fr.qm
+share/mscore-4.6/locale/qtbase_gd.qm
+share/mscore-4.6/locale/qtbase_he.qm
+share/mscore-4.6/locale/qtbase_hr.qm
+share/mscore-4.6/locale/qtbase_hu.qm
+share/mscore-4.6/locale/qtbase_it.qm
+share/mscore-4.6/locale/qtbase_ja.qm
+share/mscore-4.6/locale/qtbase_ka.qm
+share/mscore-4.6/locale/qtbase_ko.qm
+share/mscore-4.6/locale/qtbase_lg.qm
+share/mscore-4.6/locale/qtbase_lv.qm
+share/mscore-4.6/locale/qtbase_nl.qm
+share/mscore-4.6/locale/qtbase_nn.qm
+share/mscore-4.6/locale/qtbase_pl.qm
+share/mscore-4.6/locale/qtbase_pt_BR.qm
+share/mscore-4.6/locale/qtbase_ru.qm
+share/mscore-4.6/locale/qtbase_sk.qm
+share/mscore-4.6/locale/qtbase_sv.qm
+share/mscore-4.6/locale/qtbase_tr.qm
+share/mscore-4.6/locale/qtbase_uk.qm
+share/mscore-4.6/locale/qtbase_zh_CN.qm
+share/mscore-4.6/locale/qtbase_zh_TW.qm
share/mscore-4.6/plugins/colornotes/color_notes.png
share/mscore-4.6/plugins/colornotes/colornotes.qml_disabled
share/mscore-4.6/plugins/courtesy_accidentals/accidentals.png
Index: pkgsrc/audio/musescore/distinfo
diff -u pkgsrc/audio/musescore/distinfo:1.16 pkgsrc/audio/musescore/distinfo:1.17
--- pkgsrc/audio/musescore/distinfo:1.16 Sun Nov 2 23:02:53 2025
+++ pkgsrc/audio/musescore/distinfo Sun Nov 23 03:20:55 2025
@@ -1,17 +1,21 @@
-$NetBSD: distinfo,v 1.16 2025/11/02 23:02:53 gutteridge Exp $
+$NetBSD: distinfo,v 1.17 2025/11/23 03:20:55 gutteridge Exp $
BLAKE2s (musescore-4.6.3.tar.gz) = 79727837c385f28cc750beebcc5cff631ff6e2904d65f6733c3ab1f59c7b3401
SHA512 (musescore-4.6.3.tar.gz) = bd8f427154613f00d5a84a949b05351ce5fa8e9ce2f37410c97762d5dd29643c2e6c5bd763a40a99f927aa61d84a3572734189f2650daae5eb3a6a51717be923
Size (musescore-4.6.3.tar.gz) = 159635093 bytes
SHA1 (patch-buildscripts_cmake_GetPlatformInfo.cmake) = 70b3df41ecf452961167c3d654140b2dd4e9b4c4
+SHA1 (patch-buildscripts_cmake_SetupQt6.cmake) = 13481b92ef8f5c3956240c53074d1495f09ba967
SHA1 (patch-buildscripts_packaging_Linux+BSD_SetupAppImagePackaging.cmake) = 61f7af9d71636bb74ab048ca24b3be2469ce541b
SHA1 (patch-buildscripts_packaging_Linux+BSD_portable_portable-utils.in) = a77c5053ec230433765865d929e5dca3619e1b30
SHA1 (patch-src_app_CMakeLists.txt) = a7a401d5c420d1cec49879e4c57e45e3496ccf58
SHA1 (patch-src_app_internal_guiapp.cpp) = 1d0f662e98ffdd8b8d3fc6c8c3ea51453c4089d0
+SHA1 (patch-src_appshell_CMakeLists.txt) = cc9883d80d40ed9937b635ed3e00e37bc2481919
SHA1 (patch-src_appshell_appshellmodule.cpp) = 76416649178979e75ea40a8605b2f756b073716d
+SHA1 (patch-src_framework_accessibility_CMakeLists.txt) = f61c2840cacf2f48c046047c8810dd776d0aa86c
SHA1 (patch-src_framework_audio_driver_audio__driver.cmake) = 441b5b10ecb751a5d038ff6a231439ee09e09b95
SHA1 (patch-src_framework_audio_main_internal_audiodrivercontroller.cpp) = f4b8bd1d332a993ab618cf966435efb67e43f1f4
SHA1 (patch-src_framework_audio_thirdparty_fluidsynth_fluidsynth-2.3.3_src_external_portable__endian.h) = f9fa1c02fd12ac97f82bf10352b70b120ebe6ab4
+SHA1 (patch-src_framework_dockwindow_thirdparty_KDDockWidgets_CMakeLists.txt) = 950adde2e7802cf9a31bc0fbd648d87a3443d475
SHA1 (patch-src_framework_global_runtime.cpp) = 62452ec72bf7ca6a4c97d7e1b947e904b02f970c
SHA1 (patch-src_framework_global_types_string.cpp) = 9b76e6aab7a883cfd5a2162dce49da5da6ed2c8b
SHA1 (patch-src_framework_global_types_version.h) = e0dd1e25eeafa5e1d4bbc7616707c0c488835305
@@ -24,4 +28,5 @@ SHA1 (patch-src_framework_ui_uimodule.cp
SHA1 (patch-src_framework_ui_uimodule.h) = 2801ff4a9bb7f728b95cb035b67b9bc6949f47a1
SHA1 (patch-src_framework_uicomponents_view_buttonboxmodel.cpp) = 5bbdc8eb2690326b3b503a0fb42353b0dcd9ba08
SHA1 (patch-src_framework_vst_CMakeLists.txt) = ff5c79f88834380da112ca4d13b641d198ffca05
+SHA1 (patch-src_importexport_midi_internal_midiimport_importmidi__tuplet.cpp) = 78adbaa47f6acc71ac9f06ab5d49c6efb9ac3f13
SHA1 (patch-src_notation_internal_engravingfontscontroller.cpp) = b37e199cf862da70536dad48029a7ebae5b6d8a4
Added files:
Index: pkgsrc/audio/musescore/patches/patch-buildscripts_cmake_SetupQt6.cmake
diff -u /dev/null pkgsrc/audio/musescore/patches/patch-buildscripts_cmake_SetupQt6.cmake:1.1
--- /dev/null Sun Nov 23 03:20:56 2025
+++ pkgsrc/audio/musescore/patches/patch-buildscripts_cmake_SetupQt6.cmake Sun Nov 23 03:20:56 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-buildscripts_cmake_SetupQt6.cmake,v 1.1 2025/11/23 03:20:56 gutteridge Exp $
+
+Fix building with Qt 6.10.
+
+--- buildscripts/cmake/SetupQt6.cmake.orig 2025-10-21 08:21:23.000000000 +0000
++++ buildscripts/cmake/SetupQt6.cmake
+@@ -25,6 +25,7 @@ endif()
+ set(qt_components
+ Core
+ Gui
++ GuiPrivate
+ Widgets
+ Network
+ Qml
Index: pkgsrc/audio/musescore/patches/patch-src_appshell_CMakeLists.txt
diff -u /dev/null pkgsrc/audio/musescore/patches/patch-src_appshell_CMakeLists.txt:1.1
--- /dev/null Sun Nov 23 03:20:56 2025
+++ pkgsrc/audio/musescore/patches/patch-src_appshell_CMakeLists.txt Sun Nov 23 03:20:56 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_appshell_CMakeLists.txt,v 1.1 2025/11/23 03:20:56 gutteridge Exp $
+
+Fix building with Qt 6.10.
+
+--- src/appshell/CMakeLists.txt.orig 2025-10-21 08:21:23.000000000 +0000
++++ src/appshell/CMakeLists.txt
+@@ -143,7 +143,7 @@ if (NOT OS_IS_MAC)
+ endif(NOT OS_IS_MAC)
+
+ if (QT_SUPPORT)
+- list(APPEND MODULE_LINK Qt::Core5Compat Qt::Quick Qt::Svg Qt::Widgets)
++ list(APPEND MODULE_LINK Qt::Core5Compat Qt::GuiPrivate Qt::Quick Qt::Svg Qt::Widgets)
+ endif()
+
+ setup_module()
Index: pkgsrc/audio/musescore/patches/patch-src_framework_accessibility_CMakeLists.txt
diff -u /dev/null pkgsrc/audio/musescore/patches/patch-src_framework_accessibility_CMakeLists.txt:1.1
--- /dev/null Sun Nov 23 03:20:56 2025
+++ pkgsrc/audio/musescore/patches/patch-src_framework_accessibility_CMakeLists.txt Sun Nov 23 03:20:56 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_framework_accessibility_CMakeLists.txt,v 1.1 2025/11/23 03:20:56 gutteridge Exp $
+
+Fix building with Qt 6.10.
+
+--- src/framework/accessibility/CMakeLists.txt.orig 2025-10-21 08:21:23.000000000 +0000
++++ src/framework/accessibility/CMakeLists.txt
+@@ -57,7 +57,7 @@ if (MUSE_MODULE_ACCESSIBILITY_TRACE)
+ endif()
+
+ if (QT_SUPPORT)
+- list(APPEND MODULE_LINK Qt::Quick)
++ list(APPEND MODULE_LINK Qt::CorePrivate Qt::Quick)
+ endif()
+
+ setup_module()
Index: pkgsrc/audio/musescore/patches/patch-src_framework_dockwindow_thirdparty_KDDockWidgets_CMakeLists.txt
diff -u /dev/null pkgsrc/audio/musescore/patches/patch-src_framework_dockwindow_thirdparty_KDDockWidgets_CMakeLists.txt:1.1
--- /dev/null Sun Nov 23 03:20:56 2025
+++ pkgsrc/audio/musescore/patches/patch-src_framework_dockwindow_thirdparty_KDDockWidgets_CMakeLists.txt Sun Nov 23 03:20:56 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_framework_dockwindow_thirdparty_KDDockWidgets_CMakeLists.txt,v 1.1 2025/11/23 03:20:56 gutteridge Exp $
+
+Fix building with Qt 6.10.
+
+--- src/framework/dockwindow/thirdparty/KDDockWidgets/CMakeLists.txt.orig 2025-10-21 08:21:23.000000000 +0000
++++ src/framework/dockwindow/thirdparty/KDDockWidgets/CMakeLists.txt
+@@ -139,9 +139,17 @@ set(${PROJECT_NAME}_DEPS "widgets")
+ if(${PROJECT_NAME}_QTQUICK)
+ find_package(Qt${Qt_VERSION_MAJOR}Quick)
+ find_package(Qt${Qt_VERSION_MAJOR}QuickControls2)
++ if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0")
++ set(QT_NO_PRIVATE_MODULE_WARNING ON)
++ find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS QuickPrivate)
++ endif()
+ add_definitions(-DKDDOCKWIDGETS_QTQUICK)
+ set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} quick quickcontrols2")
+ else()
++ if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0")
++ set(QT_NO_PRIVATE_MODULE_WARNING ON)
++ find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS WidgetsPrivate)
++ endif()
+ add_definitions(-DKDDOCKWIDGETS_QTWIDGETS)
+ endif()
+
Index: pkgsrc/audio/musescore/patches/patch-src_importexport_midi_internal_midiimport_importmidi__tuplet.cpp
diff -u /dev/null pkgsrc/audio/musescore/patches/patch-src_importexport_midi_internal_midiimport_importmidi__tuplet.cpp:1.1
--- /dev/null Sun Nov 23 03:20:56 2025
+++ pkgsrc/audio/musescore/patches/patch-src_importexport_midi_internal_midiimport_importmidi__tuplet.cpp Sun Nov 23 03:20:56 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_importexport_midi_internal_midiimport_importmidi__tuplet.cpp,v 1.1 2025/11/23 03:20:56 gutteridge Exp $
+
+Fix building with Qt 6.10.
+
+--- src/importexport/midi/internal/midiimport/importmidi_tuplet.cpp.orig 2025-10-21 08:21:23.000000000 +0000
++++ src/importexport/midi/internal/midiimport/importmidi_tuplet.cpp
+@@ -895,9 +895,9 @@ void addTupletEvents(std::multimap<Reduc
+ message += QString::number(tiedTuplet.voice) + ", chord voice = ";
+ message += QString::number(midiChord.voice) + ", bar number (from 1) = ";
+ message += QString::number(midiChord.barIndex + 1);
+-#endif
+ Q_ASSERT_X(tiedTuplet.voice == midiChord.voice,
+ "MidiTuplet::addTupletEvents", message.toLatin1().data());
++#endif
+
+ for (int j: tiedTuplet.tiedNoteIndexes) {
+ midiChord.notes[j].tuplet = it;
Home |
Main Index |
Thread Index |
Old Index