Revert "audio/musescore: update 4.2.1 → 4.4.4"

This reverts commit e7692b5aad.
This commit is contained in:
Yuri Victorovich 2025-01-16 03:46:13 -08:00
parent e7692b5aad
commit d19f1a5a53
17 changed files with 196 additions and 103 deletions

View file

@ -1,32 +1,27 @@
PORTNAME= ${GH_PROJECT:tl}
DISTVERSIONPREFIX= v
DISTVERSION= 4.4.4
DISTVERSION= 4.2.1
CATEGORIES= audio
MAINTAINER= adridg@FreeBSD.org
COMMENT= Free music composition & notation software
WWW= https://musescore.org/ \
https://github.com/musescore/MuseScore
WWW= https://musescore.org/
LICENSE= GPLv3
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 \
libopus.so:audio/opus \
libopusenc.so:audio/libopusenc \
libtinyxml2.so:textproc/tinyxml2 \
libxkbcommon.so:x11/libxkbcommon
libasound_module_pcm_oss.so: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
USES= cmake compiler:c++11-lib desktop-file-utils localbase \
pkgconfig qt:5 shared-mime-info
USE_QT= concurrent core dbus declarative designer graphicaleffects gui \
network networkauth opengl printsupport \
quickcontrols quickcontrols2 svg \
widgets x11extras xml xmlpatterns \
buildtools:build linguisttools:build qmake:build testlib:build \
uitools:build
USE_GITHUB= yes
GH_PROJECT= MuseScore
@ -37,26 +32,34 @@ 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_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_TESTS}
MUE_COMPILE_USE_PCH
CMAKE_BUILD_TYPE= release
CMAKE_ARGS= -DMUSE_APP_BUILD_MODE="release"
post-stage:
# workaround for https://github.com/musescore/MuseScore/issues/26103
@${RM} -r \
${STAGEDIR}${PREFIX}/include \
${STAGEDIR}${PREFIX}/lib \
${STAGEDIR}${PREFIX}/libdata
# workaround for https://github.com/musescore/MuseScore/issues/26104
@${INSTALL_DATA} ${FILESDIR}/mscore.desktop ${STAGEDIR}${PREFIX}/share/applications/
find ${STAGEDIR}${PREFIX}/lib -name '*.a' -delete # static libs from gtest
find ${STAGEDIR}${PREFIX}/lib/cmake -name '*.cmake' -delete # cmake configuration for kddockwidget
find ${STAGEDIR}${PREFIX}/include -name '*.h' -delete # headers for gtest, dockwidgets
find ${STAGEDIR}${PREFIX}/include -name 'README.md' -delete # readmes from gtest
find ${STAGEDIR}${PREFIX}/libdata -name '*.pc' -delete # pkgconfig from gtest
rmdir \
${STAGEDIR}${PREFIX}/include/gmock/internal/custom \
${STAGEDIR}${PREFIX}/include/gmock/internal \
${STAGEDIR}${PREFIX}/include/gmock \
${STAGEDIR}${PREFIX}/include/gtest/internal/custom \
${STAGEDIR}${PREFIX}/include/gtest/internal \
${STAGEDIR}${PREFIX}/include/gtest \
${STAGEDIR}${PREFIX}/include/kddockwidgets/private/indicators \
${STAGEDIR}${PREFIX}/include/kddockwidgets/private/multisplitter \
${STAGEDIR}${PREFIX}/include/kddockwidgets/private/quick \
${STAGEDIR}${PREFIX}/include/kddockwidgets/private \
${STAGEDIR}${PREFIX}/include/kddockwidgets \
${STAGEDIR}${PREFIX}/include/opus \
${STAGEDIR}${PREFIX}/lib/cmake/GTest \
${STAGEDIR}${PREFIX}/lib/cmake/KDDockWidgets \
${STAGEDIR}${PREFIX}/lib/cmake
${INSTALL_DATA} ${FILESDIR}/mscore.desktop ${STAGEDIR}${PREFIX}/share/applications/
${INSTALL_DATA} ${WRKSRC}/share/icons/AppIcon/MS4_AppIcon_48x48.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/mscore.png
.include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1737006473
SHA256 (musescore-MuseScore-v4.4.4_GH0.tar.gz) = 13d78c168bbe43e6b9bb213d03cabc727615b7e638a4ef037ef819efd2b4109b
SIZE (musescore-MuseScore-v4.4.4_GH0.tar.gz) = 143607247
TIMESTAMP = 1707166162
SHA256 (musescore-MuseScore-v4.2.1_GH0.tar.gz) = 9636b303afdb44228dc6d64dbc14773b60840dec7225602d79b126d97f555680
SIZE (musescore-MuseScore-v4.2.1_GH0.tar.gz) = 136655690

