Date: Fri, 14 Jul 2023 13:25:01 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7bc5bbbfdd92 - main - audio/musescore: update to 4.1.0, latest release Message-ID: <202307141325.36EDP12x094918@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=7bc5bbbfdd926b8e6f00934abbd881fbd340a99d commit 7bc5bbbfdd926b8e6f00934abbd881fbd340a99d Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2023-07-14 13:10:27 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2023-07-14 13:24:59 +0000 audio/musescore: update to 4.1.0, latest release All of the audio-backend options have gone away -- I don't see MuseScore searching for them, either, and do not feel like digging too far into the configure-and-build of this package either. It bundles all kinds of stuff, where the most-worstest culprits are dealt with in post-stage: why this installs Google Test headers I really don't know. --- audio/musescore/Makefile | 69 +- audio/musescore/distinfo | 6 +- audio/musescore/files/patch-CMakeLists.txt | 93 -- audio/musescore/files/patch-aeolus_CMakeLists.txt | 18 - audio/musescore/files/patch-all.h | 27 - audio/musescore/files/patch-audio_CMakeLists.txt | 11 - audio/musescore/files/patch-audio_drivers_alsa.cpp | 10 - .../musescore/files/patch-audio_drivers_alsamidi.h | 11 - .../files/patch-audio_drivers_mididriver.cpp | 18 - .../musescore/files/patch-audiofile_CMakeLists.txt | 11 - audio/musescore/files/patch-avsomr_CMakeLists.txt | 11 - audio/musescore/files/patch-awl_CMakeLists.txt | 20 - .../files/patch-build_cmake_FindQt5.cmake | 42 + .../musescore/files/patch-bww2mxml_CMakeLists.txt | 11 - audio/musescore/files/patch-effects_CMakeLists.txt | 11 - .../musescore/files/patch-fonttools_CMakeLists.txt | 11 - .../files/patch-importexport_CMakeLists.txt | 11 - .../musescore/files/patch-libmscore_CMakeLists.txt | 11 - audio/musescore/files/patch-main_CMakeLists.txt | 59 -- .../musescore/files/patch-miditools_CMakeLists.txt | 20 - audio/musescore/files/patch-mscore_CMakeLists.txt | 70 -- audio/musescore/files/patch-mtest_CMakeLists.txt | 18 - audio/musescore/files/patch-omr_CMakeLists.txt | 11 - ...-src_diagnostics_view_diagnosticspathsmodel.cpp | 11 + ...tch-src_framework_ui_view_interactiveprovider.h | 10 + .../files/patch-src_learn_view_learnpagemodel.h | 11 + .../files/patch-thirdparty_beatroot_CMakeLists.txt | 17 - .../files/patch-thirdparty_ofqf_CMakeLists.txt | 11 - ...h-thirdparty_qt-google-analytics_ganalytics.cpp | 11 - .../files/patch-thirdparty_qzip_CMakeLists.txt | 11 - .../files/patch-thirdparty_rtf2html_CMakeLists.txt | 17 - .../patch-thirdparty_singleapp_src_CMakeLists.txt | 11 - audio/musescore/pkg-plist | 1033 +++++++++++++++----- 33 files changed, 894 insertions(+), 829 deletions(-) diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile index 9b400e3646cb..9c346d1142d4 100644 --- a/audio/musescore/Makefile +++ b/audio/musescore/Makefile @@ -1,7 +1,6 @@ PORTNAME= ${GH_PROJECT:tl} DISTVERSIONPREFIX= v -DISTVERSION= 3.6.1 -PORTREVISION= 4 +DISTVERSION= 4.1.0 CATEGORIES= audio MAINTAINER= adridg@FreeBSD.org @@ -15,14 +14,15 @@ LIB_DEPENDS= libmp3lame.so:audio/lame \ libsndfile.so:audio/libsndfile \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg \ + libasound.so:audio/alsa-lib \ libfreetype.so:print/freetype2 -USES= cmake compiler:c++11-lib desktop-file-utils localbase \ - pkgconfig qt:5 shared-mime-info -USE_QT= concurrent core declarative designer graphicaleffects gui \ - help location network opengl printsupport \ +USES= cmake compiler:c++11-lib localbase \ + pkgconfig qt:5 +USE_QT= concurrent core dbus declarative designer graphicaleffects gui \ + help location network networkauth opengl printsupport \ quickcontrols2 scripttools sql svg testlib \ - webchannel widgets xml xmlpatterns \ + webchannel widgets x11extras xml xmlpatterns \ buildtools:build linguisttools:build qmake:build uitools:build USE_GITHUB= yes @@ -34,36 +34,31 @@ GH_PROJECT= MuseScore # Note needs PORTVERSION:R once there is a .minor version DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R} -ALL_TARGET= lrelease manpages all - -CMAKE_OFF= BUILD_PORTMIDI BUILD_PCH MSCORE_UNSTABLE -CMAKE_ON= USE_SYSTEM_FREETYPE +CMAKE_OFF= MUE_BUILD_CRASHPAD_CLIENT \ + MUE_COMPILE_USE_PCH CMAKE_BUILD_TYPE= release -# WebEngine is only available on i386/amd64, amd ppc64 starting FreeBSD 13.0. -# If enabled on arches that don't have WebEngine, the build breaks. -OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO WEBENGINE -OPTIONS_DEFAULT= PORTAUDIO -OPTIONS_DEFAULT_amd64= WEBENGINE -OPTIONS_DEFAULT_i386= WEBENGINE - -WEBENGINE_DESC= Use WebEngine in the welcome panel - -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CMAKE_BOOL= BUILD_ALSA HAS_MIDI -JACK_LIB_DEPENDS= libjack.so:audio/jack -JACK_CMAKE_BOOL= BUILD_JACK -PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio -PORTAUDIO_CMAKE_BOOL= BUILD_PORTAUDIO -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CMAKE_BOOL= BUILD_PULSEAUDIO -WEBENGINE_USE= qt=webengine -WEBENGINE_CMAKE_BOOL= BUILD_WEBENGINE - -.include <bsd.port.pre.mk> - -.if ${CHOSEN_COMPILER_TYPE} == clang -CXXFLAGS+= -Wno-inconsistent-missing-override -.endif +post-stage: + 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 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/musescore/distinfo b/audio/musescore/distinfo index 4ac96a1287a5..dddfcb550f1a 100644 --- a/audio/musescore/distinfo +++ b/audio/musescore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612100912 -SHA256 (musescore-MuseScore-v3.6.1_GH0.tar.gz) = ca0e71995aeef50f65e52ef93e1663b91d3cbbbd68086ff949fe121da8e3081d -SIZE (musescore-MuseScore-v3.6.1_GH0.tar.gz) = 68754499 +TIMESTAMP = 1689326209 +SHA256 (musescore-MuseScore-v4.1.0_GH0.tar.gz) = 82b0477d6ca737f5e1db34fefce5f3a3215cc48beb1123bac85cae1fa4a4829b +SIZE (musescore-MuseScore-v4.1.0_GH0.tar.gz) = 130990653 diff --git a/audio/musescore/files/patch-CMakeLists.txt b/audio/musescore/files/patch-CMakeLists.txt deleted file mode 100644 index 7403aa40adaf..000000000000 --- a/audio/musescore/files/patch-CMakeLists.txt +++ /dev/null @@ -1,93 +0,0 @@ -The custom precompiled-headers handling causes dependency -loops in Ninja. I don't see much value in the PCH here, so -just zero them out. (Neither do I understand how ninja ends -up with the dependency loop; make handles this without complaint) - ---- CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ CMakeLists.txt -@@ -25,7 +25,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0) - include(build/functions.cmake) # 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) - - # Libraries linked via full path no longer produce linker search paths. - cmake_policy(SET CMP0003 NEW) -@@ -276,7 +276,7 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") - - if (NOT MSVC) - set(CMAKE_CXX_FLAGS_DEBUG "-g") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") -+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG") - endif (NOT MSVC) - - if (APPLE) -@@ -629,6 +629,38 @@ else(APPLE) - set_target_properties(oggdll PROPERTIES IMPORTED_IMPLIB ${OGG_LIBRARY}) - else (MINGW OR MSVC) - set(SNDFILE_LIB sndfile) -+ message(STATUS "Looking for support libraries") -+ PKGCONFIG1(sndfile 1.0 SNDFILE_INCDIR SNDFILE_LIBDIR SNDFILE_LIB SNDFILE_CPP) -+ PKGCONFIG1(ogg 1.0 OGG_INCDIR OGG_LIBDIR OGG_LIB OGG_CPP) -+ PKGCONFIG1(vorbis 1.0 VORBIS_INCDIR VORBIS_LIBDIR VORBIS_LIB VORBIS_CPP) -+ message(STATUS "sndfile=${SNDFILE_LIBDIR} ogg=${OGG_LIBDIR} vorbis=${VORBIS_LIBDIR}") -+ if (SNDFILE_LIB) -+ find_library(_l sndfile PATHS ${SNDFILE_LIBDIR}) -+ if (_l) -+ add_library(sndfile UNKNOWN IMPORTED) -+ set_target_properties(sndfile PROPERTIES -+ IMPORTED_LOCATION ${_l} -+ INTERFACE_INCLUDE_DIRECTORIES ${SNDFILE_INCDIR}) -+ endif() -+ endif() -+ if (OGG_LIB) -+ find_library(_l ogg PATHS ${OGG_LIBDIR}) -+ if (_l) -+ add_library(ogg UNKNOWN IMPORTED) -+ set_target_properties(ogg PROPERTIES -+ IMPORTED_LOCATION ${_l} -+ INTERFACE_INCLUDE_DIRECTORIES ${OGG_INCDIR}) -+ endif() -+ endif() -+ if (VORBIS_LIB) -+ find_library(_l vorbis PATHS ${VORBIS_LIBDIR}) -+ if (_l) -+ add_library(vorbis UNKNOWN IMPORTED) -+ set_target_properties(vorbis PROPERTIES -+ IMPORTED_LOCATION ${_l} -+ INTERFACE_INCLUDE_DIRECTORIES ${VORBIS_INCDIR}) -+ endif() -+ endif() - endif (MINGW OR MSVC) - set(OGG_LIB ogg) - -@@ -733,7 +765,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE) - ) - endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") - # Install man pages in either compressed or uncompressed form -- install( FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc) -+ install( FILES ${MAN_BUILD} DESTINATION man/man1 COMPONENT doc) - # Create symlink alias for man pages so `man musescore` = `man mscore` - find_program( LN_EXECUTABLE ln DOC "A tool for creating symbolic link aliases (optional)." ) - if (LN_EXECUTABLE) -@@ -744,7 +776,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE) - COMMAND ${LN_EXECUTABLE} -sf "${MAN_FULL_NAME}" "${MAN_FULL_ALIAS}" - COMMAND echo 'Symlink alias: ${MAN_FULL_ALIAS} -> ${MAN_FULL_NAME}' - ) -- install( FILES ${PROJECT_BINARY_DIR}/${MAN_FULL_ALIAS} DESTINATION share/man/man1 COMPONENT doc) -+ install( FILES ${PROJECT_BINARY_DIR}/${MAN_FULL_ALIAS} DESTINATION man/man1 COMPONENT doc) - else (LN_EXECUTABLE) - message(STATUS "'ln' not found (it is optional). No symlink aliases will be created.") - endif (LN_EXECUTABLE) -@@ -771,8 +803,8 @@ precompiled_header(QT_INCLUDES all ${BUILD_PCH}) - # MSVC does not require these targets, as all.h is not copied and the - # PCH generation is done per-project - if (NOT MSVC) -- ADD_CUSTOM_TARGET(mops1 DEPENDS ${PROJECT_BINARY_DIR}/all.h) -- ADD_CUSTOM_TARGET(mops2 DEPENDS ${PCH}) -+ ADD_CUSTOM_TARGET(mops1 DEPENDS ) # ${PROJECT_BINARY_DIR}/all.h) -+ ADD_CUSTOM_TARGET(mops2 DEPENDS ) # ${PCH}) - endif (NOT MSVC) - - ## diff --git a/audio/musescore/files/patch-aeolus_CMakeLists.txt b/audio/musescore/files/patch-aeolus_CMakeLists.txt deleted file mode 100644 index 13b6cc99642a..000000000000 --- a/audio/musescore/files/patch-aeolus_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- aeolus/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ aeolus/CMakeLists.txt -@@ -43,13 +43,13 @@ if (NOT MSVC) - set_target_properties ( - aeolus - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( - aeolus - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} ${PCH_FORCE_USE}" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${PCH_FORCE_USE}" - ) - endif (NOT MSVC) - diff --git a/audio/musescore/files/patch-all.h b/audio/musescore/files/patch-all.h deleted file mode 100644 index 312cdeb669ac..000000000000 --- a/audio/musescore/files/patch-all.h +++ /dev/null @@ -1,27 +0,0 @@ ---- all.h.orig 2021-02-06 15:14:17 UTC -+++ all.h -@@ -34,12 +34,12 @@ - #define _HAS_AUTO_PTR_ETC 1 - #endif - --#include <stdio.h> --#include <limits.h> -+#include <cstdio> -+#include <climits> - #include <map> - #include <set> - #include <deque> --#include <errno.h> -+#include <cerrno> - #include <fcntl.h> - // VStudio does not have <unistd.h>, <io.h> & <process.h> replace many functions from it... - #if (defined (_MSCVER) || defined (_MSC_VER)) -@@ -48,7 +48,7 @@ - #else - #include <unistd.h> - #endif --#include <math.h> -+#include <cmath> - #include <array> - #include <functional> - #include <memory> diff --git a/audio/musescore/files/patch-audio_CMakeLists.txt b/audio/musescore/files/patch-audio_CMakeLists.txt deleted file mode 100644 index e9121c16bfb0..000000000000 --- a/audio/musescore/files/patch-audio_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- audio/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ audio/CMakeLists.txt -@@ -61,7 +61,7 @@ if (NOT MSVC) - set_target_properties ( - ${MODULE} - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-audio_drivers_alsa.cpp b/audio/musescore/files/patch-audio_drivers_alsa.cpp deleted file mode 100644 index 6894e7f3b4ac..000000000000 --- a/audio/musescore/files/patch-audio_drivers_alsa.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- audio/drivers/alsa.cpp.orig 2022-01-29 16:19:41 UTC -+++ audio/drivers/alsa.cpp -@@ -616,6 +616,7 @@ AlsaAudio::~AlsaAudio() - { - stop(); - delete alsa; -+ delete midiDriver; - } - - //--------------------------------------------------------- diff --git a/audio/musescore/files/patch-audio_drivers_alsamidi.h b/audio/musescore/files/patch-audio_drivers_alsamidi.h deleted file mode 100644 index 97cf379f80ec..000000000000 --- a/audio/musescore/files/patch-audio_drivers_alsamidi.h +++ /dev/null @@ -1,11 +0,0 @@ ---- audio/drivers/alsamidi.h.orig 2022-01-29 22:16:06 UTC -+++ audio/drivers/alsamidi.h -@@ -47,7 +47,7 @@ class AlsaMidiDriver : public MidiDriver { - - public: - AlsaMidiDriver(Seq* s); -- virtual ~AlsaMidiDriver() {} -+ ~AlsaMidiDriver(); - virtual bool init(); - virtual Port registerOutPort(const QString& name); - virtual Port registerInPort(const QString& name); diff --git a/audio/musescore/files/patch-audio_drivers_mididriver.cpp b/audio/musescore/files/patch-audio_drivers_mididriver.cpp deleted file mode 100644 index 448f6158424e..000000000000 --- a/audio/musescore/files/patch-audio_drivers_mididriver.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- audio/drivers/mididriver.cpp.orig 2022-01-29 16:09:37 UTC -+++ audio/drivers/mididriver.cpp -@@ -112,8 +112,14 @@ static const unsigned int outCap = SND_SEQ_PORT_CAP_SU - //--------------------------------------------------------- - - AlsaMidiDriver::AlsaMidiDriver(Seq* s) -- : MidiDriver(s) -+ : MidiDriver(s), alsaSeq(0) - { -+ } -+ -+AlsaMidiDriver::~AlsaMidiDriver() -+ { -+ if (alsaSeq) -+ snd_seq_close(alsaSeq); - } - - //--------------------------------------------------------- diff --git a/audio/musescore/files/patch-audiofile_CMakeLists.txt b/audio/musescore/files/patch-audiofile_CMakeLists.txt deleted file mode 100644 index 5625180e5eca..000000000000 --- a/audio/musescore/files/patch-audiofile_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- audiofile/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ audiofile/CMakeLists.txt -@@ -40,7 +40,7 @@ if (NOT MSVC) - set_target_properties ( - audiofile - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-avsomr_CMakeLists.txt b/audio/musescore/files/patch-avsomr_CMakeLists.txt deleted file mode 100644 index a841f77d0dfb..000000000000 --- a/audio/musescore/files/patch-avsomr_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- avsomr/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ avsomr/CMakeLists.txt -@@ -72,7 +72,7 @@ if (NOT MSVC) - set_target_properties ( - avsomr - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-awl_CMakeLists.txt b/audio/musescore/files/patch-awl_CMakeLists.txt deleted file mode 100644 index 516e1a565e1a..000000000000 --- a/audio/musescore/files/patch-awl_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- awl/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ awl/CMakeLists.txt -@@ -51,7 +51,7 @@ if (NOT MSVC) - set_target_properties ( - awl - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( -@@ -107,7 +107,7 @@ else (NOT MSVC) - set_target_properties ( - awlplugin - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG" - ) - endif (NOT MSVC) - diff --git a/audio/musescore/files/patch-build_cmake_FindQt5.cmake b/audio/musescore/files/patch-build_cmake_FindQt5.cmake new file mode 100644 index 000000000000..404fe964082b --- /dev/null +++ b/audio/musescore/files/patch-build_cmake_FindQt5.cmake @@ -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) diff --git a/audio/musescore/files/patch-bww2mxml_CMakeLists.txt b/audio/musescore/files/patch-bww2mxml_CMakeLists.txt deleted file mode 100644 index 1810fa96fcab..000000000000 --- a/audio/musescore/files/patch-bww2mxml_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bww2mxml/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ bww2mxml/CMakeLists.txt -@@ -47,7 +47,7 @@ if (NOT MINGW AND NOT APPLE AND NOT MSVC) - set_target_properties ( - bww2mxml - PROPERTIES -- COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - - target_link_libraries(bww2mxml diff --git a/audio/musescore/files/patch-effects_CMakeLists.txt b/audio/musescore/files/patch-effects_CMakeLists.txt deleted file mode 100644 index 992d227f262f..000000000000 --- a/audio/musescore/files/patch-effects_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- effects/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ effects/CMakeLists.txt -@@ -52,7 +52,7 @@ if (NOT MSVC) - set_target_properties ( - effects - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-fonttools_CMakeLists.txt b/audio/musescore/files/patch-fonttools_CMakeLists.txt deleted file mode 100644 index 70bf18374d27..000000000000 --- a/audio/musescore/files/patch-fonttools_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- fonttools/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ fonttools/CMakeLists.txt -@@ -20,7 +20,7 @@ add_executable( - target_link_libraries(genft ${QT_LIBRARIES} -lfreetype) - - if (NOT MSVC) -- set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch") -+ set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch") - else (NOT MSVC) - set_target_properties ( - genft diff --git a/audio/musescore/files/patch-importexport_CMakeLists.txt b/audio/musescore/files/patch-importexport_CMakeLists.txt deleted file mode 100644 index 25a3a89770ea..000000000000 --- a/audio/musescore/files/patch-importexport_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- importexport/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ importexport/CMakeLists.txt -@@ -69,7 +69,7 @@ if (NOT MSVC) - set_target_properties ( - ${MODULE} - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-libmscore_CMakeLists.txt b/audio/musescore/files/patch-libmscore_CMakeLists.txt deleted file mode 100644 index bbe228a0e1d7..000000000000 --- a/audio/musescore/files/patch-libmscore_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- libmscore/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ libmscore/CMakeLists.txt -@@ -127,7 +127,7 @@ if (NOT MSVC) - set_target_properties ( - libmscore - PROPERTIES -- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual ${COVERAGE_OPTIONS}" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch -Woverloaded-virtual ${COVERAGE_OPTIONS}" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-main_CMakeLists.txt b/audio/musescore/files/patch-main_CMakeLists.txt deleted file mode 100644 index 4c10078a57d8..000000000000 --- a/audio/musescore/files/patch-main_CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ ---- main/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ main/CMakeLists.txt -@@ -113,13 +113,13 @@ if (MINGW) - if(CMAKE_BUILD_TYPE MATCHES "DEBUG") - set_target_properties( mscore - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" - LINK_FLAGS "-mwindows -mconsole -L ${QT_INSTALL_LIBS}" - ) - else(CMAKE_BUILD_TYPE MATCHES "DEBUG") - set_target_properties( mscore - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" - LINK_FLAGS "-Wl,-S -mwindows -L ${QT_INSTALL_LIBS}" - ) - endif(CMAKE_BUILD_TYPE MATCHES "DEBUG") -@@ -227,7 +227,7 @@ else (MINGW) - - if ( NOT MSVC ) - ## install qwebengine core -- if (NOT APPLE AND USE_WEBENGINE) -+ if (YOU_CANT_SERIOUSLY_SUGGEST_TO_COPY_WEBENGINE_EXECUTABLES_AROUND) - install(PROGRAMS - ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess - DESTINATION bin -@@ -240,12 +240,12 @@ else (MINGW) - ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales - DESTINATION lib/qt5/translations - ) -- endif(NOT APPLE AND USE_WEBENGINE) -+ endif(YOU_CANT_SERIOUSLY_SUGGEST_TO_COPY_WEBENGINE_EXECUTABLES_AROUND) - - set_target_properties ( - mscore - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wno-overloaded-virtual -Winvalid-pch" - ) - - if (APPLE) -@@ -324,14 +324,14 @@ else (MINGW) - if(CMAKE_BUILD_TYPE MATCHES "REL*") - set_target_properties( mscore - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" - LINK_FLAGS "/LIBPATH:${QT_INSTALL_LIBS} ${all_library_paths}" - LINK_FLAGS "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup" - ) - else(CMAKE_BUILD_TYPE MATCHES "REL*") - set_target_properties( mscore - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} ${QT_DEFINITIONS} /DQT_SVG_LIB /DQT_GUI_LIB /DQT_XML_LIB /DQT_CORE_LIB" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${QT_DEFINITIONS} /DQT_SVG_LIB /DQT_GUI_LIB /DQT_XML_LIB /DQT_CORE_LIB" - LINK_FLAGS "/LIBPATH:${QT_INSTALL_LIBS} ${all_library_paths}" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) diff --git a/audio/musescore/files/patch-miditools_CMakeLists.txt b/audio/musescore/files/patch-miditools_CMakeLists.txt deleted file mode 100644 index ecf6ec0447b8..000000000000 --- a/audio/musescore/files/patch-miditools_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- miditools/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ miditools/CMakeLists.txt -@@ -14,7 +14,7 @@ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midi - - if (NOT MSVC) - set_target_properties(smf2xml -- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra" -+ PROPERTIES COMPILE_FLAGS "-Wall -Wextra" - ) - else (NOT MSVC) - set_target_properties (smf2xml -@@ -31,7 +31,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midi - if (NOT MSVC) - set_target_properties ( - xml2smf -- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra" -+ PROPERTIES COMPILE_FLAGS "-Wall -Wextra" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-mscore_CMakeLists.txt b/audio/musescore/files/patch-mscore_CMakeLists.txt deleted file mode 100644 index d509e90a820f..000000000000 --- a/audio/musescore/files/patch-mscore_CMakeLists.txt +++ /dev/null @@ -1,70 +0,0 @@ ---- mscore/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ mscore/CMakeLists.txt -@@ -147,7 +147,7 @@ if (APPLE) - set_target_properties ( - cocoabridge - PROPERTIES -- COMPILE_FLAGS "-g -Wall -Wextra -Winvalid-pch -include ${PROJECT_SOURCE_DIR}/all.h" -+ COMPILE_FLAGS "-Wall -Wextra -Winvalid-pch -include ${PROJECT_SOURCE_DIR}/all.h" - ) - else (APPLE) - set(INCS "") -@@ -354,13 +354,13 @@ if (MINGW) - if(CMAKE_BUILD_TYPE MATCHES "DEBUG") - set_target_properties( mscoreapp - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" - LINK_FLAGS "-mwindows -mconsole -L ${QT_INSTALL_LIBS}" - ) - else(CMAKE_BUILD_TYPE MATCHES "DEBUG") - set_target_properties( mscoreapp - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" - LINK_FLAGS "-Wl,-S -mwindows -L ${QT_INSTALL_LIBS}" - ) - endif(CMAKE_BUILD_TYPE MATCHES "DEBUG") -@@ -394,7 +394,7 @@ else (MINGW) - ) - - if (USE_SYSTEM_FREETYPE) -- target_link_libraries(mscoreapp freetype) -+ target_link_libraries(mscoreapp ${FREETYPE_LIBRARIES}) - else (USE_SYSTEM_FREETYPE) - target_link_libraries(mscoreapp mscore_freetype) - endif (USE_SYSTEM_FREETYPE) -@@ -424,7 +424,7 @@ else (MINGW) - set_target_properties ( - mscoreapp - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wno-overloaded-virtual -Winvalid-pch" - ) - - if (OMR) -@@ -469,13 +469,13 @@ else (MINGW) - if(CMAKE_BUILD_TYPE MATCHES "REL*") - set_target_properties( mscoreapp - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB" - LINK_FLAGS "/LIBPATH:${QT_INSTALL_LIBS} ${all_library_paths}" - ) - else(CMAKE_BUILD_TYPE MATCHES "REL*") - set_target_properties( mscoreapp - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} ${QT_DEFINITIONS} /DQT_SVG_LIB /DQT_GUI_LIB /DQT_XML_LIB /DQT_CORE_LIB" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${QT_DEFINITIONS} /DQT_SVG_LIB /DQT_GUI_LIB /DQT_XML_LIB /DQT_CORE_LIB" - LINK_FLAGS "/LIBPATH:${QT_INSTALL_LIBS} ${all_library_paths}" - ) - endif(CMAKE_BUILD_TYPE MATCHES "REL*") -@@ -542,7 +542,7 @@ else (NOT MSVC) - set_target_properties ( - inspectorplugin - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SVG_LIB -DQT_SHARED -DQT_NO_DEBUG" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SVG_LIB -DQT_SHARED -DQT_NO_DEBUG" - ) - endif (NOT MSVC) - diff --git a/audio/musescore/files/patch-mtest_CMakeLists.txt b/audio/musescore/files/patch-mtest_CMakeLists.txt deleted file mode 100644 index 11e46ba596e9..000000000000 --- a/audio/musescore/files/patch-mtest_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- mtest/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ mtest/CMakeLists.txt -@@ -144,12 +144,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5W - string(REPLACE ";" ";-I" INC "${QT_INCLUDES}") - - if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) -- set(TESTUTILS_COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra") -+ set(TESTUTILS_COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra") - else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) - if (MSVC) -- set(TESTUTILS_COMPILE_FLAGS "${PCH_INCLUDE} /D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\"") -+ set(TESTUTILS_COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h /D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\"") - else (MSVC) -- set(TESTUTILS_COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra") -+ set(TESTUTILS_COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra") - endif (MSVC) - endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) - diff --git a/audio/musescore/files/patch-omr_CMakeLists.txt b/audio/musescore/files/patch-omr_CMakeLists.txt deleted file mode 100644 index f40060e823df..000000000000 --- a/audio/musescore/files/patch-omr_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- omr/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ omr/CMakeLists.txt -@@ -48,7 +48,7 @@ if (NOT MSVC) - set_target_properties ( - omr - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-unused-private-field" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch -Wno-unused-private-field" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-src_diagnostics_view_diagnosticspathsmodel.cpp b/audio/musescore/files/patch-src_diagnostics_view_diagnosticspathsmodel.cpp new file mode 100644 index 000000000000..e8d92e69db1f --- /dev/null +++ b/audio/musescore/files/patch-src_diagnostics_view_diagnosticspathsmodel.cpp @@ -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" diff --git a/audio/musescore/files/patch-src_framework_ui_view_interactiveprovider.h b/audio/musescore/files/patch-src_framework_ui_view_interactiveprovider.h new file mode 100644 index 000000000000..2aef333c8e0c --- /dev/null +++ b/audio/musescore/files/patch-src_framework_ui_view_interactiveprovider.h @@ -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" diff --git a/audio/musescore/files/patch-src_learn_view_learnpagemodel.h b/audio/musescore/files/patch-src_learn_view_learnpagemodel.h new file mode 100644 index 000000000000..924b8271af18 --- /dev/null +++ b/audio/musescore/files/patch-src_learn_view_learnpagemodel.h @@ -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" + diff --git a/audio/musescore/files/patch-thirdparty_beatroot_CMakeLists.txt b/audio/musescore/files/patch-thirdparty_beatroot_CMakeLists.txt deleted file mode 100644 index 2f9827c13c65..000000000000 --- a/audio/musescore/files/patch-thirdparty_beatroot_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- thirdparty/beatroot/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ thirdparty/beatroot/CMakeLists.txt -@@ -15,12 +15,12 @@ add_library ( - if (NOT MSVC) - set_target_properties( beatroot - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( beatroot - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} /wd4267" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h /wd4267" - ) - endif (NOT MSVC) - diff --git a/audio/musescore/files/patch-thirdparty_ofqf_CMakeLists.txt b/audio/musescore/files/patch-thirdparty_ofqf_CMakeLists.txt deleted file mode 100644 index cb8a25f8acfb..000000000000 --- a/audio/musescore/files/patch-thirdparty_ofqf_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- thirdparty/ofqf/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ thirdparty/ofqf/CMakeLists.txt -@@ -42,7 +42,7 @@ if (NOT MSVC) - set_target_properties ( - ofqf - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-thirdparty_qt-google-analytics_ganalytics.cpp b/audio/musescore/files/patch-thirdparty_qt-google-analytics_ganalytics.cpp deleted file mode 100644 index e28a6ff478ae..000000000000 --- a/audio/musescore/files/patch-thirdparty_qt-google-analytics_ganalytics.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- thirdparty/qt-google-analytics/ganalytics.cpp.orig 2021-01-27 17:12:14 UTC -+++ thirdparty/qt-google-analytics/ganalytics.cpp -@@ -381,7 +381,7 @@ QString GAnalytics::Private::getSystemInfo() - .arg(QAndroidJniObject::getStaticObjectField<jstring>("android/os/Build", "ID").toString()) - .arg(QAndroidJniObject::getStaticObjectField<jstring>("android/os/Build", "BRAND").toString()); - } --#elif defined(Q_OS_LINUX) -+#elif defined(Q_OS_UNIX) - #include <sys/utsname.h> - - /** diff --git a/audio/musescore/files/patch-thirdparty_qzip_CMakeLists.txt b/audio/musescore/files/patch-thirdparty_qzip_CMakeLists.txt deleted file mode 100644 index 950b4affd581..000000000000 --- a/audio/musescore/files/patch-thirdparty_qzip_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- thirdparty/qzip/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ thirdparty/qzip/CMakeLists.txt -@@ -35,7 +35,7 @@ if (NOT MSVC) - set_target_properties ( - qzip - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/files/patch-thirdparty_rtf2html_CMakeLists.txt b/audio/musescore/files/patch-thirdparty_rtf2html_CMakeLists.txt deleted file mode 100644 index 272d6de2b48c..000000000000 --- a/audio/musescore/files/patch-thirdparty_rtf2html_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- thirdparty/rtf2html/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ thirdparty/rtf2html/CMakeLists.txt -@@ -43,12 +43,12 @@ add_library ( - if (NOT MSVC) - set_target_properties( rtf2html - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( rtf2html - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} /wd4267" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h /wd4267" - ) - endif (NOT MSVC) - diff --git a/audio/musescore/files/patch-thirdparty_singleapp_src_CMakeLists.txt b/audio/musescore/files/patch-thirdparty_singleapp_src_CMakeLists.txt deleted file mode 100644 index 6e4458bf9f72..000000000000 --- a/audio/musescore/files/patch-thirdparty_singleapp_src_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- thirdparty/singleapp/src/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC -+++ thirdparty/singleapp/src/CMakeLists.txt -@@ -37,7 +37,7 @@ if (NOT MSVC) - set_target_properties ( - qtsingleapp - PROPERTIES -- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" -+ COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch" - ) - else (NOT MSVC) - set_target_properties ( diff --git a/audio/musescore/pkg-plist b/audio/musescore/pkg-plist index e1a333d9291b..afc888604a76 100644 --- a/audio/musescore/pkg-plist +++ b/audio/musescore/pkg-plist @@ -1,33 +1,23 @@ bin/mscore bin/musescore -man/man1/mscore.1.gz -man/man1/musescore.1.gz -share/applications/mscore.desktop -share/icons/hicolor/128x128/apps/mscore.png -share/icons/hicolor/16x16/apps/mscore.png -share/icons/hicolor/24x24/apps/mscore.png -share/icons/hicolor/32x32/apps/mscore.png -share/icons/hicolor/48x48/apps/mscore.png -share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml+xml.png -share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml.png -share/icons/hicolor/48x48/mimetypes/application-x-musescore+xml.png -share/icons/hicolor/48x48/mimetypes/application-x-musescore.png -share/icons/hicolor/512x512/apps/mscore.png -share/icons/hicolor/64x64/apps/mscore.png -share/icons/hicolor/96x96/apps/mscore.png -share/icons/hicolor/scalable/apps/mscore.svg -share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml+xml.svg -share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml.svg -share/icons/hicolor/scalable/mimetypes/application-x-musescore+xml.svg -share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg -share/metainfo/org.musescore.MuseScore.appdata.xml -share/mime/packages/musescore.xml -%%DATADIR%%/demos/Brassed_Up.mscx -%%DATADIR%%/demos/Dawn.mscx *** 1033 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307141325.36EDP12x094918>