Index: head/audio/musescore/Makefile =================================================================== --- head/audio/musescore/Makefile (revision 524469) +++ head/audio/musescore/Makefile (revision 524470) @@ -1,88 +1,88 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= musescore DISTVERSIONPREFIX= v -DISTVERSION= 3.3.4 +DISTVERSION= 3.4.1 CATEGORIES= audio # DISTNAME= MuseScore-${DISTVERSION} MAINTAINER= adridg@FreeBSD.org COMMENT= Free music composition & notation software LICENSE= GPLv2 # LICENSE_FILE= LICENSE.GPL LIB_DEPENDS= libmp3lame.so:audio/lame \ libsndfile.so:audio/libsndfile \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg \ libfreetype.so:print/freetype2 USES= cmake compiler:c++11-lib desktop-file-utils \ pkgconfig qt:5 shared-mime-info USE_QT= core declarative gui widgets opengl concurrent designer help \ location network \ scripttools svg sql printsupport testlib \ webchannel xml xmlpatterns \ buildtools_build linguisttools_build qmake_build uitools_build USE_GITHUB= yes GH_ACCOUNT= musescore GH_PROJECT= MuseScore # Each release gets a subdir containing the distfiles for that release, # so hope that scanning the parent dir finds new ones. DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R} ALL_TARGET= lrelease manpages all CMAKE_ARGS+= -DUSE_SYSTEM_FREETYPE="ON" \ -DBUILD_PORTMIDI=OFF \ -DBUILD_PCH=OFF \ -DDOWNLOAD_SOUNDFONT=OFF # 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 OPTIONS_DEFAULT_powerpc64= ${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPTIONS_DEFAULT_powerpc64_13= WEBENGINE WEBENGINE_DESC= Use WebEngine in the welcome panel ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= BUILD_ALSA 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 .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-inconsistent-missing-override .endif post-extract: @${RM} -r ${WRKSRC}/thirdparty/freetype post-patch: @${FIND} ${WRKSRC} -name "CMakeLists.txt" -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e \ '/RELEASE/s|-O2 ||; \ /COMPILE_FLAGS/s|-g ||; \ s|share/man|man|; \ /COMPILE_FLAGS/s|$${PCH_INCLUDE} |-include $${PROJECT_BINARY_DIR}/all.h |' @${REINPLACE_CMD} -e \ 's||| ; \ s||| ; \ s||| ; \ s|||' ${WRKSRC}/all.h .include Index: head/audio/musescore/distinfo =================================================================== --- head/audio/musescore/distinfo (revision 524469) +++ head/audio/musescore/distinfo (revision 524470) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575585732 -SHA256 (musescore-MuseScore-v3.3.4_GH0.tar.gz) = ab8bade6c7eec6a9ae03f435cad65e79c4ca031d19020aa6e2a4da2868f49a2a -SIZE (musescore-MuseScore-v3.3.4_GH0.tar.gz) = 62827836 +TIMESTAMP = 1580164708 +SHA256 (musescore-MuseScore-v3.4.1_GH0.tar.gz) = b0bfaf6a42faeae2d4c5b8404508a2e479612d3c33d7c73b0fa2616fb5d7c9b8 +SIZE (musescore-MuseScore-v3.4.1_GH0.tar.gz) = 62951880 Index: head/audio/musescore/files/patch-mscore_CMakeLists.txt =================================================================== --- head/audio/musescore/files/patch-mscore_CMakeLists.txt (revision 524469) +++ head/audio/musescore/files/patch-mscore_CMakeLists.txt (nonexistent) @@ -1,22 +0,0 @@ -Editorialize. What are they thinking? - ---- mscore/CMakeLists.txt.orig 2019-11-14 07:45:52 UTC -+++ mscore/CMakeLists.txt -@@ -739,7 +739,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 -@@ -752,7 +752,7 @@ 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) - - target_link_libraries(mscore - ${ALSA_LIB} Property changes on: head/audio/musescore/files/patch-mscore_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/musescore/files/patch-CMakeLists.txt =================================================================== --- head/audio/musescore/files/patch-CMakeLists.txt (revision 524469) +++ head/audio/musescore/files/patch-CMakeLists.txt (revision 524470) @@ -1,18 +1,18 @@ 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 2018-12-24 13:27:49 UTC +--- CMakeLists.txt.orig 2020-01-25 12:18:16 UTC +++ CMakeLists.txt -@@ -727,8 +727,8 @@ precompiled_header(QT_INCLUDES all ${BUILD_PCH}) +@@ -750,8 +750,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) ## Index: head/audio/musescore/files/patch-main_CMakeLists.txt =================================================================== --- head/audio/musescore/files/patch-main_CMakeLists.txt (nonexistent) +++ head/audio/musescore/files/patch-main_CMakeLists.txt (revision 524470) @@ -0,0 +1,20 @@ +--- main/CMakeLists.txt.orig 2020-01-27 23:14:49 UTC ++++ main/CMakeLists.txt +@@ -218,7 +218,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 +@@ -231,7 +231,7 @@ 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 Property changes on: head/audio/musescore/files/patch-main_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property