diff options
Diffstat (limited to 'audio/musescore')
| -rw-r--r-- | audio/musescore/Makefile | 25 | ||||
| -rw-r--r-- | audio/musescore/distinfo | 16 | ||||
| -rw-r--r-- | audio/musescore/files/patch-share_icons_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | audio/musescore/files/patch-src_framework_ui_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | audio/musescore/files/patch-src_framework_ui_uimodule.cpp | 18 | ||||
| -rw-r--r-- | audio/musescore/files/patch-src_notation_view_abstractnotationpaintview.cpp | 10 | ||||
| -rw-r--r-- | audio/musescore/files/patch-src_palette_view_widgets_specialcharactersdialog.cpp | 18 | ||||
| -rw-r--r-- | audio/musescore/pkg-plist | 14 |
8 files changed, 63 insertions, 50 deletions
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile index 139e334edd0d..f150c8a0a429 100644 --- a/audio/musescore/Makefile +++ b/audio/musescore/Makefile @@ -1,11 +1,14 @@ PORTNAME= ${GH_PROJECT:tl} DISTVERSIONPREFIX= v -DISTVERSION= 4.5.1 +DISTVERSION= 4.6.5 PORTREVISION= 1 CATEGORIES= audio PATCH_SITES= https://github.com/musescore/MuseScore/commit/ -PATCHFILES+= 05056ed19520060c3912a09a3adfa0927057f956.patch:-p1 # Fix build with Qt >= 6.9.0 +PATCHFILES+= b79c3ba61e599e2211ba69f7be561ecfbdab941c.patch:-p1 # Fix build with Qt 6.10.1 +PATCHFILES+= 6f63cd15ced0b2a624a85e471724fba922762974.patch:-p1 # Add missing include for Qt 6.10 +PATCHFILES+= e25d01bd7f650e51911929ec2aa519923913cd05.patch:-p1 # Add missing include for Qt 6.10 +PATCHFILES+= 36d544ab41abff3dc675202953486b837f21b8b6.patch:-p1 # Fix build on FreeBSD MAINTAINER= adridg@FreeBSD.org COMMENT= Free music composition & notation software @@ -17,7 +20,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libasound.so:audio/alsa-lib \ - libasound_module_pcm_oss.so:audio/alsa-plugins \ libFLAC.so:audio/flac \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ @@ -25,12 +27,13 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libopusenc.so:audio/libopusenc \ libtinyxml2.so:textproc/tinyxml2 \ libxkbcommon.so:x11/libxkbcommon +RUN_DEPENDS= alsa-plugins>=1.2:audio/alsa-plugins USES= cmake compiler:c++17-lang desktop-file-utils gl localbase \ pkgconfig qt:6 shared-mime-info -USE_QT= base 5compat declarative networkauth scxml svg \ - tools:build -USE_GL= gl +USE_GL= opengl +USE_QT= 5compat base declarative networkauth scxml svg \ + shadertools:build tools:build USE_GITHUB= yes GH_PROJECT= MuseScore @@ -41,15 +44,19 @@ GH_PROJECT= MuseScore # Note needs PORTVERSION:R once there is a .minor version DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R} -CMAKE_TESTS= MUE_BUILD_BRAILLE_TESTS MUE_BUILD_ENGRAVING_TESTS MUE_BUILD_IMPORTEXPORT_TESTS MUE_BUILD_NOTATION_TESTS MUE_BUILD_PLAYBACK_TESTS MUE_BUILD_PROJECT_TESTS +CMAKE_TESTS= MUE_BUILD_BRAILLE_TESTS \ + MUE_BUILD_ENGRAVING_TESTS \ + MUE_BUILD_IMPORTEXPORT_TESTS \ + MUE_BUILD_NOTATION_TESTS \ + MUE_BUILD_PLAYBACK_TESTS \ + MUE_BUILD_PROJECT_TESTS CMAKE_ON= MUE_COMPILE_USE_SYSTEM_FLAC \ MUE_COMPILE_USE_SYSTEM_FREETYPE \ MUE_COMPILE_USE_SYSTEM_HARFBUZZ \ MUE_COMPILE_USE_SYSTEM_OPUS \ MUE_COMPILE_USE_SYSTEM_OPUSENC \ MUE_COMPILE_USE_SYSTEM_TINYXML -CMAKE_OFF= MUE_BUILD_CRASHPAD_CLIENT \ - MUE_COMPILE_USE_PCH \ +CMAKE_OFF= MUSE_COMPILE_USE_PCH \ ${CMAKE_TESTS} CMAKE_BUILD_TYPE= release CMAKE_ARGS= -DMUSE_APP_BUILD_MODE="release" diff --git a/audio/musescore/distinfo b/audio/musescore/distinfo index 12e1c4fdc86c..ef66702f32f9 100644 --- a/audio/musescore/distinfo +++ b/audio/musescore/distinfo @@ -1,5 +1,11 @@ -TIMESTAMP = 1746432494 -SHA256 (musescore-MuseScore-v4.5.1_GH0.tar.gz) = 5ec033770599ee42ebc00e1a8c680b78de7ac871a0fa6484a68544653171b9ae -SIZE (musescore-MuseScore-v4.5.1_GH0.tar.gz) = 144481700 -SHA256 (05056ed19520060c3912a09a3adfa0927057f956.patch) = 8f8b1d947562ccb78875c00f50ece2ba32cb2ff38ef9da6350fc1eae4eac734a -SIZE (05056ed19520060c3912a09a3adfa0927057f956.patch) = 3471 +TIMESTAMP = 1766096878 +SHA256 (musescore-MuseScore-v4.6.5_GH0.tar.gz) = c9441c1344d2bd63f86e737e25293fbad532f3edec9380c7d42eab3a8042ced1 +SIZE (musescore-MuseScore-v4.6.5_GH0.tar.gz) = 159873358 +SHA256 (b79c3ba61e599e2211ba69f7be561ecfbdab941c.patch) = 1994c0f9d5ad28f341a88f484440b08d4e883a058fd45ac27cdbf27713fc31e7 +SIZE (b79c3ba61e599e2211ba69f7be561ecfbdab941c.patch) = 4348 +SHA256 (6f63cd15ced0b2a624a85e471724fba922762974.patch) = 20f6c338a6e0bb92607981565e40841dc0aeef68287864be7782e6c78d4cb8b9 +SIZE (6f63cd15ced0b2a624a85e471724fba922762974.patch) = 966 +SHA256 (e25d01bd7f650e51911929ec2aa519923913cd05.patch) = 73796ed2c3b5e5768fec3df7b49d41d3dd4845fc3a35e016eb69d6f8c27e9db8 +SIZE (e25d01bd7f650e51911929ec2aa519923913cd05.patch) = 1189 +SHA256 (36d544ab41abff3dc675202953486b837f21b8b6.patch) = 98823eda21bb81b31664d012c89a0953971bc62368b2f8ae75c0092f0a80f9bf +SIZE (36d544ab41abff3dc675202953486b837f21b8b6.patch) = 1356 diff --git a/audio/musescore/files/patch-share_icons_CMakeLists.txt b/audio/musescore/files/patch-share_icons_CMakeLists.txt index 94db8114ac87..59238d5df08b 100644 --- a/audio/musescore/files/patch-share_icons_CMakeLists.txt +++ b/audio/musescore/files/patch-share_icons_CMakeLists.txt @@ -1,11 +1,11 @@ ---- share/icons/CMakeLists.txt.orig 2025-01-16 11:02:26 UTC +--- share/icons/CMakeLists.txt.orig 2025-12-01 12:36:11 UTC +++ share/icons/CMakeLists.txt @@ -40,7 +40,7 @@ elseif(OS_IS_WIN) - install(FILES MscxIcon/MS4_MscxIcon.png RENAME mscx.png DESTINATION ${CMAKE_INSTALL_PREFIX}/../AppInfo/FileTypeIcons) + install(FILES MscxIcon/MS4_MscxIcon_512x512.png RENAME mscx.png DESTINATION ${CMAKE_INSTALL_PREFIX}/../AppInfo/FileTypeIcons) endif() -elseif(OS_IS_LIN) +elseif(OS_IS_LIN OR OS_IS_FBSD) foreach(SIZE 16 24 32 48 64 96 128 512) - install(FILES AppIcon/MS4_AppIcon_${SIZE}x${SIZE}.png RENAME mscore${MUSE_APP_INSTALL_SUFFIX}.png DESTINATION share/icons/hicolor/${SIZE}x${SIZE}/apps) - endforeach() + install(FILES AppIcon/MS4_AppIcon_${SIZE}x${SIZE}.png + RENAME mscore${MUSE_APP_INSTALL_SUFFIX}.png diff --git a/audio/musescore/files/patch-src_framework_ui_CMakeLists.txt b/audio/musescore/files/patch-src_framework_ui_CMakeLists.txt index 3c4a3212eaa6..8b474d24aff1 100644 --- a/audio/musescore/files/patch-src_framework_ui_CMakeLists.txt +++ b/audio/musescore/files/patch-src_framework_ui_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/framework/ui/CMakeLists.txt.orig 2024-12-11 12:43:18 UTC +--- src/framework/ui/CMakeLists.txt.orig 2025-12-01 12:36:11 UTC +++ src/framework/ui/CMakeLists.txt -@@ -49,6 +49,8 @@ elseif(OS_IS_LIN) +@@ -59,6 +59,8 @@ elseif(OS_IS_LIN) set(PLATFORM_THEME_SRC ${CMAKE_CURRENT_LIST_DIR}/internal/platform/linux/linuxplatformtheme.cpp ${CMAKE_CURRENT_LIST_DIR}/internal/platform/linux/linuxplatformtheme.h diff --git a/audio/musescore/files/patch-src_framework_ui_uimodule.cpp b/audio/musescore/files/patch-src_framework_ui_uimodule.cpp new file mode 100644 index 000000000000..13fc605f5f0e --- /dev/null +++ b/audio/musescore/files/patch-src_framework_ui_uimodule.cpp @@ -0,0 +1,18 @@ +--- src/framework/ui/uimodule.cpp.orig 2025-12-01 12:36:11 UTC ++++ src/framework/ui/uimodule.cpp +@@ -49,6 +49,7 @@ + #include "view/mainwindowbridge.h" + #else + #include "internal/platform/stub/stubplatformtheme.h" ++#include "internal/windowscontroller.h" + #include "view/mainwindowbridge.h" + #endif + +@@ -109,6 +110,7 @@ void UiModule::registerExports() + m_windowsController = std::make_shared<WindowsController>(); + #else + m_platformTheme = std::make_shared<StubPlatformTheme>(); ++ m_windowsController = std::make_shared<WindowsController>(); + #endif + + ioc()->registerExport<IUiConfiguration>(moduleName(), m_configuration); diff --git a/audio/musescore/files/patch-src_notation_view_abstractnotationpaintview.cpp b/audio/musescore/files/patch-src_notation_view_abstractnotationpaintview.cpp new file mode 100644 index 000000000000..032ff0b5ab92 --- /dev/null +++ b/audio/musescore/files/patch-src_notation_view_abstractnotationpaintview.cpp @@ -0,0 +1,10 @@ +--- src/notation/view/abstractnotationpaintview.cpp.orig 2025-12-01 12:36:11 UTC ++++ src/notation/view/abstractnotationpaintview.cpp +@@ -21,6 +21,7 @@ + */ + #include "abstractnotationpaintview.h" + ++#include <QCursor> + #include <QPainter> + #include <QMimeData> + diff --git a/audio/musescore/files/patch-src_palette_view_widgets_specialcharactersdialog.cpp b/audio/musescore/files/patch-src_palette_view_widgets_specialcharactersdialog.cpp deleted file mode 100644 index 5c7526072218..000000000000 --- a/audio/musescore/files/patch-src_palette_view_widgets_specialcharactersdialog.cpp +++ /dev/null @@ -1,18 +0,0 @@ -Fix build with Qt >= 6.9.0 - -/wrkdirs/usr/ports/audio/musescore/work/MuseScore-4.5/src/palette/view/widgets/specialcharactersdialog.cpp:715:55: -error: no matching member function for call to 'arg' - 715 | m_pUnicode->appendElement(fs, QString("0x%1").arg(code, 5, 16, QChar('0'))); - | ~~~~~~~~~~~~~~~~^~~ - ---- src/palette/view/widgets/specialcharactersdialog.cpp.orig 2025-03-13 18:44:57 UTC -+++ src/palette/view/widgets/specialcharactersdialog.cpp -@@ -712,7 +712,7 @@ void SpecialCharactersDialog::populateUnicode() - std::shared_ptr<FSymbol> fs = std::make_shared<FSymbol>(gpaletteScore->dummy()); - fs->setCode(code); - fs->setFont(m_font); -- m_pUnicode->appendElement(fs, QString("0x%1").arg(code, 5, 16, QLatin1Char('0'))); -+ m_pUnicode->appendElement(fs, QString("0x%1").arg(static_cast<quint32>(code), 5, 16, QLatin1Char('0'))); - } - } - diff --git a/audio/musescore/pkg-plist b/audio/musescore/pkg-plist index 4f4de2782f39..549dba62e2dc 100644 --- a/audio/musescore/pkg-plist +++ b/audio/musescore/pkg-plist @@ -24,6 +24,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg %%DATADIR%%/autobotscripts/TC8_EngravingText.js %%DATADIR%%/autobotscripts/TC9_BigScore(perfomance).js %%DATADIR%%/autobotscripts/data/Big_Score.mscz +%%DATADIR%%/autobotscripts/steps/Home.js %%DATADIR%%/autobotscripts/steps/Inspector.js %%DATADIR%%/autobotscripts/steps/Instruments.js %%DATADIR%%/autobotscripts/steps/Navigation.js @@ -50,9 +51,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg %%DATADIR%%/extensions/example3/configure.qml %%DATADIR%%/extensions/example3/manifest.json %%DATADIR%%/extensions/example3/remove.js -%%DATADIR%%/instruments/instruments.xml -%%DATADIR%%/instruments/orders.xml -%%DATADIR%%/instruments/string_tunings_presets.json %%DATADIR%%/locale/instruments_af.qm %%DATADIR%%/locale/instruments_ar.qm %%DATADIR%%/locale/instruments_ar_DZ.qm @@ -237,15 +235,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg %%DATADIR%%/styles/Modified Stave Notation/22mm_MSN.mss %%DATADIR%%/styles/Modified Stave Notation/25mm_MSN.mss %%DATADIR%%/styles/MuseJazz.mss -%%DATADIR%%/styles/cchords_muse.xml -%%DATADIR%%/styles/cchords_nrb.xml -%%DATADIR%%/styles/cchords_rb.xml -%%DATADIR%%/styles/cchords_sym.xml -%%DATADIR%%/styles/chords.xml -%%DATADIR%%/styles/chords_jazz.xml -%%DATADIR%%/styles/chords_std.xml -%%DATADIR%%/styles/jazzchords.xml -%%DATADIR%%/styles/stdchords.xml %%DATADIR%%/tables/Es-Es-G0.utb %%DATADIR%%/tables/IPA-unicode-range.uti %%DATADIR%%/tables/IPA.utb @@ -929,3 +918,4 @@ share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg %%DATADIR%%/wallpapers/paper5.png %%DATADIR%%/wallpapers/paper6.png %%DATADIR%%/wallpapers/paper7.png +%%DATADIR%%/workspaces/Default.mws |
