mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00
Code Issues Releases Activity

Update audio/musescore to latest upstream release

Browse Source 
Musescore helps you create beautiful sheet music.

Release notes are at
	https://musescore.org/en/3.6.1
	https://musescore.org/en/node/316462

It's some crash fixes. FreeBSD ports skipped 3.6.0, which had lots more
changes and new sound fonts.

The port Makefile changes more than usual, because I took out
some REINPLACE_CMD and made regular patches from them. Also
MuseScore's CMake code is really weird, so it needs extra
patching to find libogg and such.
This commit is contained in:
Adriaan de Groot 2021-02-08 00:01:17 +00:00
parent 39ca8f26ce
commit 8b2197a90a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=564671
26 changed files with 485 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
audio/musescore/Makefile
View File

@ -3,16 +3,14 @@
PORTNAME= musescore
DISTVERSIONPREFIX= v
DISTVERSION= 3.5
PORTREVISION= 2
DISTVERSION= 3.6.1
CATEGORIES= audio
# DISTNAME= MuseScore-${DISTVERSION}
MAINTAINER= adridg@FreeBSD.org
COMMENT= Free music composition & notation software
LICENSE= GPLv2
# LICENSE_FILE= LICENSE.GPL
LICENSE_FILE= ${WRKSRC}/LICENSE.GPL
LIB_DEPENDS= libmp3lame.so:audio/lame \
libsndfile.so:audio/libsndfile \
@ -36,15 +34,13 @@ GH_PROJECT= MuseScore
# so hope that scanning the parent dir finds new ones.
#
# Note needs PORTVERSION:R once there is a .minor version
DATADIR= ${PREFIX}/share/mscore-${PORTVERSION}
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
# Musescore upcases the build type anyway
CMAKE_BUILD_TYPE= RELEASE
CMAKE_OFF= BUILD_PORTMIDI BUILD_PCH MSCORE_UNSTABLE
CMAKE_ON= USE_SYSTEM_FREETYPE
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.
@ -72,20 +68,4 @@ WEBENGINE_CMAKE_BOOL= BUILD_WEBENGINE
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|<errno.h>|<cerrno>| ; \
s|<limits.h>|<climits>| ; \
s|<math.h>|<cmath>| ; \
s|<stdio.h>|<cstdio>|' ${WRKSRC}/all.h
.include <bsd.port.post.mk>

6
audio/musescore/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1597343145
SHA256 (musescore-MuseScore-v3.5_GH0.tar.gz) = 6456ab92298a19b08dddc478d2d7f7847c1bbe104a13963efa6d24b752bb30a7
SIZE (musescore-MuseScore-v3.5_GH0.tar.gz) = 66798006
TIMESTAMP = 1612100912
SHA256 (musescore-MuseScore-v3.6.1_GH0.tar.gz) = ca0e71995aeef50f65e52ef93e1663b91d3cbbbd68086ff949fe121da8e3081d
SIZE (musescore-MuseScore-v3.6.1_GH0.tar.gz) = 68754499

70
audio/musescore/files/patch-CMakeLists.txt
View File

@ -3,9 +3,75 @@ 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 2020-01-25 12:18:16 UTC
--- CMakeLists.txt.orig 2021-01-27 17:12:14 UTC
+++ CMakeLists.txt
@@ -750,8 +750,8 @@ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
@@ -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)

18
audio/musescore/files/patch-aeolus_CMakeLists.txt Normal file
View File

@ -0,0 +1,18 @@
--- 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)

27
audio/musescore/files/patch-all.h Normal file
View File

@ -0,0 +1,27 @@
--- 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>

11
audio/musescore/files/patch-audio_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

11
audio/musescore/files/patch-audiofile_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

11
audio/musescore/files/patch-avsomr_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

20
audio/musescore/files/patch-awl_CMakeLists.txt Normal file
View File

@ -0,0 +1,20 @@
--- 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)

11
audio/musescore/files/patch-bww2mxml_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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

11
audio/musescore/files/patch-effects_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

11
audio/musescore/files/patch-fonttools_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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

11
audio/musescore/files/patch-importexport_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