View file

@ -0,0 +1,11 @@
--- CMakeLists.txt.orig 2024-01-23 09:35:14 UTC
+++ CMakeLists.txt
@@ -48,7 +48,7 @@ set(MUSESCORE_BUILD_CONFIGURATION "app" CACHE STRING "
# - vtest - for visual tests (for CI)
# - utest - for unit tests (for CI)
-set(MUSESCORE_BUILD_MODE "dev" CACHE STRING "Build mode")
+set(MUSESCORE_BUILD_MODE "release" CACHE STRING "Build mode")
# Possible MUSESCORE_BUILD_MODE values:
# - dev - for development/nightly builds
# - testing - for testing versions (alpha, beta, RC)

View file

@ -0,0 +1,42 @@
--- build/cmake/FindQt5.cmake.orig 2023-07-14 09:53:57 UTC
+++ build/cmake/FindQt5.cmake
@@ -2,7 +2,7 @@
include(GetUtilsFunctions) # library of CMake functions ("fn__" namespace)
# Print Qt version or fail the build if Qt (qmake) is not in PATH.
-fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake)
+fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
@@ -41,7 +41,7 @@ if (WIN32)
)
endif(WIN32)
-if (OS_IS_LIN)
+if (TRUE)
set(_components
${_components}
DBus
@@ -52,9 +52,13 @@ find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)
foreach(_component ${_components})
find_package(Qt5${_component})
- list(APPEND QT_LIBRARIES ${Qt5${_component}_LIBRARIES})
- list(APPEND QT_INCLUDES ${Qt5${_component}_INCLUDE_DIRS})
- add_definitions(${Qt5${_component}_DEFINITIONS})
+ if(NOT Qt5${_component}_FOUND)
+ message(STATUS "Missing component ${_component}")
+ else()
+ list(APPEND QT_LIBRARIES ${Qt5${_component}_LIBRARIES})
+ list(APPEND QT_INCLUDES ${Qt5${_component}_INCLUDE_DIRS})
+ add_definitions(${Qt5${_component}_DEFINITIONS})
+ endif()
endforeach()
include_directories(${QT_INCLUDES})
@@ -89,3 +93,4 @@ foreach(_var ${_qmake_vars})
endforeach(_var)
#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
+set(Qt5_FOUND ON)

View file

@ -0,0 +1,10 @@
--- build/cmake/GetPlatformInfo.cmake.orig 2024-02-06 21:53:14 UTC
+++ build/cmake/GetPlatformInfo.cmake
@@ -29,6 +29,7 @@ elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
set(OS_IS_LIN 1)
elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD")
+ set(OS_IS_LIN 1)
set(OS_IS_FBSD 1)
elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
set(OS_IS_MAC 1)

View file

@ -1,11 +0,0 @@
--- share/icons/CMakeLists.txt.orig 2025-01-16 11:02:26 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)
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()

View file

@ -0,0 +1,11 @@
--- src/diagnostics/view/diagnosticspathsmodel.cpp.orig 2023-07-14 10:17:41 UTC
+++ src/diagnostics/view/diagnosticspathsmodel.cpp
@@ -19,6 +19,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
+#include <QUrl>
+
#include "diagnosticspathsmodel.h"
#include "log.h"