11
audio/musescore/files/patch-libmscore_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

45
audio/musescore/files/patch-main_CMakeLists.txt
View File

@ -1,6 +1,22 @@
--- main/CMakeLists.txt.orig 2020-01-27 23:14:49 UTC
--- main/CMakeLists.txt.orig 2021-01-27 17:12:14 UTC
+++ main/CMakeLists.txt
@@ -218,7 +218,7 @@ else (MINGW)
@@ -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
@ -9,7 +25,7 @@
install(PROGRAMS
${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
DESTINATION bin
@@ -231,7 +231,7 @@ else (MINGW)
@@ -240,12 +240,12 @@ else (MINGW)
${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
DESTINATION lib/qt5/translations
)
@ -18,3 +34,26 @@
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"
)

20
audio/musescore/files/patch-miditools_CMakeLists.txt Normal file
View File

@ -0,0 +1,20 @@
--- 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 (

70
audio/musescore/files/patch-mscore_CMakeLists.txt Normal file
View File

@ -0,0 +1,70 @@
--- 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)

18
audio/musescore/files/patch-mtest_CMakeLists.txt Normal file
View File

@ -0,0 +1,18 @@
--- 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"))

11
audio/musescore/files/patch-omr_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

17
audio/musescore/files/patch-thirdparty_beatroot_CMakeLists.txt Normal file
View File

@ -0,0 +1,17 @@
--- 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)

11
audio/musescore/files/patch-thirdparty_ofqf_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

4
audio/musescore/files/patch-thirdparty_google__analytics_ganalytics.cpp → audio/musescore/files/patch-thirdparty_qt-google-analytics_ganalytics.cpp
View File

@ -1,5 +1,5 @@
--- thirdparty/google_analytics/ganalytics.cpp.orig 2020-10-28 09:58:53 UTC
+++ thirdparty/google_analytics/ganalytics.cpp
--- 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());

11
audio/musescore/files/patch-thirdparty_qzip_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

17
audio/musescore/files/patch-thirdparty_rtf2html_CMakeLists.txt Normal file
View File

@ -0,0 +1,17 @@
--- 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)

11
audio/musescore/files/patch-thirdparty_singleapp_src_CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- 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 (

40
audio/musescore/pkg-plist
View File

@ -23,24 +23,13 @@ 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
%%DATADIR%%/demos/Dynamic_Strings.mscx
%%DATADIR%%/demos/Fugue_1.mscx
%%DATADIR%%/demos/Reunion.mscz
%%DATADIR%%/demos/Unclaimed_Gift.mscx
%%DATADIR%%/instruments/instruments.xml
%%DATADIR%%/locale/qt_bg.qm
%%DATADIR%%/locale/qt_el.qm
%%DATADIR%%/locale/qt_eu.qm
%%DATADIR%%/locale/qt_gd.qm
%%DATADIR%%/locale/qt_id.qm
%%DATADIR%%/locale/qt_lv.qm
%%DATADIR%%/locale/qt_nb.qm
%%DATADIR%%/locale/qt_nl.qm
%%DATADIR%%/locale/qt_nl_BE.qm
%%DATADIR%%/locale/qt_pt_BR.qm
%%DATADIR%%/locale/qt_ro.qm
%%DATADIR%%/locale/qt_tr.qm
%%DATADIR%%/locale/qt_vi.qm
%%DATADIR%%/instruments/orders.xml
%%DATADIR%%/locale/instruments_af.qm
%%DATADIR%%/locale/instruments_ar.qm
%%DATADIR%%/locale/instruments_ar_DZ.qm
@ -95,6 +84,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/instruments_pt_BR.qm
%%DATADIR%%/locale/instruments_ro.qm
%%DATADIR%%/locale/instruments_ru.qm
%%DATADIR%%/locale/instruments_scn.qm
%%DATADIR%%/locale/instruments_sk.qm
%%DATADIR%%/locale/instruments_sl.qm
%%DATADIR%%/locale/instruments_sr.qm
@ -163,6 +153,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/mscore_pt_BR.qm
%%DATADIR%%/locale/mscore_ro.qm
%%DATADIR%%/locale/mscore_ru.qm
%%DATADIR%%/locale/mscore_scn.qm
%%DATADIR%%/locale/mscore_sk.qm
%%DATADIR%%/locale/mscore_sl.qm
%%DATADIR%%/locale/mscore_sr.qm
@ -176,6 +167,19 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/mscore_zh_CN.qm
%%DATADIR%%/locale/mscore_zh_HK.qm
%%DATADIR%%/locale/mscore_zh_TW.qm
%%DATADIR%%/locale/qt_bg.qm
%%DATADIR%%/locale/qt_el.qm
%%DATADIR%%/locale/qt_eu.qm
%%DATADIR%%/locale/qt_gd.qm
%%DATADIR%%/locale/qt_id.qm
%%DATADIR%%/locale/qt_lv.qm
%%DATADIR%%/locale/qt_nb.qm
%%DATADIR%%/locale/qt_nl.qm
%%DATADIR%%/locale/qt_nl_BE.qm
%%DATADIR%%/locale/qt_pt_BR.qm
%%DATADIR%%/locale/qt_ro.qm
%%DATADIR%%/locale/qt_tr.qm
%%DATADIR%%/locale/qt_vi.qm
%%DATADIR%%/locale/tours_af.qm
%%DATADIR%%/locale/tours_ar.qm
%%DATADIR%%/locale/tours_ar_DZ.qm
@ -192,7 +196,6 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/tours_da.qm
%%DATADIR%%/locale/tours_de.qm
%%DATADIR%%/locale/tours_el.qm
%%DATADIR%%/locale/tours_en.qm
%%DATADIR%%/locale/tours_en_GB.qm
%%DATADIR%%/locale/tours_en_US.qm
%%DATADIR%%/locale/tours_eo.qm
@ -231,6 +234,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/tours_pt_BR.qm
%%DATADIR%%/locale/tours_ro.qm
%%DATADIR%%/locale/tours_ru.qm
%%DATADIR%%/locale/tours_scn.qm
%%DATADIR%%/locale/tours_sk.qm
%%DATADIR%%/locale/tours_sl.qm
%%DATADIR%%/locale/tours_sr.qm
@ -250,8 +254,8 @@ share/mime/packages/musescore.xml
%%DATADIR%%/plugins/helloqml/helloqml.qml
%%DATADIR%%/plugins/helloqml/translations/locale_de.qm
%%DATADIR%%/plugins/helloqml/translations/locale_de.ts
%%DATADIR%%/plugins/notenames.qml
%%DATADIR%%/plugins/notenames-interactive.qml
%%DATADIR%%/plugins/notenames.qml
%%DATADIR%%/plugins/panel.qml
%%DATADIR%%/plugins/random.qml
%%DATADIR%%/plugins/random2.qml
@ -259,8 +263,9 @@ share/mime/packages/musescore.xml
%%DATADIR%%/plugins/scorelist.qml
%%DATADIR%%/plugins/view.qml
%%DATADIR%%/plugins/walk.qml
%%DATADIR%%/sound/MuseScore_General_License.md
%%DATADIR%%/sound/MuseScore_General.sf3
%%DATADIR%%/sound/MuseScore_General_License.md
%%DATADIR%%/styles/Leland.mss
%%DATADIR%%/styles/MuseJazz.mss
%%DATADIR%%/styles/cchords_muse.xml
%%DATADIR%%/styles/cchords_nrb.xml
@ -270,6 +275,9 @@ share/mime/packages/musescore.xml
%%DATADIR%%/styles/chords_jazz.xml
%%DATADIR%%/styles/chords_std.xml
%%DATADIR%%/styles/jazzchords.xml
%%DATADIR%%/styles/legacy-style-defaults-v1.mss
%%DATADIR%%/styles/legacy-style-defaults-v2.mss
%%DATADIR%%/styles/legacy-style-defaults-v3.mss
%%DATADIR%%/styles/stdchords.xml
%%DATADIR%%/templates/01-General/00-Blank.mscx
%%DATADIR%%/templates/01-General/01-Treble_Clef.mscx