View file

@ -1,6 +1,6 @@
--- src/framework/ui/CMakeLists.txt.orig 2024-12-11 12:43:18 UTC
--- src/framework/ui/CMakeLists.txt.orig 2024-02-08 21:39:07 UTC
+++ src/framework/ui/CMakeLists.txt
@@ -49,6 +49,8 @@ elseif(OS_IS_LIN)
@@ -48,6 +48,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

View file

@ -1,16 +0,0 @@
--- src/framework/ui/graphicsapiprovider.cpp.orig 2025-01-16 06:06:20 UTC
+++ src/framework/ui/graphicsapiprovider.cpp
@@ -56,6 +56,13 @@ static const std::vector<GraphicsApiProvider::Api > AL
};
#endif
+#ifdef Q_OS_FREEBSD
+static const std::vector<GraphicsApiProvider::Api > ALLOWED_APIS = {
+ GraphicsApiProvider::OpenGL,
+ GraphicsApiProvider::Software
+};
+#endif
+
static const std::vector<std::string> BAD_MESSAGES = {
"Failed to build graphics pipeline state",
"Failed to create RHI",

View file

@ -1,11 +1,17 @@
--- src/framework/ui/internal/platform/stub/stubplatformtheme.cpp.orig 2025-01-16 06:38:51 UTC
--- src/framework/ui/internal/platform/stub/stubplatformtheme.cpp.orig 2024-02-08 19:49:06 UTC
+++ src/framework/ui/internal/platform/stub/stubplatformtheme.cpp
@@ -25,6 +25,8 @@ using namespace muse::async;
using namespace muse::ui;
using namespace muse::async;
@@ -25,6 +25,8 @@
using namespace mu::ui;
using namespace mu::async;
+namespace mu::ui {
+StubPlatformTheme::~StubPlatformTheme() = default;
+
void StubPlatformTheme::startListening()
{
}
@@ -59,4 +61,5 @@ void StubPlatformTheme::applyPlatformStyleOnAppForThem
void StubPlatformTheme::applyPlatformStyleOnWindowForTheme(QWindow*, const ThemeCode&)
{
+}
}

View file

@ -0,0 +1,10 @@
--- src/framework/ui/view/interactiveprovider.h.orig 2023-07-14 10:15:25 UTC
+++ 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"

View file

@ -0,0 +1,24 @@
--- src/importexport/musicxml/internal/musicxml/exportxml.cpp.orig 2024-02-05 22:14:10 UTC
+++ src/importexport/musicxml/internal/musicxml/exportxml.cpp
@@ -3624,8 +3624,8 @@ static void writeBeam(XmlWriter& xml, ChordRest* const
// TODO: correctly handle Beam::Mode::AUTO
// when equivalent to BEGIN32 or BEGIN64
if ((blp < i && bln >= i)
- || bmc == BeamMode::BEGIN16 && i > 1
- || bmc == BeamMode::BEGIN32 && i > 2) {
+ || (bmc == BeamMode::BEGIN16 && i > 1)
+ || (bmc == BeamMode::BEGIN32 && i > 2)) {
text = "begin";
} else if (blp < i && bln < i) {
if (bln > 0) {
@@ -3634,8 +3634,8 @@ static void writeBeam(XmlWriter& xml, ChordRest* const
text = "backward hook";
}
} else if ((blp >= i && bln < i)
- || bmn == BeamMode::BEGIN16 && i > 1
- || bmn == BeamMode::BEGIN32 && i > 2) {
+ || (bmn == BeamMode::BEGIN16 && i > 1)
+ || (bmn == BeamMode::BEGIN32 && i > 2)) {
text = "end";
} else if (blp >= i && bln >= i) {
text = "continue";

View file

@ -0,0 +1,11 @@
--- src/importexport/musicxml/internal/musicxml/importmxmlpass1.h.orig 2024-02-05 22:17:12 UTC
+++ src/importexport/musicxml/internal/musicxml/importmxmlpass1.h
@@ -179,7 +179,7 @@ class MusicXMLParserPass1 (public)
bool hasBeamingInfo() const { return _hasBeamingInfo; }
bool isVocalStaff(const QString& id) const { return _parts[id].isVocalStaff(); }
static VBox* createAndAddVBoxForCreditWords(Score* const score, const int miny = 0, const int maxy = 75);
- const int maxDiff() { return _maxDiff; }
+ int maxDiff() const { return _maxDiff; }
void insertAdjustedDuration(Fraction key, Fraction value) { _adjustedDurations.insert(key, value); }
QMap<Fraction, Fraction>& adjustedDurations() { return _adjustedDurations; }
void insertSeenDenominator(int val) { _seenDenominators.emplace(val); }

View file

@ -1,6 +1,6 @@
--- src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp.orig 2024-12-11 12:43:18 UTC
--- src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp.orig 2024-02-05 22:18:41 UTC
+++ src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp
@@ -36,6 +36,8 @@
@@ -34,6 +34,8 @@
#include "log.h"
@ -8,4 +8,4 @@
+
using AccidentalType = mu::engraving::AccidentalType;
using SymId = mu::engraving::SymId;
const static QMap<QString, AccidentalType> smuflAccidentalTypes {

View file

@ -0,0 +1,11 @@
--- src/learn/view/learnpagemodel.h.orig 2023-07-14 10:22:05 UTC
+++ src/learn/view/learnpagemodel.h
@@ -23,6 +23,8 @@
#define MU_LEARN_LEARNPAGEMODEL_H
#include <QObject>
+#include <QVariantMap>
+#include <QString>
#include "async/asyncable.h"

View file

@ -1,6 +1,6 @@
--- src/project/internal/exporttype.h.orig 2024-12-11 12:43:18 UTC
--- src/project/internal/exporttype.h.orig 2024-01-23 09:35:14 UTC
+++ src/project/internal/exporttype.h
@@ -28,6 +28,10 @@
@@ -26,6 +26,10 @@
#include "containers.h"

View file

@ -1,6 +1,6 @@
bin/mscore
bin/musescore
share/applications/mscore.desktop
share/applications/org.musescore.MuseScore.desktop
share/icons/hicolor/128x128/apps/mscore.png
share/icons/hicolor/16x16/apps/mscore.png
share/icons/hicolor/24x24/apps/mscore.png
@ -11,6 +11,10 @@ share/icons/hicolor/512x512/mimetypes/application-x-musescore+xml.png
share/icons/hicolor/512x512/mimetypes/application-x-musescore.png
share/icons/hicolor/64x64/apps/mscore.png
share/icons/hicolor/96x96/apps/mscore.png
share/man/man1/mscore.1.gz
share/man/man1/musescore.1.gz
share/metainfo/org.musescore.MuseScore.appdata.xml
share/mime/packages/musescore.xml
%%DATADIR%%/autobotscripts/TC1.1_CreateSimpleScore.js
%%DATADIR%%/autobotscripts/TC1.2_CreateSimpleScoreWithRandomInstruments.js
%%DATADIR%%/autobotscripts/TC2_CreateSimpleScoreByTemplate.js
@ -29,22 +33,6 @@ share/icons/hicolor/96x96/apps/mscore.png
%%DATADIR%%/autobotscripts/steps/NoteInput.js
%%DATADIR%%/autobotscripts/steps/Palette.js
%%DATADIR%%/autobotscripts/steps/Score.js
%%DATADIR%%/extensions/colornotes/color_notes.png
%%DATADIR%%/extensions/colornotes/main.js
%%DATADIR%%/extensions/colornotes/manifest.json
%%DATADIR%%/extensions/courtesy_accidentals/accidentals.png
%%DATADIR%%/extensions/courtesy_accidentals/add.js
%%DATADIR%%/extensions/courtesy_accidentals/configure.qml
%%DATADIR%%/extensions/courtesy_accidentals/manifest.json
%%DATADIR%%/extensions/courtesy_accidentals/remove.js
%%DATADIR%%/extensions/example1/Main.qml
%%DATADIR%%/extensions/example1/manifest.json
%%DATADIR%%/extensions/example2/main.js
%%DATADIR%%/extensions/example2/manifest.json
%%DATADIR%%/extensions/example3/add.js
%%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
@ -110,7 +98,6 @@ share/icons/hicolor/96x96/apps/mscore.png
%%DATADIR%%/locale/instruments_sr.qm
%%DATADIR%%/locale/instruments_sr_RS.qm
%%DATADIR%%/locale/instruments_sv.qm
%%DATADIR%%/locale/instruments_sv_SE.qm
%%DATADIR%%/locale/instruments_th.qm
%%DATADIR%%/locale/instruments_tr.qm
%%DATADIR%%/locale/instruments_uk.qm
@ -182,7 +169,6 @@ share/icons/hicolor/96x96/apps/mscore.png
%%DATADIR%%/locale/musescore_sr.qm
%%DATADIR%%/locale/musescore_sr_RS.qm
%%DATADIR%%/locale/musescore_sv.qm
%%DATADIR%%/locale/musescore_sv_SE.qm
%%DATADIR%%/locale/musescore_th.qm
%%DATADIR%%/locale/musescore_tr.qm
%%DATADIR%%/locale/musescore_uk.qm
@ -205,12 +191,11 @@ share/icons/hicolor/96x96/apps/mscore.png
%%DATADIR%%/locale/qt_tr.qm
%%DATADIR%%/locale/qt_vi.qm
%%DATADIR%%/plugins/colornotes/color_notes.png
%%DATADIR%%/plugins/colornotes/colornotes.qml_disabled
%%DATADIR%%/plugins/colornotes/colornotes.qml
%%DATADIR%%/plugins/courtesy_accidentals/accidentals.png
%%DATADIR%%/plugins/courtesy_accidentals/addCourtesyAccidentals.qml_disabled
%%DATADIR%%/plugins/courtesy_accidentals/configCourtesyAccidentals.qml_disabled
%%DATADIR%%/plugins/courtesy_accidentals/removeCourtesyAccidentals.qml_disabled
%%DATADIR%%/plugins/dev_test_websocket/dev_test_websocket.qml_disabled
%%DATADIR%%/plugins/courtesy_accidentals/addCourtesyAccidentals.qml
%%DATADIR%%/plugins/courtesy_accidentals/configCourtesyAccidentals.qml
%%DATADIR%%/plugins/courtesy_accidentals/removeCourtesyAccidentals.qml
%%DATADIR%%/plugins/intervals/mirror-intervals-3.qml
%%DATADIR%%/plugins/intervals/mirror_intervals.png
%%DATADIR%%/plugins/lilyrics/lilyrics.png
@ -903,10 +888,6 @@ share/icons/hicolor/96x96/apps/mscore.png
%%DATADIR%%/templates/08-Orchestral/03-String_Orchestra/audiosettings.json
%%DATADIR%%/templates/08-Orchestral/03-String_Orchestra/score_style.mss
%%DATADIR%%/templates/08-Orchestral/03-String_Orchestra/viewsettings.json
%%DATADIR%%/templates/Marching_Bass_Drums.drm
%%DATADIR%%/templates/Marching_Cymbals.drm
%%DATADIR%%/templates/Marching_Snare_Drums.drm
%%DATADIR%%/templates/Marching_Tenors.drm
%%DATADIR%%/templates/My_First_Score.mscx
%%DATADIR%%/templates/categories.json
%%DATADIR%%/templates/drumset_fr.drm