* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2016-11-29 8:29 David Seifert
0 siblings, 0 replies; 23+ messages in thread
From: David Seifert @ 2016-11-29 8:29 UTC (permalink / raw
To: gentoo-commits
commit: cf4d82c159f7ca1c2bd49fbb4ba92ea2d9449cb2
Author: Gergely Nagy <ngg <AT> ngg <DOT> hu>
AuthorDate: Sun Nov 27 21:35:28 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 08:18:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf4d82c1
media-sound/musescore: Version bump and dependency fixes.
* Bumped version to 2.0.3
* Added missing dependency to dev-qt/designer
* Removed audiofile dependency (it can only build its own variant)
* media-libs/libsndfile is always needed
* Added alsa USE flag
* Fixed CMAKE args for using portaudio and pulseaudio
* Rebased patch on the new version
Closes: https://github.com/gentoo/gentoo/pull/2937
media-sound/musescore/Manifest | 1 +
.../files/musescore-2.0.3-fix-buildsystem.patch | 479 +++++++++++++++++++++
media-sound/musescore/musescore-2.0.3.ebuild | 62 +++
3 files changed, 542 insertions(+)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index c7586ad..6d795c3 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -2,3 +2,4 @@ DIST mscore-1.1.tar.bz2 82410619 SHA256 d160b4dabbee5bbe7c0ba6e653e90fd36fae07ab
DIST mscore-1.2.tar.bz2 85739954 SHA256 e7f6c6cd705381a4583db267acbfed2dc9ce3985b20ed5407cd9cfe208d74d81 SHA512 aa92520b34d597db9fcf3c0121a56ceb7bfd8008ec5520cb318129da1c127426b0b789aab9d4754526d22c00307cc730d3c1b5a23e4252d5c5ca9e2b6cd95a38 WHIRLPOOL 6abcd260e908a045b43d210d274911cb87acacc1707638bc625aae817ad3791b13b079b6eaf44fb8b600031e7492eae86d88a6d6cb923c6badcdfe1b89314734
DIST mscore-1.3.tar.bz2 94704857 SHA256 a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683 SHA512 65369cc62f401c059c3452ada8a8861b6dd36df54313f4039f1a8a96771a37926bb40240df88d150b99cee7bc8a4ee8963a4fdb5a162defc8be660810cbc49b4 WHIRLPOOL 89a91da5607ce8163b74f6a787b57f15ef615a32ede154f943a3d87e78f348b145d14e89c487797df1bff577085b36d5e21c6ffb2daf044cf48b01f350538be1
DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6
+DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2
diff --git a/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch
new file mode 100644
index 00000000..0fb52db
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch
@@ -0,0 +1,479 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c4fe57..b7a5cde 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -147,23 +147,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ endif()
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+
+-if (APPLE)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+- if (MINGW)
+- # -mno-ms-bitfields see #22048
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -mno-ms-bitfields -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+- else (MINGW)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -fPIE -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+- endif (MINGW)
+-endif(APPLE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+
+ # The Mscore version number.
+@@ -450,7 +440,6 @@ if (NOT MINGW AND NOT APPLE)
+ # set library search path for runtime linker to load the same
+ # qt libraries as we used at compile time
+ #
+- SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if CMAKE_SKIP_RPATH="TRUE"
+ string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
+ if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
+ # Build portable AppImage as per https://github.com/probonopd/AppImageKit
+@@ -554,11 +543,7 @@ add_custom_command(
+ DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ )
+-if (MINGW)
+- set(BUILD_PCH false)
+-else (MINGW)
+- set(BUILD_PCH true)
+-endif(MINGW)
++set(BUILD_PCH false)
+
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+
+diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
+index 7962e87..a23aef3 100644
+--- a/aeolus/CMakeLists.txt
++++ b/aeolus/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (aeolus STATIC
+ set_target_properties (
+ aeolus
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ install(DIRECTORY
+diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
+index 5b1dd48..0d28df8 100644
+--- a/audiofile/CMakeLists.txt
++++ b/audiofile/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_library (audiofile STATIC
+ set_target_properties (
+ audiofile
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(audiofile all)
+diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
+index 9589cce..f4172ed 100644
+--- a/awl/CMakeLists.txt
++++ b/awl/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (
+ set_target_properties (
+ awl
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(awl all)
+diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
+index 6cb671a..3d4aae3 100644
+--- a/build/CreatePrecompiledHeader.cmake
++++ b/build/CreatePrecompiledHeader.cmake
+@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
+ set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
+ add_custom_command(
+ OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
+- COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
++ COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
+ DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ VERBATIM
+diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
+index d6b7794..acec8b5 100644
+--- a/bww2mxml/CMakeLists.txt
++++ b/bww2mxml/CMakeLists.txt
+@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
+ 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/effects/CMakeLists.txt b/effects/CMakeLists.txt
+index a695f1d..cf94cae 100644
+--- a/effects/CMakeLists.txt
++++ b/effects/CMakeLists.txt
+@@ -44,7 +44,7 @@ add_library (effects STATIC
+ set_target_properties (
+ effects
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(effects all)
+diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
+index 1dc8d2f..3fede66 100644
+--- a/fluid/CMakeLists.txt
++++ b/fluid/CMakeLists.txt
+@@ -45,7 +45,7 @@ add_library (fluid STATIC
+ set_target_properties (
+ fluid
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(fluid all)
+diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
+index 74a525b..f318f4c 100644
+--- a/fonttools/CMakeLists.txt
++++ b/fonttools/CMakeLists.txt
+@@ -19,5 +19,5 @@ add_executable(
+ )
+
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+-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")
+
+diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
+index 446d413..5d871a8 100644
+--- a/libmscore/CMakeLists.txt
++++ b/libmscore/CMakeLists.txt
+@@ -71,8 +71,8 @@ add_library (
+ set_target_properties (
+ libmscore
+ PROPERTIES
+- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+-# COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
++# COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
+ )
+
+ xcode_pch(libmscore all)
+diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
+index cf6edca..ceffd73 100644
+--- a/manual/CMakeLists.txt
++++ b/manual/CMakeLists.txt
+@@ -36,13 +36,13 @@ if(APPLE)
+ set_target_properties (
+ genManual
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+ )
+ else(APPLE)
+ set_target_properties (
+ genManual
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ )
+ endif(APPLE)
+
+diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
+index 05fbb83..ea95480 100644
+--- a/midi/CMakeLists.txt
++++ b/midi/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_library (midi STATIC
+ set_target_properties (
+ midi
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(midi all)
+diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
+index 6df79c4..f8145e0 100644
+--- a/miditools/CMakeLists.txt
++++ b/miditools/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
+
+ set_target_properties(smf2xml
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+ )
+ target_link_libraries(smf2xml
+ ${QT_LIBRARIES}
+@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
+
+ set_target_properties (
+ xml2smf
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+ )
+ target_link_libraries(xml2smf
+ ${QT_LIBRARIES}
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+index 3592012..b50e2bc 100644
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -370,7 +370,7 @@ 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 "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+ LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
+ )
+ else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -493,7 +493,7 @@ else (MINGW)
+ set_target_properties (
+ mscore
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
+ )
+
+ if (OMR)
+diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
+index e60d901..d3ba643 100644
+--- a/mstyle/CMakeLists.txt
++++ b/mstyle/CMakeLists.txt
+@@ -49,7 +49,7 @@ add_library (
+ set_target_properties (
+ mstyle
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(mstyle all)
+diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
+index 55072b0..cab1a18 100644
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -113,20 +113,10 @@ target_link_libraries(
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+
+-if (APPLE)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+- if (MINGW)
+- # -mno-ms-bitfields see #22048
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+- else (MINGW)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -fPIE -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+- endif (MINGW)
+-endif(APPLE)
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+
+@@ -134,17 +124,17 @@ if (APPLE)
+ set_target_properties (
+ testutils
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+ )
+ else (APPLE)
+ set_target_properties (
+ testutils
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ )
+ endif(APPLE)
+
+-# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+
+ add_custom_target(report
+ COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
+diff --git a/mtest/cmake.inc b/mtest/cmake.inc
+index 0fa9aa8..9ef0177 100644
+--- a/mtest/cmake.inc
++++ b/mtest/cmake.inc
+@@ -57,16 +57,16 @@ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
+- LINK_FLAGS "-g -stdlib=libc++"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
++ LINK_FLAGS "-stdlib=libc++"
+ )
+ else(APPLE)
+ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+- LINK_FLAGS "-g"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
++ LINK_FLAGS ""
+ )
+ endif(APPLE)
+
+diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
+index 88615e5..d719e89 100644
+--- a/omr/CMakeLists.txt
++++ b/omr/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_library (
+ set_target_properties (
+ omr
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(omr all)
+diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
+index 0520920..e9bd15b 100644
+--- a/synthesizer/CMakeLists.txt
++++ b/synthesizer/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
+ set_target_properties (
+ synthesizer
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(synthesizer all)
+diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
+index ae905c7..9b039e8 100644
+--- a/thirdparty/beatroot/CMakeLists.txt
++++ b/thirdparty/beatroot/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_library (
+
+ set_target_properties( beatroot
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(beatroot all)
+diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
+index d0155b2..35bd6ac 100644
+--- a/thirdparty/diff/CMakeLists.txt
++++ b/thirdparty/diff/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
+ set_target_properties (
+ diff_match_patch
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(diff_match_patch all)
+diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
+index 9beb6b1..f7ec1c5 100644
+--- a/thirdparty/kQOAuth/CMakeLists.txt
++++ b/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
+ set_target_properties (
+ kqoauth
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(kqoauth all)
+diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
+index fc39a0a..8c11f07 100644
+--- a/thirdparty/ofqf/CMakeLists.txt
++++ b/thirdparty/ofqf/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(ofqf STATIC
+ set_target_properties (
+ ofqf
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(ofqf all)
+diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
+index 77b1997..417017e 100644
+--- a/thirdparty/qzip/CMakeLists.txt
++++ b/thirdparty/qzip/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(qzip STATIC
+ set_target_properties (
+ qzip
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(qzip all)
+diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
+index 230339b..6c94a06 100644
+--- a/thirdparty/rtf2html/CMakeLists.txt
++++ b/thirdparty/rtf2html/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library (
+
+ set_target_properties( rtf2html
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(rtf2html all)
+diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
+index 2504b01..936fa3f 100644
+--- a/thirdparty/singleapp/src/CMakeLists.txt
++++ b/thirdparty/singleapp/src/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (
+ set_target_properties (
+ qtsingleapp
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(qtsingleapp all)
+diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
+index 5991e09..7f1268e 100644
+--- a/thirdparty/xmlstream/CMakeLists.txt
++++ b/thirdparty/xmlstream/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
+ set_target_properties (
+ xmlstream
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(xmlstream all)
+diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
+index c0db571..58d8ddf 100644
+--- a/zerberus/CMakeLists.txt
++++ b/zerberus/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (zerberus STATIC
+ set_target_properties (
+ zerberus
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(zerberus all)
diff --git a/media-sound/musescore/musescore-2.0.3.ebuild b/media-sound/musescore/musescore-2.0.3.ebuild
new file mode 100644
index 00000000..ab54ba6
--- /dev/null
+++ b/media-sound/musescore/musescore-2.0.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://musescore.org/"
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio pulseaudio"
+
+RDEPEND="
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtxmlpatterns:5
+ >=media-libs/freetype-2.5.2
+ media-libs/libsndfile
+ sys-libs/zlib
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ jack? ( media-sound/jack-audio-connection-kit )
+ mp3? ( media-sound/lame )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-sound/pulseaudio )
+ "
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+ "
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.3-fix-buildsystem.patch"
+)
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ALSA="$(usex alsa)"
+ -DBUILD_JACK="$(usex jack)"
+ -DBUILD_LAME="$(usex mp3)"
+ -DBUILD_PORTAUDIO="$(usex portaudio)"
+ -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cd "${BUILD_DIR}" || die
+ cmake-utils_src_make -j1 lrelease manpages
+ cmake-utils_src_compile
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2017-01-04 10:15 David Seifert
0 siblings, 0 replies; 23+ messages in thread
From: David Seifert @ 2017-01-04 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 6c98e82351a62eb5942102510ce8cb3ff1a09fa8
Author: Gergely Nagy <ngg <AT> ngg <DOT> hu>
AuthorDate: Thu Dec 1 08:19:02 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 10:14:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c98e823
media-sound/musescore: Add live ebuild.
Closes: https://github.com/gentoo/gentoo/pull/2966
.../files/musescore-9999-fix-buildsystem.patch | 514 +++++++++++++++++++++
media-sound/musescore/musescore-9999.ebuild | 62 +++
2 files changed, 576 insertions(+)
diff --git a/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch b/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch
new file mode 100644
index 00000000..74ba511
--- /dev/null
+++ b/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch
@@ -0,0 +1,514 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e2e91f3fe..7feb7a9e5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,27 +142,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ endif()
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+
+-if (APPLE)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+- # This is necessary for genManual to be executed during the build phase,
+- # it needs to be able to get the Qt libs.
+- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+- SET(CMAKE_INSTALL_RPATH "${QT_INSTALL_PREFIX}/lib")
+-else (APPLE)
+- if (MINGW)
+- # -mno-ms-bitfields see #22048
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -mno-ms-bitfields -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+- else (MINGW)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++11 -fPIC -g -Wall -Wextra -Woverloaded-virtual")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
+- endif (MINGW)
+-endif(APPLE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS ON)
+
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+
+ # The MuseScore version number.
+@@ -415,7 +401,6 @@ if (NOT MINGW AND NOT APPLE)
+ # set library search path for runtime linker to load the same
+ # qt libraries as we used at compile time
+ #
+- SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # Ignored if CMAKE_SKIP_RPATH="TRUE"
+ string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
+ if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
+ # Build portable AppImage as per https://github.com/probonopd/AppImageKit
+@@ -519,9 +504,6 @@ add_custom_command(
+ DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ )
+-if (NOT MINGW)
+- set(BUILD_PCH true)
+-endif(NOT MINGW)
+
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+
+diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
+index 7962e8781..bdcb08dae 100644
+--- a/aeolus/CMakeLists.txt
++++ b/aeolus/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (aeolus STATIC
+ set_target_properties (
+ aeolus
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ install(DIRECTORY
+diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
+index 5b1dd48ee..264a14a17 100644
+--- a/audiofile/CMakeLists.txt
++++ b/audiofile/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_library (audiofile STATIC
+ set_target_properties (
+ audiofile
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(audiofile all)
+diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
+index bcf5427b7..fec81d8b3 100644
+--- a/awl/CMakeLists.txt
++++ b/awl/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (
+ set_target_properties (
+ awl
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(awl all)
+diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
+index 72faba0de..8f9d2636c 100644
+--- a/build/CreatePrecompiledHeader.cmake
++++ b/build/CreatePrecompiledHeader.cmake
+@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
+ set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
+ add_custom_command(
+ OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
+- COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
++ COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
+ DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ VERBATIM
+diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
+index d6b779465..ad7815358 100644
+--- a/bww2mxml/CMakeLists.txt
++++ b/bww2mxml/CMakeLists.txt
+@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
+ 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 -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ target_link_libraries(bww2mxml
+diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
+index a695f1d5e..1f34fafce 100644
+--- a/effects/CMakeLists.txt
++++ b/effects/CMakeLists.txt
+@@ -44,7 +44,7 @@ add_library (effects STATIC
+ set_target_properties (
+ effects
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(effects all)
+diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
+index 1dc8d2f8d..99f8f574e 100644
+--- a/fluid/CMakeLists.txt
++++ b/fluid/CMakeLists.txt
+@@ -45,7 +45,7 @@ add_library (fluid STATIC
+ set_target_properties (
+ fluid
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(fluid all)
+diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
+index 74a525ba3..2cc008495 100644
+--- a/fonttools/CMakeLists.txt
++++ b/fonttools/CMakeLists.txt
+@@ -19,5 +19,5 @@ add_executable(
+ )
+
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+-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 -fPIC -Wall -Wextra -Winvalid-pch")
+
+diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
+index 6c7e07a3a..000c9c929 100644
+--- a/libmscore/CMakeLists.txt
++++ b/libmscore/CMakeLists.txt
+@@ -73,7 +73,7 @@ add_library (
+ set_target_properties (
+ libmscore
+ PROPERTIES
+- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
+ )
+
+ xcode_pch(libmscore all)
+diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
+index cf6edcaed..9eb84926c 100644
+--- a/manual/CMakeLists.txt
++++ b/manual/CMakeLists.txt
+@@ -36,13 +36,13 @@ if(APPLE)
+ set_target_properties (
+ genManual
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
+ )
+ else(APPLE)
+ set_target_properties (
+ genManual
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
+ )
+ endif(APPLE)
+
+diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
+index 05fbb83d5..bf79c9e3f 100644
+--- a/midi/CMakeLists.txt
++++ b/midi/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_library (midi STATIC
+ set_target_properties (
+ midi
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(midi all)
+diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
+index 6df79c41b..e3bdb90b8 100644
+--- a/miditools/CMakeLists.txt
++++ b/miditools/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
+
+ set_target_properties(smf2xml
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++ PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
+ )
+ target_link_libraries(smf2xml
+ ${QT_LIBRARIES}
+@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
+
+ set_target_properties (
+ xml2smf
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++ PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
+ )
+ target_link_libraries(xml2smf
+ ${QT_LIBRARIES}
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+index cd1045aa9..1b2c3a0eb 100644
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -381,13 +381,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 "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+ LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
+ )
+ 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 "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+ LINK_FLAGS "-Wl,-S ${PROJECT_BINARY_DIR}/resfile.o -mwindows -L ${CROSSQT}/lib"
+ )
+ endif(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -507,7 +507,7 @@ else (MINGW)
+ set_target_properties (
+ mscore
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wno-overloaded-virtual -Winvalid-pch"
+ )
+
+ if (OMR)
+diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
+index 2bc43c4bd..3fb96fcfa 100644
+--- a/mstyle/CMakeLists.txt
++++ b/mstyle/CMakeLists.txt
+@@ -49,7 +49,7 @@ add_library (
+ set_target_properties (
+ mstyle
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-overloaded-virtual"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-overloaded-virtual"
+ )
+
+ xcode_pch(mstyle all)
+diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
+index c0486679a..42f14301d 100644
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -113,20 +113,10 @@ target_link_libraries(
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+
+-if (APPLE)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+- if (MINGW)
+- # -mno-ms-bitfields see #22048
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+- else (MINGW)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
+- endif (MINGW)
+-endif(APPLE)
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS ON)
+
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+
+@@ -134,17 +124,17 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+ testutils
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
+ )
+ else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+ testutils
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
+ )
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+
+-# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
+
+ add_custom_target(report
+ COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
+diff --git a/mtest/cmake.inc b/mtest/cmake.inc
+index 943b85e5f..35b04f51e 100644
+--- a/mtest/cmake.inc
++++ b/mtest/cmake.inc
+@@ -60,16 +60,16 @@ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+- LINK_FLAGS "-g -stdlib=libc++"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
++ LINK_FLAGS "-stdlib=libc++"
+ )
+ else(APPLE)
+ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+- LINK_FLAGS "-g"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
++ LINK_FLAGS ""
+ )
+ endif(APPLE)
+
+@@ -77,7 +77,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
+ )
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+
+diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
+index 9ad57b930..caf9a3624 100644
+--- a/omr/CMakeLists.txt
++++ b/omr/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_library (
+ set_target_properties (
+ omr
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
+ )
+
+ xcode_pch(omr all)
+diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
+index 0520920cf..e0a1aa7a1 100644
+--- a/synthesizer/CMakeLists.txt
++++ b/synthesizer/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
+ set_target_properties (
+ synthesizer
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(synthesizer all)
+diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
+index ae905c735..f0fb50a40 100644
+--- a/thirdparty/beatroot/CMakeLists.txt
++++ b/thirdparty/beatroot/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_library (
+
+ set_target_properties( beatroot
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(beatroot all)
+diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
+index d0155b214..3985868bb 100644
+--- a/thirdparty/diff/CMakeLists.txt
++++ b/thirdparty/diff/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
+ set_target_properties (
+ diff_match_patch
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(diff_match_patch all)
+diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
+index 9beb6b1f2..f452df5de 100644
+--- a/thirdparty/kQOAuth/CMakeLists.txt
++++ b/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
+ set_target_properties (
+ kqoauth
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(kqoauth all)
+diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
+index fc39a0aa1..9200dd312 100644
+--- a/thirdparty/ofqf/CMakeLists.txt
++++ b/thirdparty/ofqf/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(ofqf STATIC
+ set_target_properties (
+ ofqf
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(ofqf all)
+diff --git a/thirdparty/poppler/CMakeLists.txt b/thirdparty/poppler/CMakeLists.txt
+index 943cca72e..20f336087 100644
+--- a/thirdparty/poppler/CMakeLists.txt
++++ b/thirdparty/poppler/CMakeLists.txt
+@@ -134,12 +134,12 @@ add_library(poppler STATIC
+ )
+
+ if (APPLE)
+- set ( POPPLER_COMPILE_FLAGS "-O2 -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
++ set ( POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
+ else (APPLE)
+ if (MINGW)
+- set (POPPLER_COMPILE_FLAGS "-O2 -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
++ set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
+ else (MINGW)
+- set (POPPLER_COMPILE_FLAGS "-O2 -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
++ set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
+ endif(MINGW)
+ endif(APPLE)
+
+diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
+index 77b19979e..b1b4cb841 100644
+--- a/thirdparty/qzip/CMakeLists.txt
++++ b/thirdparty/qzip/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(qzip STATIC
+ set_target_properties (
+ qzip
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(qzip all)
+diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
+index 230339bde..c052605e2 100644
+--- a/thirdparty/rtf2html/CMakeLists.txt
++++ b/thirdparty/rtf2html/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library (
+
+ set_target_properties( rtf2html
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(rtf2html all)
+diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
+index 2504b017e..722e5d553 100644
+--- a/thirdparty/singleapp/src/CMakeLists.txt
++++ b/thirdparty/singleapp/src/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (
+ set_target_properties (
+ qtsingleapp
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(qtsingleapp all)
+diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
+index 5991e09e5..7e6db93ed 100644
+--- a/thirdparty/xmlstream/CMakeLists.txt
++++ b/thirdparty/xmlstream/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
+ set_target_properties (
+ xmlstream
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(xmlstream all)
+diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
+index c0db57150..52090bd57 100644
+--- a/zerberus/CMakeLists.txt
++++ b/zerberus/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (zerberus STATIC
+ set_target_properties (
+ zerberus
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(zerberus all)
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
new file mode 100644
index 00000000..1f1ccd9
--- /dev/null
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://musescore.org/"
+EGIT_REPO_URI="git://github.com/musescore/MuseScore.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa debug jack mp3 portaudio pulseaudio"
+
+RDEPEND="
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwebkit:5
+ dev-qt/qtxmlpatterns:5
+ >=media-libs/freetype-2.5.2
+ media-libs/libsndfile
+ sys-libs/zlib
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ jack? ( media-sound/jack-audio-connection-kit )
+ mp3? ( media-sound/lame )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-sound/pulseaudio )
+ "
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+ "
+PATCHES=(
+ "${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ALSA="$(usex alsa)"
+ -DBUILD_JACK="$(usex jack)"
+ -DBUILD_LAME="$(usex mp3)"
+ -DBUILD_PORTAUDIO="$(usex portaudio)"
+ -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cd "${BUILD_DIR}" || die
+ cmake-utils_src_make -j1 lrelease manpages
+ cmake-utils_src_compile
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2017-01-30 13:20 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2017-01-30 13:20 UTC (permalink / raw
To: gentoo-commits
commit: afb483297962f98d38ff20f01c3f7ee679c9fbf6
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 13:17:51 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 13:20:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb48329
media-sound/musescore: Remove 1.3
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-sound/musescore/Manifest | 1 -
.../musescore/files/musescore-1.3-cflags.patch | 113 ---------------------
.../files/musescore-1.3-freetype251.patch | 19 ----
media-sound/musescore/musescore-1.3.ebuild | 60 -----------
4 files changed, 193 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 65bc3e1..7ca5ad2 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,2 @@
-DIST mscore-1.3.tar.bz2 94704857 SHA256 a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683 SHA512 65369cc62f401c059c3452ada8a8861b6dd36df54313f4039f1a8a96771a37926bb40240df88d150b99cee7bc8a4ee8963a4fdb5a162defc8be660810cbc49b4 WHIRLPOOL 89a91da5607ce8163b74f6a787b57f15ef615a32ede154f943a3d87e78f348b145d14e89c487797df1bff577085b36d5e21c6ffb2daf044cf48b01f350538be1
DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6
DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2
diff --git a/media-sound/musescore/files/musescore-1.3-cflags.patch b/media-sound/musescore/files/musescore-1.3-cflags.patch
deleted file mode 100644
index 44af885..00000000
--- a/media-sound/musescore/files/musescore-1.3-cflags.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- mscore-1.3/mscore/al/CMakeLists.txt
-+++ mscore-1.3/mscore/al/CMakeLists.txt
-@@ -42,7 +42,7 @@
-
- set_source_files_properties(
- dsp.cpp xml.cpp tempo.cpp sig.cpp pos.cpp fraction.cpp
-- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
- )
-
- set_source_files_properties(dspSSE.cpp
---- mscore-1.3/mscore/awl/CMakeLists.txt
-+++ mscore-1.3/mscore/awl/CMakeLists.txt
-@@ -61,7 +61,7 @@
-
- set_target_properties( awl
- PROPERTIES COMPILE_FLAGS
-- "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+ "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
- )
-
- ADD_DEPENDENCIES(awl mops1)
---- mscore-1.3/mscore/CMakeLists.txt
-+++ mscore-1.3/mscore/CMakeLists.txt
-@@ -257,9 +257,6 @@
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
-
--set(CMAKE_CXX_FLAGS_DEBUG "-g")
--set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
--
- if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
- if (MINGW)
- set(FLAGS -DQT_DEBUG -DQT_DLL)
-@@ -272,9 +269,9 @@
- endif (MINGW)
- else (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
- if (MINGW)
-- set(FLAGS -O2 -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
-+ set(FLAGS -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
- else (MINGW)
-- set(FLAGS -O2 -DNDEBUG -DQT_NO_DEBUG)
-+ set(FLAGS -DNDEBUG -DQT_NO_DEBUG)
- endif (MINGW)
- endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-
-@@ -284,7 +281,7 @@
- add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
- COMMAND ${CMAKE_CXX_COMPILER}
-- -x c++-header -g ${FLAGS}
-+ -x c++-header ${FLAGS}
- -I${QT_HEADERS_DIR}
- -o all.h.gch all.h
- DEPENDS ${PROJECT_BINARY_DIR}/all.h
---- mscore-1.3/mscore/fluid/CMakeLists.txt
-+++ mscore-1.3/mscore/fluid/CMakeLists.txt
-@@ -28,7 +28,7 @@
- )
-
- set_target_properties( fluid
-- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
- )
-
- ADD_DEPENDENCIES(fluid mops1)
---- mscore-1.3/mscore/mscore/CMakeLists.txt
-+++ mscore-1.3/mscore/mscore/CMakeLists.txt
-@@ -199,7 +199,7 @@
- if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
- set_target_properties( mscore
- PROPERTIES
-- COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB -DQT_SCRIPT_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 -DQT_SCRIPT_LIB"
- LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
- )
- else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
---- mscore-1.3/mscore/ofqf/CMakeLists.txt
-+++ mscore-1.3/mscore/ofqf/CMakeLists.txt
-@@ -34,8 +34,8 @@
- )
-
- set_target_properties( ofqf
-- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
- )
-
- ADD_DEPENDENCIES(ofqf mops1)
--ADD_DEPENDENCIES(ofqf mops2)
-\ No newline at end of file
-+ADD_DEPENDENCIES(ofqf mops2)
---- mscore-1.3/mscore/osdabzip/CMakeLists.txt
-+++ mscore-1.3/mscore/osdabzip/CMakeLists.txt
-@@ -29,7 +29,7 @@
- )
-
- set_target_properties( osdabzip
-- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
- )
-
- ADD_DEPENDENCIES(osdabzip mops1)
---- mscore-1.3/mscore/singleapp/src/CMakeLists.txt
-+++ mscore-1.3/mscore/singleapp/src/CMakeLists.txt
-@@ -35,7 +35,7 @@
- )
-
- set_target_properties( qtsingleapp
-- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
- )
-
- ADD_DEPENDENCIES(qtsingleapp mops1)
diff --git a/media-sound/musescore/files/musescore-1.3-freetype251.patch b/media-sound/musescore/files/musescore-1.3-freetype251.patch
deleted file mode 100644
index 0fbad40..00000000
--- a/media-sound/musescore/files/musescore-1.3-freetype251.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Date: Tue, 15 Apr 2014 16:36:51 +0200
-Subject: [PATCH] Fix compilation with >=freetype-2.5.1 while remaining
- compatible with older freetype versions.
-
-This fixes Gentoo bug #507712 (https://bugs.gentoo.org/507712)
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
---- mscore-1.3/mscore/mscore/genft.cpp
-+++ mscore-1.3/mscore/mscore/genft.cpp
-@@ -27,7 +27,7 @@
-
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include <freetype/tttables.h>
-+#include FT_TRUETYPE_TABLES_H
- #include "al/xml.h"
-
- QMap<int, int> codemap;
diff --git a/media-sound/musescore/musescore-1.3.ebuild b/media-sound/musescore/musescore-1.3.ebuild
deleted file mode 100644
index fc1ae34..00000000
--- a/media-sound/musescore/musescore-1.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils eutils font
-
-MY_P="mscore-${PV}"
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="http://mscore.sourceforge.net"
-SRC_URI="mirror://sourceforge/mscore/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
- >=media-libs/libsndfile-1.0.19
- media-libs/portaudio
- media-sound/fluidsynth
- media-sound/jack-audio-connection-kit
- sys-libs/zlib
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qt3support:4
- dev-qt/qtscript:4
- dev-qt/qtsvg:4
- x11-libs/qtscriptgenerator"
-DEPEND="${RDEPEND}
- dev-texlive/texlive-context
- app-doc/doxygen
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/mscore"
-VARTEXFONTS="${T}/fonts"
-FONT_SUFFIX="ttf"
-FONT_S="${S}/mscore/fonts"
-
-src_prepare() {
- # don't build redundant qtscriptgenerator libs
- sed -i '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die
-
- epatch "${FILESDIR}"/${P}-cflags.patch \
- "${FILESDIR}"/${P}-freetype251.patch
-}
-
-src_compile() {
- cmake-utils_src_make lupdate
- cmake-utils_src_make lrelease
- cmake-utils_src_make
-}
-
-src_install() {
- cmake-utils_src_install
- font_src_install
- dodoc ChangeLog NEWS README
- doman packaging/mscore.1
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2017-07-30 15:45 David Seifert
0 siblings, 0 replies; 23+ messages in thread
From: David Seifert @ 2017-07-30 15:45 UTC (permalink / raw
To: gentoo-commits
commit: 0c9230e8b9ae77c3db56b80ad1b6b21e547899bb
Author: Gergely Nagy <ngg <AT> ngg <DOT> hu>
AuthorDate: Tue Jun 27 22:13:27 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 15:45:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9230e8
media-sound/musescore: Version bump to 2.1.0
Closes: https://github.com/gentoo/gentoo/pull/5000
media-sound/musescore/Manifest | 1 +
.../files/musescore-2.1.0-fix-buildsystem.patch | 494 +++++++++++++++++++++
media-sound/musescore/metadata.xml | 3 +
media-sound/musescore/musescore-2.1.0.ebuild | 64 +++
4 files changed, 562 insertions(+)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 7ca5ad280e9..05a5d36252c 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,3 @@
DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6
DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2
+DIST musescore-2.1.0.tar.gz 51131549 SHA256 0581b8dd4e9bef51f863baf5b7f03b518f9784c79c0d92d6f0e33b180dd63c47 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2 WHIRLPOOL 1814cf937f1f1f9898f8aa62a60ed3dbfec4cb9af2ded6d03ccfde6c372bba6b3ddc8c6ba83677fc770363975c7c36a144adb17f16195e8b30706d6bcfea9c69
diff --git a/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch
new file mode 100644
index 00000000000..9667c4fadc1
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch
@@ -0,0 +1,494 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 079504708..026e8289a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -153,23 +153,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ endif()
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+
+-if (APPLE)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+- if (MINGW)
+- # -mno-ms-bitfields see #22048
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -mno-ms-bitfields -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+- else (MINGW)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+- endif (MINGW)
+-endif(APPLE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+
+ # The Mscore version number.
+@@ -473,7 +463,6 @@ if (NOT MINGW AND NOT APPLE)
+ # set library search path for runtime linker to load the same
+ # qt libraries as we used at compile time
+ #
+- SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if CMAKE_SKIP_RPATH="TRUE"
+ string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
+ if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
+ # Build portable AppImage as per https://github.com/probonopd/AppImageKit
+@@ -577,9 +566,6 @@ add_custom_command(
+ DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ )
+-if (NOT MINGW)
+- set(BUILD_PCH true)
+-endif(NOT MINGW)
+
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+
+diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
+index 7962e8781..a23aef396 100644
+--- a/aeolus/CMakeLists.txt
++++ b/aeolus/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (aeolus STATIC
+ set_target_properties (
+ aeolus
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ install(DIRECTORY
+diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
+index 5b1dd48ee..0d28df8ea 100644
+--- a/audiofile/CMakeLists.txt
++++ b/audiofile/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_library (audiofile STATIC
+ set_target_properties (
+ audiofile
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(audiofile all)
+diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
+index 9589cceb2..f4172ed6d 100644
+--- a/awl/CMakeLists.txt
++++ b/awl/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (
+ set_target_properties (
+ awl
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(awl all)
+diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
+index 6cb671afc..3d4aae3c2 100644
+--- a/build/CreatePrecompiledHeader.cmake
++++ b/build/CreatePrecompiledHeader.cmake
+@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
+ set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
+ add_custom_command(
+ OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
+- COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
++ COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
+ DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ VERBATIM
+diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
+index d6b779465..acec8b5e9 100644
+--- a/bww2mxml/CMakeLists.txt
++++ b/bww2mxml/CMakeLists.txt
+@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
+ 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/effects/CMakeLists.txt b/effects/CMakeLists.txt
+index a695f1d5e..cf94caed9 100644
+--- a/effects/CMakeLists.txt
++++ b/effects/CMakeLists.txt
+@@ -44,7 +44,7 @@ add_library (effects STATIC
+ set_target_properties (
+ effects
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(effects all)
+diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
+index 1dc8d2f8d..3fede6647 100644
+--- a/fluid/CMakeLists.txt
++++ b/fluid/CMakeLists.txt
+@@ -45,7 +45,7 @@ add_library (fluid STATIC
+ set_target_properties (
+ fluid
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(fluid all)
+diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
+index 74a525ba3..f318f4c04 100644
+--- a/fonttools/CMakeLists.txt
++++ b/fonttools/CMakeLists.txt
+@@ -19,5 +19,5 @@ add_executable(
+ )
+
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+-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")
+
+diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
+index 446d413ee..5d871a813 100644
+--- a/libmscore/CMakeLists.txt
++++ b/libmscore/CMakeLists.txt
+@@ -71,8 +71,8 @@ add_library (
+ set_target_properties (
+ libmscore
+ PROPERTIES
+- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+-# COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
++# COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
+ )
+
+ xcode_pch(libmscore all)
+diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
+index cf6edcaed..ceffd7330 100644
+--- a/manual/CMakeLists.txt
++++ b/manual/CMakeLists.txt
+@@ -36,13 +36,13 @@ if(APPLE)
+ set_target_properties (
+ genManual
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+ )
+ else(APPLE)
+ set_target_properties (
+ genManual
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ )
+ endif(APPLE)
+
+diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
+index 05fbb83d5..ea95480c9 100644
+--- a/midi/CMakeLists.txt
++++ b/midi/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_library (midi STATIC
+ set_target_properties (
+ midi
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(midi all)
+diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
+index 6df79c41b..f8145e04a 100644
+--- a/miditools/CMakeLists.txt
++++ b/miditools/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
+
+ set_target_properties(smf2xml
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+ )
+ target_link_libraries(smf2xml
+ ${QT_LIBRARIES}
+@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
+
+ set_target_properties (
+ xml2smf
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+ )
+ target_link_libraries(xml2smf
+ ${QT_LIBRARIES}
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+index 36196e1c8..cb4a889cd 100644
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -379,7 +379,7 @@ 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 "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+ LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
+ )
+ else (CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -507,7 +507,7 @@ else (MINGW)
+ if (APPLE)
+ set(PORTMIDI_LIB portmidi)
+ else (APPLE)
+- set(PORTMIDI_LIB -lportmidi -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
++ set(PORTMIDI_LIB -lportmidi) # -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
+ endif (APPLE)
+ target_link_libraries(mscore ${PORTMIDI_LIB})
+ endif (USE_PORTMIDI)
+@@ -526,7 +526,7 @@ else (MINGW)
+
+ set_target_properties(mscore
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
+ )
+
+ if (OMR)
+diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
+index e60d901fa..d3ba64316 100644
+--- a/mstyle/CMakeLists.txt
++++ b/mstyle/CMakeLists.txt
+@@ -49,7 +49,7 @@ add_library (
+ set_target_properties (
+ mstyle
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(mstyle all)
+diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
+index 0831c0810..3e37b2d34 100644
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -113,20 +113,10 @@ target_link_libraries(
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+
+-if (APPLE)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+- if (MINGW)
+- # -mno-ms-bitfields see #22048
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+- else (MINGW)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+- endif (MINGW)
+-endif(APPLE)
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+
+@@ -134,17 +124,17 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+ testutils
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+ )
+ else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+ testutils
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ )
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+
+-# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+
+ add_custom_target(report
+ COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
+diff --git a/mtest/cmake.inc b/mtest/cmake.inc
+index 9de4518a5..275da35b1 100644
+--- a/mtest/cmake.inc
++++ b/mtest/cmake.inc
+@@ -57,16 +57,16 @@ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+- LINK_FLAGS "-g -stdlib=libc++"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
++ LINK_FLAGS "-stdlib=libc++"
+ )
+ else(APPLE)
+ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+- LINK_FLAGS "-g"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
++ LINK_FLAGS ""
+ )
+ endif(APPLE)
+
+@@ -74,7 +74,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+ )
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+
+diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
+index 88615e5fe..d719e895e 100644
+--- a/omr/CMakeLists.txt
++++ b/omr/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_library (
+ set_target_properties (
+ omr
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(omr all)
+diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
+index 0520920cf..e9bd15b4e 100644
+--- a/synthesizer/CMakeLists.txt
++++ b/synthesizer/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
+ set_target_properties (
+ synthesizer
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(synthesizer all)
+diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
+index ae905c735..9b039e8d2 100644
+--- a/thirdparty/beatroot/CMakeLists.txt
++++ b/thirdparty/beatroot/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_library (
+
+ set_target_properties( beatroot
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(beatroot all)
+diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
+index d0155b214..35bd6ac4b 100644
+--- a/thirdparty/diff/CMakeLists.txt
++++ b/thirdparty/diff/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
+ set_target_properties (
+ diff_match_patch
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(diff_match_patch all)
+diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
+index 9beb6b1f2..f7ec1c5ba 100644
+--- a/thirdparty/kQOAuth/CMakeLists.txt
++++ b/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
+ set_target_properties (
+ kqoauth
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(kqoauth all)
+diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
+index fc39a0aa1..8c11f0710 100644
+--- a/thirdparty/ofqf/CMakeLists.txt
++++ b/thirdparty/ofqf/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(ofqf STATIC
+ set_target_properties (
+ ofqf
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(ofqf all)
+diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
+index 77b19979e..417017e12 100644
+--- a/thirdparty/qzip/CMakeLists.txt
++++ b/thirdparty/qzip/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(qzip STATIC
+ set_target_properties (
+ qzip
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(qzip all)
+diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
+index 230339bde..6c94a06ea 100644
+--- a/thirdparty/rtf2html/CMakeLists.txt
++++ b/thirdparty/rtf2html/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library (
+
+ set_target_properties( rtf2html
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(rtf2html all)
+diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
+index 2504b017e..936fa3f09 100644
+--- a/thirdparty/singleapp/src/CMakeLists.txt
++++ b/thirdparty/singleapp/src/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (
+ set_target_properties (
+ qtsingleapp
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(qtsingleapp all)
+diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
+index 5991e09e5..7f1268e62 100644
+--- a/thirdparty/xmlstream/CMakeLists.txt
++++ b/thirdparty/xmlstream/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
+ set_target_properties (
+ xmlstream
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(xmlstream all)
+diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
+index c0db57150..58d8ddf9f 100644
+--- a/zerberus/CMakeLists.txt
++++ b/zerberus/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (zerberus STATIC
+ set_target_properties (
+ zerberus
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(zerberus all)
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index 422ed8688f8..73e8e2334c0 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -9,4 +9,7 @@
<remote-id type="sourceforge">mscore</remote-id>
<remote-id type="github">musescore/MuseScore</remote-id>
</upstream>
+ <use>
+ <flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0.ebuild
new file mode 100644
index 00000000000..4f547ddc3db
--- /dev/null
+++ b/media-sound/musescore/musescore-2.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://musescore.org/"
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+RDEPEND="
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtxmlpatterns:5
+ >=media-libs/freetype-2.5.2
+ media-libs/libsndfile
+ sys-libs/zlib
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ jack? ( virtual/jack )
+ mp3? ( media-sound/lame )
+ portaudio? ( media-libs/portaudio )
+ portmidi? ( media-libs/portmidi )
+ pulseaudio? ( media-sound/pulseaudio )
+ "
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+ "
+PATCHES=(
+ "${FILESDIR}/${PN}-2.1.0-fix-buildsystem.patch"
+)
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_ALSA="$(usex alsa)"
+ -DBUILD_JACK="$(usex jack)"
+ -DBUILD_LAME="$(usex mp3)"
+ -DBUILD_PORTAUDIO="$(usex portaudio)"
+ -DBUILD_PORTMIDI="$(usex portmidi)"
+ -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cd "${BUILD_DIR}" || die
+ cmake-utils_src_make -j1 lrelease manpages
+ cmake-utils_src_compile
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2017-12-09 23:13 Michał Górny
0 siblings, 0 replies; 23+ messages in thread
From: Michał Górny @ 2017-12-09 23:13 UTC (permalink / raw
To: gentoo-commits
commit: 06da9a987b1e0a3377b01dfad30158d1888f1dad
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 22:50:57 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 23:13:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06da9a98
media-sound/musescore: [QA] Move patches to distfiles
Closes: https://bugs.gentoo.org/620594
media-sound/musescore/Manifest | 10 +-
.../files/musescore-2.0.2-fix-buildsystem.patch | 429 -----------------
.../files/musescore-2.0.3-fix-buildsystem.patch | 479 -------------------
.../files/musescore-2.1.0-fix-buildsystem.patch | 494 --------------------
.../files/musescore-9999-fix-buildsystem.patch | 514 ---------------------
media-sound/musescore/musescore-2.0.2-r1.ebuild | 5 +-
media-sound/musescore/musescore-2.0.3.ebuild | 5 +-
media-sound/musescore/musescore-2.1.0.ebuild | 5 +-
media-sound/musescore/musescore-9999.ebuild | 3 +-
9 files changed, 18 insertions(+), 1926 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 05a5d36252c..549a036e403 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,7 @@
-DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6
-DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2
-DIST musescore-2.1.0.tar.gz 51131549 SHA256 0581b8dd4e9bef51f863baf5b7f03b518f9784c79c0d92d6f0e33b180dd63c47 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2 WHIRLPOOL 1814cf937f1f1f9898f8aa62a60ed3dbfec4cb9af2ded6d03ccfde6c372bba6b3ddc8c6ba83677fc770363975c7c36a144adb17f16195e8b30706d6bcfea9c69
+DIST musescore-2.0.2-fix-buildsystem.patch.bz2 2829 BLAKE2B 873265c9527f0df94a9ded5c9a34e1be5e677a00567bf09787228ee5195d49c77ea489166965c2b3defa7b8ddd38547d34be6ead4a1cbd18d575272690efed28 SHA512 2790352aa29215d02085a85fb2bae782fb8dd0db1c81b0d1d09d2d663843269cb32fa077663421bd2867779d1248ec36a34edb896e3e050f88f37c01111fe70b
+DIST musescore-2.0.2.tar.gz 44528670 BLAKE2B 18bc664c8b1d36b8b3d649b68bb3a6edd7eeb30744552fd7d4211eed8f995a71da0f61992f92886080882c4d8ad4184876745ce405dafeb2f017bab7eb761ef6 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c
+DIST musescore-2.0.3-fix-buildsystem.patch.bz2 3446 BLAKE2B a6c1f000248e3ccbf993633901dee92c32930c46c73e485c273069328f14911bb7edec1d3ea6e41cb0709e328d3c46ef902f9dbd4859cb63a962978d490d98c1 SHA512 9b1bdd2b6ef68baebcb5209ada409fcf2648d999d997d490b15c2a40185f6b0a04ecb8690978707872d02a30d99ac2f80ebb72f6f19e15ec3404f996f89602b2
+DIST musescore-2.0.3.tar.gz 49958474 BLAKE2B f8b490eea470b2f72b13d6a62481a75a8132af0267d10a3a4f77e1069d7bc8b03b96a54ca287465e12c3862b3837adcbc4a181ffeac5a2c46b1b7d8ac9a051f2 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1
+DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
+DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
+DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89
diff --git a/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch
deleted file mode 100644
index aa2749cad58..00000000000
--- a/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-* Remove hardcoded CXXFLAGS, set only necessary options
-* Turn off RPATH linking
-* Fix QA issues caused by wrong "Version" setting in desktop file
-
---- MuseScore-2.0.2/aeolus/CMakeLists.txt
-+++ MuseScore-2.0.2/aeolus/CMakeLists.txt
-@@ -43,7 +43,7 @@
- set_target_properties (
- aeolus
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- install(DIRECTORY
---- MuseScore-2.0.2/audiofile/CMakeLists.txt
-+++ MuseScore-2.0.2/audiofile/CMakeLists.txt
-@@ -26,7 +26,7 @@
- set_target_properties (
- audiofile
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(audiofile all)
---- MuseScore-2.0.2/awl/CMakeLists.txt
-+++ MuseScore-2.0.2/awl/CMakeLists.txt
-@@ -43,7 +43,7 @@
- set_target_properties (
- awl
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(awl all)
---- MuseScore-2.0.2/build/CreatePrecompiledHeader.cmake
-+++ MuseScore-2.0.2/build/CreatePrecompiledHeader.cmake
-@@ -36,7 +36,7 @@
- set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
- add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
-- COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-+ COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
- DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- VERBATIM
---- MuseScore-2.0.2/bww2mxml/CMakeLists.txt
-+++ MuseScore-2.0.2/bww2mxml/CMakeLists.txt
-@@ -49,7 +49,7 @@
- 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
---- MuseScore-2.0.2/CMakeLists.txt
-+++ MuseScore-2.0.2/CMakeLists.txt
-@@ -115,22 +115,10 @@
- endif()
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-
--if (APPLE)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG")
--else (APPLE)
-- if (MINGW)
-- # -mno-ms-bitfields see #22048
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
-- else (MINGW)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -fPIE -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
-- endif (MINGW)
--endif(APPLE)
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-
- set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
-+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
-
- # The Mscore version number.
-@@ -398,7 +386,6 @@
- # set library search path for runtime linker to load the same
- # qt libraries as we used at compile time
- #
-- set (CMAKE_EXE_LINKER_FLAGS "-Wl,-rpath=${_qt5Core_install_prefix}/lib")
- # install desktop file
- install( FILES build/mscore.desktop DESTINATION share/applications)
- # compress man pages if gzip is installed (don't on OpenBSD)
-@@ -449,11 +436,7 @@
- DEPENDS ${PROJECT_SOURCE_DIR}/all.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
--if (MINGW)
-- set(BUILD_PCH false)
--else (MINGW)
-- set(BUILD_PCH true)
--endif(MINGW)
-+set(BUILD_PCH false)
-
- precompiled_header(QT_INCLUDES all ${BUILD_PCH})
-
---- MuseScore-2.0.2/effects/CMakeLists.txt
-+++ MuseScore-2.0.2/effects/CMakeLists.txt
-@@ -37,7 +37,7 @@
- set_target_properties (
- effects
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(effects all)
---- MuseScore-2.0.2/fluid/CMakeLists.txt
-+++ MuseScore-2.0.2/fluid/CMakeLists.txt
-@@ -45,7 +45,7 @@
- set_target_properties (
- fluid
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(fluid all)
---- MuseScore-2.0.2/fonttools/CMakeLists.txt
-+++ MuseScore-2.0.2/fonttools/CMakeLists.txt
-@@ -19,5 +19,5 @@
- )
-
- target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
--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")
-
---- MuseScore-2.0.2/libmscore/CMakeLists.txt
-+++ MuseScore-2.0.2/libmscore/CMakeLists.txt
-@@ -71,8 +71,8 @@
- set_target_properties (
- libmscore
- PROPERTIES
-- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
--# COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-+# COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
- )
-
- xcode_pch(libmscore all)
---- MuseScore-2.0.2/manual/CMakeLists.txt
-+++ MuseScore-2.0.2/manual/CMakeLists.txt
-@@ -36,13 +36,13 @@
- set_target_properties (
- genManual
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
- )
- else(APPLE)
- set_target_properties (
- genManual
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
- )
- endif(APPLE)
-
---- MuseScore-2.0.2/midi/CMakeLists.txt
-+++ MuseScore-2.0.2/midi/CMakeLists.txt
-@@ -27,7 +27,7 @@
- set_target_properties (
- midi
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(midi all)
---- MuseScore-2.0.2/miditools/CMakeLists.txt
-+++ MuseScore-2.0.2/miditools/CMakeLists.txt
-@@ -13,7 +13,7 @@
- add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
-
- set_target_properties(smf2xml
-- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
- )
- target_link_libraries(smf2xml
- ${QT_LIBRARIES}
-@@ -23,7 +23,7 @@
-
- set_target_properties (
- xml2smf
-- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
- )
- target_link_libraries(xml2smf
- ${QT_LIBRARIES}
---- MuseScore-2.0.2/mscore/CMakeLists.txt
-+++ MuseScore-2.0.2/mscore/CMakeLists.txt
-@@ -367,7 +367,7 @@
- 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 "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
- LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
- )
- else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-@@ -488,7 +488,7 @@
- set_target_properties (
- mscore
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
- )
-
- if (OMR)
---- MuseScore-2.0.2/mstyle/CMakeLists.txt
-+++ MuseScore-2.0.2/mstyle/CMakeLists.txt
-@@ -49,7 +49,7 @@
- set_target_properties (
- mstyle
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(mstyle all)
---- MuseScore-2.0.2/mtest/cmake.inc
-+++ MuseScore-2.0.2/mtest/cmake.inc
-@@ -56,16 +56,16 @@
- ${TARGET}
- PROPERTIES
- AUTOMOC true
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-- LINK_FLAGS "-g -stdlib=libc++"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-+ LINK_FLAGS "-stdlib=libc++"
- )
- else(APPLE)
- set_target_properties (
- ${TARGET}
- PROPERTIES
- AUTOMOC true
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-- LINK_FLAGS "-g"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-+ LINK_FLAGS ""
- )
- endif(APPLE)
-
---- MuseScore-2.0.2/mtest/CMakeLists.txt
-+++ MuseScore-2.0.2/mtest/CMakeLists.txt
-@@ -112,20 +112,7 @@
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-
--if (APPLE)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG")
--else (APPLE)
-- if (MINGW)
-- # -mno-ms-bitfields see #22048
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
-- else (MINGW)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -fPIE -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
-- endif (MINGW)
--endif(APPLE)
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-
- string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
-
-@@ -133,17 +120,17 @@
- set_target_properties (
- testutils
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
- )
- else (APPLE)
- set_target_properties (
- testutils
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
- )
- endif(APPLE)
-
--# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-
- add_custom_target(report
- COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
---- MuseScore-2.0.2/omr/CMakeLists.txt
-+++ MuseScore-2.0.2/omr/CMakeLists.txt
-@@ -42,7 +42,7 @@
- set_target_properties (
- omr
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(omr all)
---- MuseScore-2.0.2/synthesizer/CMakeLists.txt
-+++ MuseScore-2.0.2/synthesizer/CMakeLists.txt
-@@ -29,7 +29,7 @@
- set_target_properties (
- synthesizer
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(synthesizer all)
---- MuseScore-2.0.2/thirdparty/beatroot/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/beatroot/CMakeLists.txt
-@@ -14,7 +14,7 @@
-
- set_target_properties( beatroot
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(beatroot all)
---- MuseScore-2.0.2/thirdparty/diff/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/diff/CMakeLists.txt
-@@ -36,7 +36,7 @@
- set_target_properties (
- diff_match_patch
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(diff_match_patch all)
---- MuseScore-2.0.2/thirdparty/kQOAuth/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/kQOAuth/CMakeLists.txt
-@@ -40,7 +40,7 @@
- set_target_properties (
- kqoauth
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(kqoauth all)
---- MuseScore-2.0.2/thirdparty/ofqf/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/ofqf/CMakeLists.txt
-@@ -36,7 +36,7 @@
- set_target_properties (
- ofqf
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(ofqf all)
---- MuseScore-2.0.2/thirdparty/qzip/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/qzip/CMakeLists.txt
-@@ -29,7 +29,7 @@
- set_target_properties (
- qzip
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(qzip all)
---- MuseScore-2.0.2/thirdparty/rtf2html/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/rtf2html/CMakeLists.txt
-@@ -37,7 +37,7 @@
-
- set_target_properties( rtf2html
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(rtf2html all)
---- MuseScore-2.0.2/thirdparty/singleapp/src/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/singleapp/src/CMakeLists.txt
-@@ -31,7 +31,7 @@
- set_target_properties (
- qtsingleapp
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(qtsingleapp all)
---- MuseScore-2.0.2/thirdparty/xmlstream/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/xmlstream/CMakeLists.txt
-@@ -29,7 +29,7 @@
- set_target_properties (
- xmlstream
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(xmlstream all)
---- MuseScore-2.0.2/zerberus/CMakeLists.txt
-+++ MuseScore-2.0.2/zerberus/CMakeLists.txt
-@@ -31,7 +31,7 @@
- set_target_properties (
- zerberus
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(zerberus all)
---- MuseScore-2.0.2/build/mscore.desktop
-+++ MuseScore-2.0.2/build/mscore.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=2.0
-+Version=1.0
- Comment=Create, play and print sheet music
- Comment[ru]=Визуальный редактор нотных партитур
- Comment[fr]=Gravure de partitions musicales
diff --git a/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch
deleted file mode 100644
index 0fb52db915c..00000000000
--- a/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch
+++ /dev/null
@@ -1,479 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c4fe57..b7a5cde 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,23 +147,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- endif()
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-
--if (APPLE)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
-- if (MINGW)
-- # -mno-ms-bitfields see #22048
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -mno-ms-bitfields -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
-- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
-- else (MINGW)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -fPIE -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
-- endif (MINGW)
--endif(APPLE)
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
-
- set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
-+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
-
- # The Mscore version number.
-@@ -450,7 +440,6 @@ if (NOT MINGW AND NOT APPLE)
- # set library search path for runtime linker to load the same
- # qt libraries as we used at compile time
- #
-- SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if CMAKE_SKIP_RPATH="TRUE"
- string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
- if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
- # Build portable AppImage as per https://github.com/probonopd/AppImageKit
-@@ -554,11 +543,7 @@ add_custom_command(
- DEPENDS ${PROJECT_SOURCE_DIR}/all.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
--if (MINGW)
-- set(BUILD_PCH false)
--else (MINGW)
-- set(BUILD_PCH true)
--endif(MINGW)
-+set(BUILD_PCH false)
-
- precompiled_header(QT_INCLUDES all ${BUILD_PCH})
-
-diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
-index 7962e87..a23aef3 100644
---- a/aeolus/CMakeLists.txt
-+++ b/aeolus/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (aeolus STATIC
- set_target_properties (
- aeolus
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- install(DIRECTORY
-diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
-index 5b1dd48..0d28df8 100644
---- a/audiofile/CMakeLists.txt
-+++ b/audiofile/CMakeLists.txt
-@@ -26,7 +26,7 @@ add_library (audiofile STATIC
- set_target_properties (
- audiofile
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(audiofile all)
-diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
-index 9589cce..f4172ed 100644
---- a/awl/CMakeLists.txt
-+++ b/awl/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (
- set_target_properties (
- awl
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(awl all)
-diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
-index 6cb671a..3d4aae3 100644
---- a/build/CreatePrecompiledHeader.cmake
-+++ b/build/CreatePrecompiledHeader.cmake
-@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
- set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
- add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
-- COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-+ COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
- DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- VERBATIM
-diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
-index d6b7794..acec8b5 100644
---- a/bww2mxml/CMakeLists.txt
-+++ b/bww2mxml/CMakeLists.txt
-@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
- 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/effects/CMakeLists.txt b/effects/CMakeLists.txt
-index a695f1d..cf94cae 100644
---- a/effects/CMakeLists.txt
-+++ b/effects/CMakeLists.txt
-@@ -44,7 +44,7 @@ add_library (effects STATIC
- set_target_properties (
- effects
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(effects all)
-diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
-index 1dc8d2f..3fede66 100644
---- a/fluid/CMakeLists.txt
-+++ b/fluid/CMakeLists.txt
-@@ -45,7 +45,7 @@ add_library (fluid STATIC
- set_target_properties (
- fluid
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(fluid all)
-diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
-index 74a525b..f318f4c 100644
---- a/fonttools/CMakeLists.txt
-+++ b/fonttools/CMakeLists.txt
-@@ -19,5 +19,5 @@ add_executable(
- )
-
- target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
--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")
-
-diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
-index 446d413..5d871a8 100644
---- a/libmscore/CMakeLists.txt
-+++ b/libmscore/CMakeLists.txt
-@@ -71,8 +71,8 @@ add_library (
- set_target_properties (
- libmscore
- PROPERTIES
-- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
--# COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-+# COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
- )
-
- xcode_pch(libmscore all)
-diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
-index cf6edca..ceffd73 100644
---- a/manual/CMakeLists.txt
-+++ b/manual/CMakeLists.txt
-@@ -36,13 +36,13 @@ if(APPLE)
- set_target_properties (
- genManual
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
- )
- else(APPLE)
- set_target_properties (
- genManual
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
- )
- endif(APPLE)
-
-diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
-index 05fbb83..ea95480 100644
---- a/midi/CMakeLists.txt
-+++ b/midi/CMakeLists.txt
-@@ -27,7 +27,7 @@ add_library (midi STATIC
- set_target_properties (
- midi
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(midi all)
-diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
-index 6df79c4..f8145e0 100644
---- a/miditools/CMakeLists.txt
-+++ b/miditools/CMakeLists.txt
-@@ -13,7 +13,7 @@
- add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
-
- set_target_properties(smf2xml
-- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
- )
- target_link_libraries(smf2xml
- ${QT_LIBRARIES}
-@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
-
- set_target_properties (
- xml2smf
-- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
- )
- target_link_libraries(xml2smf
- ${QT_LIBRARIES}
-diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
-index 3592012..b50e2bc 100644
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -370,7 +370,7 @@ 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 "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
- LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
- )
- else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-@@ -493,7 +493,7 @@ else (MINGW)
- set_target_properties (
- mscore
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
- )
-
- if (OMR)
-diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
-index e60d901..d3ba643 100644
---- a/mstyle/CMakeLists.txt
-+++ b/mstyle/CMakeLists.txt
-@@ -49,7 +49,7 @@ add_library (
- set_target_properties (
- mstyle
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(mstyle all)
-diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
-index 55072b0..cab1a18 100644
---- a/mtest/CMakeLists.txt
-+++ b/mtest/CMakeLists.txt
-@@ -113,20 +113,10 @@ target_link_libraries(
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-
--if (APPLE)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
-- if (MINGW)
-- # -mno-ms-bitfields see #22048
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
-- else (MINGW)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -fPIE -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
-- endif (MINGW)
--endif(APPLE)
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
-
- string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
-
-@@ -134,17 +124,17 @@ if (APPLE)
- set_target_properties (
- testutils
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
- )
- else (APPLE)
- set_target_properties (
- testutils
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
- )
- endif(APPLE)
-
--# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-
- add_custom_target(report
- COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
-diff --git a/mtest/cmake.inc b/mtest/cmake.inc
-index 0fa9aa8..9ef0177 100644
---- a/mtest/cmake.inc
-+++ b/mtest/cmake.inc
-@@ -57,16 +57,16 @@ set_target_properties (
- ${TARGET}
- PROPERTIES
- AUTOMOC true
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-- LINK_FLAGS "-g -stdlib=libc++"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-+ LINK_FLAGS "-stdlib=libc++"
- )
- else(APPLE)
- set_target_properties (
- ${TARGET}
- PROPERTIES
- AUTOMOC true
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-- LINK_FLAGS "-g"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-+ LINK_FLAGS ""
- )
- endif(APPLE)
-
-diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
-index 88615e5..d719e89 100644
---- a/omr/CMakeLists.txt
-+++ b/omr/CMakeLists.txt
-@@ -42,7 +42,7 @@ add_library (
- set_target_properties (
- omr
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(omr all)
-diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
-index 0520920..e9bd15b 100644
---- a/synthesizer/CMakeLists.txt
-+++ b/synthesizer/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
- set_target_properties (
- synthesizer
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(synthesizer all)
-diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
-index ae905c7..9b039e8 100644
---- a/thirdparty/beatroot/CMakeLists.txt
-+++ b/thirdparty/beatroot/CMakeLists.txt
-@@ -14,7 +14,7 @@ add_library (
-
- set_target_properties( beatroot
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(beatroot all)
-diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
-index d0155b2..35bd6ac 100644
---- a/thirdparty/diff/CMakeLists.txt
-+++ b/thirdparty/diff/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
- set_target_properties (
- diff_match_patch
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(diff_match_patch all)
-diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
-index 9beb6b1..f7ec1c5 100644
---- a/thirdparty/kQOAuth/CMakeLists.txt
-+++ b/thirdparty/kQOAuth/CMakeLists.txt
-@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
- set_target_properties (
- kqoauth
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(kqoauth all)
-diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
-index fc39a0a..8c11f07 100644
---- a/thirdparty/ofqf/CMakeLists.txt
-+++ b/thirdparty/ofqf/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(ofqf STATIC
- set_target_properties (
- ofqf
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(ofqf all)
-diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
-index 77b1997..417017e 100644
---- a/thirdparty/qzip/CMakeLists.txt
-+++ b/thirdparty/qzip/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(qzip STATIC
- set_target_properties (
- qzip
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(qzip all)
-diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
-index 230339b..6c94a06 100644
---- a/thirdparty/rtf2html/CMakeLists.txt
-+++ b/thirdparty/rtf2html/CMakeLists.txt
-@@ -37,7 +37,7 @@ add_library (
-
- set_target_properties( rtf2html
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(rtf2html all)
-diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
-index 2504b01..936fa3f 100644
---- a/thirdparty/singleapp/src/CMakeLists.txt
-+++ b/thirdparty/singleapp/src/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (
- set_target_properties (
- qtsingleapp
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(qtsingleapp all)
-diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
-index 5991e09..7f1268e 100644
---- a/thirdparty/xmlstream/CMakeLists.txt
-+++ b/thirdparty/xmlstream/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
- set_target_properties (
- xmlstream
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(xmlstream all)
-diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
-index c0db571..58d8ddf 100644
---- a/zerberus/CMakeLists.txt
-+++ b/zerberus/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (zerberus STATIC
- set_target_properties (
- zerberus
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(zerberus all)
diff --git a/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch
deleted file mode 100644
index 9667c4fadc1..00000000000
--- a/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch
+++ /dev/null
@@ -1,494 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 079504708..026e8289a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -153,23 +153,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- endif()
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-
--if (APPLE)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
-- if (MINGW)
-- # -mno-ms-bitfields see #22048
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -mno-ms-bitfields -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
-- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
-- else (MINGW)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
-- endif (MINGW)
--endif(APPLE)
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
-
- set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
-+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
-
- # The Mscore version number.
-@@ -473,7 +463,6 @@ if (NOT MINGW AND NOT APPLE)
- # set library search path for runtime linker to load the same
- # qt libraries as we used at compile time
- #
-- SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if CMAKE_SKIP_RPATH="TRUE"
- string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
- if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
- # Build portable AppImage as per https://github.com/probonopd/AppImageKit
-@@ -577,9 +566,6 @@ add_custom_command(
- DEPENDS ${PROJECT_SOURCE_DIR}/all.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
--if (NOT MINGW)
-- set(BUILD_PCH true)
--endif(NOT MINGW)
-
- precompiled_header(QT_INCLUDES all ${BUILD_PCH})
-
-diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
-index 7962e8781..a23aef396 100644
---- a/aeolus/CMakeLists.txt
-+++ b/aeolus/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (aeolus STATIC
- set_target_properties (
- aeolus
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- install(DIRECTORY
-diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
-index 5b1dd48ee..0d28df8ea 100644
---- a/audiofile/CMakeLists.txt
-+++ b/audiofile/CMakeLists.txt
-@@ -26,7 +26,7 @@ add_library (audiofile STATIC
- set_target_properties (
- audiofile
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(audiofile all)
-diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
-index 9589cceb2..f4172ed6d 100644
---- a/awl/CMakeLists.txt
-+++ b/awl/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (
- set_target_properties (
- awl
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(awl all)
-diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
-index 6cb671afc..3d4aae3c2 100644
---- a/build/CreatePrecompiledHeader.cmake
-+++ b/build/CreatePrecompiledHeader.cmake
-@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
- set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
- add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
-- COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-+ COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
- DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- VERBATIM
-diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
-index d6b779465..acec8b5e9 100644
---- a/bww2mxml/CMakeLists.txt
-+++ b/bww2mxml/CMakeLists.txt
-@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
- 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/effects/CMakeLists.txt b/effects/CMakeLists.txt
-index a695f1d5e..cf94caed9 100644
---- a/effects/CMakeLists.txt
-+++ b/effects/CMakeLists.txt
-@@ -44,7 +44,7 @@ add_library (effects STATIC
- set_target_properties (
- effects
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(effects all)
-diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
-index 1dc8d2f8d..3fede6647 100644
---- a/fluid/CMakeLists.txt
-+++ b/fluid/CMakeLists.txt
-@@ -45,7 +45,7 @@ add_library (fluid STATIC
- set_target_properties (
- fluid
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(fluid all)
-diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
-index 74a525ba3..f318f4c04 100644
---- a/fonttools/CMakeLists.txt
-+++ b/fonttools/CMakeLists.txt
-@@ -19,5 +19,5 @@ add_executable(
- )
-
- target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
--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")
-
-diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
-index 446d413ee..5d871a813 100644
---- a/libmscore/CMakeLists.txt
-+++ b/libmscore/CMakeLists.txt
-@@ -71,8 +71,8 @@ add_library (
- set_target_properties (
- libmscore
- PROPERTIES
-- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
--# COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-+# COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
- )
-
- xcode_pch(libmscore all)
-diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
-index cf6edcaed..ceffd7330 100644
---- a/manual/CMakeLists.txt
-+++ b/manual/CMakeLists.txt
-@@ -36,13 +36,13 @@ if(APPLE)
- set_target_properties (
- genManual
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
- )
- else(APPLE)
- set_target_properties (
- genManual
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
- )
- endif(APPLE)
-
-diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
-index 05fbb83d5..ea95480c9 100644
---- a/midi/CMakeLists.txt
-+++ b/midi/CMakeLists.txt
-@@ -27,7 +27,7 @@ add_library (midi STATIC
- set_target_properties (
- midi
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(midi all)
-diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
-index 6df79c41b..f8145e04a 100644
---- a/miditools/CMakeLists.txt
-+++ b/miditools/CMakeLists.txt
-@@ -13,7 +13,7 @@
- add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
-
- set_target_properties(smf2xml
-- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
- )
- target_link_libraries(smf2xml
- ${QT_LIBRARIES}
-@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
-
- set_target_properties (
- xml2smf
-- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
- )
- target_link_libraries(xml2smf
- ${QT_LIBRARIES}
-diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
-index 36196e1c8..cb4a889cd 100644
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -379,7 +379,7 @@ 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 "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
- LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
- )
- else (CMAKE_BUILD_TYPE MATCHES "DEBUG")
-@@ -507,7 +507,7 @@ else (MINGW)
- if (APPLE)
- set(PORTMIDI_LIB portmidi)
- else (APPLE)
-- set(PORTMIDI_LIB -lportmidi -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
-+ set(PORTMIDI_LIB -lportmidi) # -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
- endif (APPLE)
- target_link_libraries(mscore ${PORTMIDI_LIB})
- endif (USE_PORTMIDI)
-@@ -526,7 +526,7 @@ else (MINGW)
-
- set_target_properties(mscore
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
- )
-
- if (OMR)
-diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
-index e60d901fa..d3ba64316 100644
---- a/mstyle/CMakeLists.txt
-+++ b/mstyle/CMakeLists.txt
-@@ -49,7 +49,7 @@ add_library (
- set_target_properties (
- mstyle
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(mstyle all)
-diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
-index 0831c0810..3e37b2d34 100644
---- a/mtest/CMakeLists.txt
-+++ b/mtest/CMakeLists.txt
-@@ -113,20 +113,10 @@ target_link_libraries(
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-
--if (APPLE)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
-- if (MINGW)
-- # -mno-ms-bitfields see #22048
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
-- else (MINGW)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
-- endif (MINGW)
--endif(APPLE)
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
-
- string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
-
-@@ -134,17 +124,17 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
- testutils
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
- )
- else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
- testutils
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
- )
- endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
-
--# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-
- add_custom_target(report
- COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
-diff --git a/mtest/cmake.inc b/mtest/cmake.inc
-index 9de4518a5..275da35b1 100644
---- a/mtest/cmake.inc
-+++ b/mtest/cmake.inc
-@@ -57,16 +57,16 @@ set_target_properties (
- ${TARGET}
- PROPERTIES
- AUTOMOC true
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-- LINK_FLAGS "-g -stdlib=libc++"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-+ LINK_FLAGS "-stdlib=libc++"
- )
- else(APPLE)
- set_target_properties (
- ${TARGET}
- PROPERTIES
- AUTOMOC true
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-- LINK_FLAGS "-g"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-+ LINK_FLAGS ""
- )
- endif(APPLE)
-
-@@ -74,7 +74,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
- ${TARGET}
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
- )
- endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
-
-diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
-index 88615e5fe..d719e895e 100644
---- a/omr/CMakeLists.txt
-+++ b/omr/CMakeLists.txt
-@@ -42,7 +42,7 @@ add_library (
- set_target_properties (
- omr
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(omr all)
-diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
-index 0520920cf..e9bd15b4e 100644
---- a/synthesizer/CMakeLists.txt
-+++ b/synthesizer/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
- set_target_properties (
- synthesizer
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(synthesizer all)
-diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
-index ae905c735..9b039e8d2 100644
---- a/thirdparty/beatroot/CMakeLists.txt
-+++ b/thirdparty/beatroot/CMakeLists.txt
-@@ -14,7 +14,7 @@ add_library (
-
- set_target_properties( beatroot
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(beatroot all)
-diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
-index d0155b214..35bd6ac4b 100644
---- a/thirdparty/diff/CMakeLists.txt
-+++ b/thirdparty/diff/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
- set_target_properties (
- diff_match_patch
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(diff_match_patch all)
-diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
-index 9beb6b1f2..f7ec1c5ba 100644
---- a/thirdparty/kQOAuth/CMakeLists.txt
-+++ b/thirdparty/kQOAuth/CMakeLists.txt
-@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
- set_target_properties (
- kqoauth
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(kqoauth all)
-diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
-index fc39a0aa1..8c11f0710 100644
---- a/thirdparty/ofqf/CMakeLists.txt
-+++ b/thirdparty/ofqf/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(ofqf STATIC
- set_target_properties (
- ofqf
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(ofqf all)
-diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
-index 77b19979e..417017e12 100644
---- a/thirdparty/qzip/CMakeLists.txt
-+++ b/thirdparty/qzip/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(qzip STATIC
- set_target_properties (
- qzip
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(qzip all)
-diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
-index 230339bde..6c94a06ea 100644
---- a/thirdparty/rtf2html/CMakeLists.txt
-+++ b/thirdparty/rtf2html/CMakeLists.txt
-@@ -37,7 +37,7 @@ add_library (
-
- set_target_properties( rtf2html
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(rtf2html all)
-diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
-index 2504b017e..936fa3f09 100644
---- a/thirdparty/singleapp/src/CMakeLists.txt
-+++ b/thirdparty/singleapp/src/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (
- set_target_properties (
- qtsingleapp
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(qtsingleapp all)
-diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
-index 5991e09e5..7f1268e62 100644
---- a/thirdparty/xmlstream/CMakeLists.txt
-+++ b/thirdparty/xmlstream/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
- set_target_properties (
- xmlstream
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(xmlstream all)
-diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
-index c0db57150..58d8ddf9f 100644
---- a/zerberus/CMakeLists.txt
-+++ b/zerberus/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (zerberus STATIC
- set_target_properties (
- zerberus
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(zerberus all)
diff --git a/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch b/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch
deleted file mode 100644
index 74ba5113874..00000000000
--- a/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch
+++ /dev/null
@@ -1,514 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e2e91f3fe..7feb7a9e5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -142,27 +142,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- endif()
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-
--if (APPLE)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
-- # This is necessary for genManual to be executed during the build phase,
-- # it needs to be able to get the Qt libs.
-- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-- SET(CMAKE_INSTALL_RPATH "${QT_INSTALL_PREFIX}/lib")
--else (APPLE)
-- if (MINGW)
-- # -mno-ms-bitfields see #22048
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -mno-ms-bitfields -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
-- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
-- else (MINGW)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++11 -fPIC -g -Wall -Wextra -Woverloaded-virtual")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
-- endif (MINGW)
--endif(APPLE)
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS ON)
-
- set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
-+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
-
- # The MuseScore version number.
-@@ -415,7 +401,6 @@ if (NOT MINGW AND NOT APPLE)
- # set library search path for runtime linker to load the same
- # qt libraries as we used at compile time
- #
-- SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # Ignored if CMAKE_SKIP_RPATH="TRUE"
- string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
- if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
- # Build portable AppImage as per https://github.com/probonopd/AppImageKit
-@@ -519,9 +504,6 @@ add_custom_command(
- DEPENDS ${PROJECT_SOURCE_DIR}/all.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
--if (NOT MINGW)
-- set(BUILD_PCH true)
--endif(NOT MINGW)
-
- precompiled_header(QT_INCLUDES all ${BUILD_PCH})
-
-diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
-index 7962e8781..bdcb08dae 100644
---- a/aeolus/CMakeLists.txt
-+++ b/aeolus/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (aeolus STATIC
- set_target_properties (
- aeolus
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- install(DIRECTORY
-diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
-index 5b1dd48ee..264a14a17 100644
---- a/audiofile/CMakeLists.txt
-+++ b/audiofile/CMakeLists.txt
-@@ -26,7 +26,7 @@ add_library (audiofile STATIC
- set_target_properties (
- audiofile
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(audiofile all)
-diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
-index bcf5427b7..fec81d8b3 100644
---- a/awl/CMakeLists.txt
-+++ b/awl/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (
- set_target_properties (
- awl
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(awl all)
-diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
-index 72faba0de..8f9d2636c 100644
---- a/build/CreatePrecompiledHeader.cmake
-+++ b/build/CreatePrecompiledHeader.cmake
-@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
- set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
- add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
-- COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-+ COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
- DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- VERBATIM
-diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
-index d6b779465..ad7815358 100644
---- a/bww2mxml/CMakeLists.txt
-+++ b/bww2mxml/CMakeLists.txt
-@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
- 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 -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- target_link_libraries(bww2mxml
-diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
-index a695f1d5e..1f34fafce 100644
---- a/effects/CMakeLists.txt
-+++ b/effects/CMakeLists.txt
-@@ -44,7 +44,7 @@ add_library (effects STATIC
- set_target_properties (
- effects
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(effects all)
-diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
-index 1dc8d2f8d..99f8f574e 100644
---- a/fluid/CMakeLists.txt
-+++ b/fluid/CMakeLists.txt
-@@ -45,7 +45,7 @@ add_library (fluid STATIC
- set_target_properties (
- fluid
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(fluid all)
-diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
-index 74a525ba3..2cc008495 100644
---- a/fonttools/CMakeLists.txt
-+++ b/fonttools/CMakeLists.txt
-@@ -19,5 +19,5 @@ add_executable(
- )
-
- target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
--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 -fPIC -Wall -Wextra -Winvalid-pch")
-
-diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
-index 6c7e07a3a..000c9c929 100644
---- a/libmscore/CMakeLists.txt
-+++ b/libmscore/CMakeLists.txt
-@@ -73,7 +73,7 @@ add_library (
- set_target_properties (
- libmscore
- PROPERTIES
-- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
- )
-
- xcode_pch(libmscore all)
-diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
-index cf6edcaed..9eb84926c 100644
---- a/manual/CMakeLists.txt
-+++ b/manual/CMakeLists.txt
-@@ -36,13 +36,13 @@ if(APPLE)
- set_target_properties (
- genManual
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
- )
- else(APPLE)
- set_target_properties (
- genManual
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
- )
- endif(APPLE)
-
-diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
-index 05fbb83d5..bf79c9e3f 100644
---- a/midi/CMakeLists.txt
-+++ b/midi/CMakeLists.txt
-@@ -27,7 +27,7 @@ add_library (midi STATIC
- set_target_properties (
- midi
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(midi all)
-diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
-index 6df79c41b..e3bdb90b8 100644
---- a/miditools/CMakeLists.txt
-+++ b/miditools/CMakeLists.txt
-@@ -13,7 +13,7 @@
- add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
-
- set_target_properties(smf2xml
-- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+ PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
- )
- target_link_libraries(smf2xml
- ${QT_LIBRARIES}
-@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
-
- set_target_properties (
- xml2smf
-- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+ PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
- )
- target_link_libraries(xml2smf
- ${QT_LIBRARIES}
-diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
-index cd1045aa9..1b2c3a0eb 100644
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -381,13 +381,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 "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
- LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
- )
- 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 "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
- LINK_FLAGS "-Wl,-S ${PROJECT_BINARY_DIR}/resfile.o -mwindows -L ${CROSSQT}/lib"
- )
- endif(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-@@ -507,7 +507,7 @@ else (MINGW)
- set_target_properties (
- mscore
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wno-overloaded-virtual -Winvalid-pch"
- )
-
- if (OMR)
-diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
-index 2bc43c4bd..3fb96fcfa 100644
---- a/mstyle/CMakeLists.txt
-+++ b/mstyle/CMakeLists.txt
-@@ -49,7 +49,7 @@ add_library (
- set_target_properties (
- mstyle
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-overloaded-virtual"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-overloaded-virtual"
- )
-
- xcode_pch(mstyle all)
-diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
-index c0486679a..42f14301d 100644
---- a/mtest/CMakeLists.txt
-+++ b/mtest/CMakeLists.txt
-@@ -113,20 +113,10 @@ target_link_libraries(
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-
--if (APPLE)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
-- if (MINGW)
-- # -mno-ms-bitfields see #22048
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
-- else (MINGW)
-- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -g")
-- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
-- endif (MINGW)
--endif(APPLE)
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS ON)
-
- string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
-
-@@ -134,17 +124,17 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
- testutils
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
- )
- else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
- testutils
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
- )
- endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
-
--# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
-
- add_custom_target(report
- COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
-diff --git a/mtest/cmake.inc b/mtest/cmake.inc
-index 943b85e5f..35b04f51e 100644
---- a/mtest/cmake.inc
-+++ b/mtest/cmake.inc
-@@ -60,16 +60,16 @@ set_target_properties (
- ${TARGET}
- PROPERTIES
- AUTOMOC true
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-- LINK_FLAGS "-g -stdlib=libc++"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
-+ LINK_FLAGS "-stdlib=libc++"
- )
- else(APPLE)
- set_target_properties (
- ${TARGET}
- PROPERTIES
- AUTOMOC true
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-- LINK_FLAGS "-g"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
-+ LINK_FLAGS ""
- )
- endif(APPLE)
-
-@@ -77,7 +77,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
- ${TARGET}
- PROPERTIES
-- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
- )
- endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
-
-diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
-index 9ad57b930..caf9a3624 100644
---- a/omr/CMakeLists.txt
-+++ b/omr/CMakeLists.txt
-@@ -42,7 +42,7 @@ add_library (
- set_target_properties (
- omr
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
- )
-
- xcode_pch(omr all)
-diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
-index 0520920cf..e0a1aa7a1 100644
---- a/synthesizer/CMakeLists.txt
-+++ b/synthesizer/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
- set_target_properties (
- synthesizer
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(synthesizer all)
-diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
-index ae905c735..f0fb50a40 100644
---- a/thirdparty/beatroot/CMakeLists.txt
-+++ b/thirdparty/beatroot/CMakeLists.txt
-@@ -14,7 +14,7 @@ add_library (
-
- set_target_properties( beatroot
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(beatroot all)
-diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
-index d0155b214..3985868bb 100644
---- a/thirdparty/diff/CMakeLists.txt
-+++ b/thirdparty/diff/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
- set_target_properties (
- diff_match_patch
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(diff_match_patch all)
-diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
-index 9beb6b1f2..f452df5de 100644
---- a/thirdparty/kQOAuth/CMakeLists.txt
-+++ b/thirdparty/kQOAuth/CMakeLists.txt
-@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
- set_target_properties (
- kqoauth
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(kqoauth all)
-diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
-index fc39a0aa1..9200dd312 100644
---- a/thirdparty/ofqf/CMakeLists.txt
-+++ b/thirdparty/ofqf/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(ofqf STATIC
- set_target_properties (
- ofqf
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(ofqf all)
-diff --git a/thirdparty/poppler/CMakeLists.txt b/thirdparty/poppler/CMakeLists.txt
-index 943cca72e..20f336087 100644
---- a/thirdparty/poppler/CMakeLists.txt
-+++ b/thirdparty/poppler/CMakeLists.txt
-@@ -134,12 +134,12 @@ add_library(poppler STATIC
- )
-
- if (APPLE)
-- set ( POPPLER_COMPILE_FLAGS "-O2 -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
-+ set ( POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
- else (APPLE)
- if (MINGW)
-- set (POPPLER_COMPILE_FLAGS "-O2 -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
-+ set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
- else (MINGW)
-- set (POPPLER_COMPILE_FLAGS "-O2 -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
-+ set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
- endif(MINGW)
- endif(APPLE)
-
-diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
-index 77b19979e..b1b4cb841 100644
---- a/thirdparty/qzip/CMakeLists.txt
-+++ b/thirdparty/qzip/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(qzip STATIC
- set_target_properties (
- qzip
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(qzip all)
-diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
-index 230339bde..c052605e2 100644
---- a/thirdparty/rtf2html/CMakeLists.txt
-+++ b/thirdparty/rtf2html/CMakeLists.txt
-@@ -37,7 +37,7 @@ add_library (
-
- set_target_properties( rtf2html
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(rtf2html all)
-diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
-index 2504b017e..722e5d553 100644
---- a/thirdparty/singleapp/src/CMakeLists.txt
-+++ b/thirdparty/singleapp/src/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (
- set_target_properties (
- qtsingleapp
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(qtsingleapp all)
-diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
-index 5991e09e5..7e6db93ed 100644
---- a/thirdparty/xmlstream/CMakeLists.txt
-+++ b/thirdparty/xmlstream/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
- set_target_properties (
- xmlstream
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(xmlstream all)
-diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
-index c0db57150..52090bd57 100644
---- a/zerberus/CMakeLists.txt
-+++ b/zerberus/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (zerberus STATIC
- set_target_properties (
- zerberus
- PROPERTIES
-- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+ COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
- )
-
- xcode_pch(zerberus all)
diff --git a/media-sound/musescore/musescore-2.0.2-r1.ebuild b/media-sound/musescore/musescore-2.0.2-r1.ebuild
index 83c725c4282..84ac9cadf90 100644
--- a/media-sound/musescore/musescore-2.0.2-r1.ebuild
+++ b/media-sound/musescore/musescore-2.0.2-r1.ebuild
@@ -7,7 +7,8 @@ inherit cmake-utils flag-o-matic
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="https://musescore.org/"
-SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -42,7 +43,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}/${P}-fix-buildsystem.patch"
+ "${WORKDIR}/${P}-fix-buildsystem.patch"
)
S="${WORKDIR}/MuseScore-${PV}"
diff --git a/media-sound/musescore/musescore-2.0.3.ebuild b/media-sound/musescore/musescore-2.0.3.ebuild
index a574e62b731..27aff7756be 100644
--- a/media-sound/musescore/musescore-2.0.3.ebuild
+++ b/media-sound/musescore/musescore-2.0.3.ebuild
@@ -7,7 +7,8 @@ inherit cmake-utils
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="https://musescore.org/"
-SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -39,7 +40,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}/${PN}-2.0.3-fix-buildsystem.patch"
+ "${WORKDIR}/${PN}-2.0.3-fix-buildsystem.patch"
)
S="${WORKDIR}/MuseScore-${PV}"
diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0.ebuild
index 4f547ddc3db..c5eb58ccd82 100644
--- a/media-sound/musescore/musescore-2.1.0.ebuild
+++ b/media-sound/musescore/musescore-2.1.0.ebuild
@@ -7,7 +7,8 @@ inherit cmake-utils
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="http://musescore.org/"
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -41,7 +42,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}/${PN}-2.1.0-fix-buildsystem.patch"
+ "${WORKDIR}/${PN}-2.1.0-fix-buildsystem.patch"
)
S="${WORKDIR}/MuseScore-${PV}"
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index a04d054d3d8..8fb50137744 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -8,6 +8,7 @@ inherit cmake-utils git-r3
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="https://musescore.org/"
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -40,7 +41,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}/${P}-fix-buildsystem.patch"
+ "${WORKDIR}/${P}-fix-buildsystem.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2018-08-17 22:04 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-08-17 22:04 UTC (permalink / raw
To: gentoo-commits
commit: e6afd0247a9d58619db12cc83225c6c58337ead9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 17 21:24:14 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 22:02:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6afd024
media-sound/musescore: Fix build with Qt 5.11
Closes: https://bugs.gentoo.org/661784
Package-Manager: Portage-2.3.46, Repoman-2.3.10
.../musescore/files/musescore-2.1.0-qt-5.11.patch | 21 +++++++++++++++++++++
media-sound/musescore/musescore-2.1.0.ebuild | 5 ++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
new file mode 100644
index 00000000000..09932062de5
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
@@ -0,0 +1,21 @@
+From 9c8a8ffe0cbb00ee93a10fe245da01a4d32ca086 Mon Sep 17 00:00:00 2001
+From: Orcan Ogetbil <orcan@localhost.localdomain>
+Date: Thu, 31 May 2018 21:04:51 -0400
+Subject: [PATCH] added missing #include <QButtonGroup> required by qt >= 5.11
+
+---
+ all.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/all.h b/all.h
+index 72db72b0ec..2ee0e8e807 100644
+--- a/all.h
++++ b/all.h
+@@ -131,6 +131,7 @@
+ #include <QProgressBar>
+ #include <QProgressDialog>
+ #include <QRadioButton>
++#include <QButtonGroup>
+ #include <QSplashScreen>
+ #include <QFontComboBox>
+ #include <QApplication>
\ No newline at end of file
diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0.ebuild
index c5eb58ccd82..71798fdc8e9 100644
--- a/media-sound/musescore/musescore-2.1.0.ebuild
+++ b/media-sound/musescore/musescore-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -41,9 +41,12 @@ DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
virtual/pkgconfig
"
+
PATCHES=(
"${WORKDIR}/${PN}-2.1.0-fix-buildsystem.patch"
+ "${FILESDIR}/${PN}-2.1.0-qt-5.11.patch"
)
+
S="${WORKDIR}/MuseScore-${PV}"
src_configure() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2018-08-21 21:23 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-08-21 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 7fd6d5b22d1099befcb184d625f3b5070611e9f4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 19:44:14 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 21:23:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fd6d5b2
media-sound/musescore: Switch to https, add newline at end of file
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch | 2 +-
media-sound/musescore/musescore-2.1.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
index 09932062de5..2fa6afd9395 100644
--- a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
+++ b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
@@ -18,4 +18,4 @@ index 72db72b0ec..2ee0e8e807 100644
+#include <QButtonGroup>
#include <QSplashScreen>
#include <QFontComboBox>
- #include <QApplication>
\ No newline at end of file
+ #include <QApplication>
diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0.ebuild
index 71798fdc8e9..4029abae0fb 100644
--- a/media-sound/musescore/musescore-2.1.0.ebuild
+++ b/media-sound/musescore/musescore-2.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit cmake-utils
DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="http://musescore.org/"
+HOMEPAGE="https://musescore.org/"
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2018-08-21 21:23 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-08-21 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 425bf47e3a1a50bca7ddda6f95b77d68cf2fb4d1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 20:09:18 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 21:23:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=425bf47e
media-sound/musescore: Set USE_SYSTEM_QTSINGLEAPPLICATION=ON
Bug: https://bugs.gentoo.org/489144
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../musescore-2.1.0-qtsingleapplication.patch | 28 ++++++++++++++++++++++
...score-9999.ebuild => musescore-2.1.0-r1.ebuild} | 27 +++++++++++----------
media-sound/musescore/musescore-9999.ebuild | 12 ++++++----
3 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
new file mode 100644
index 00000000000..1e362dd3298
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
@@ -0,0 +1,28 @@
+From 4c28258db05dd6d33bbcd037a05a7fbbb66f67ab Mon Sep 17 00:00:00 2001
+From: Joachim Schmitz <jojo@schmitz-digital.de>
+Date: Wed, 8 Aug 2018 09:16:54 +0200
+Subject: [PATCH] Fix #52106: fails to compile with
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3a30c03d63..be6a50578a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -537,8 +537,13 @@ endif(APPLE)
+ ##
+
+ if (USE_SYSTEM_QTSINGLEAPPLICATION)
++ if (USE_PATH_WITH_EXPLICIT_QT_VERSION)
++ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions)
++ find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6)
++ else (USE_PATH_WITH_EXPLICIT_QT_VERSION)
+ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
+ find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
++ endif (USE_PATH_WITH_EXPLICIT_QT_VERSION)
+ else(USE_SYSTEM_QTSINGLEAPPLICATION)
+ subdirs (thirdparty/singleapp)
+ set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/singleapp/src)
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild
similarity index 71%
copy from media-sound/musescore/musescore-9999.ebuild
copy to media-sound/musescore/musescore-2.1.0-r1.ebuild
index 09988cf9c63..5ba187f5315 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-2.1.0-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit cmake-utils git-r3
+inherit cmake-utils
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="https://musescore.org/"
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio"
REQUIRED_USE="portmidi? ( portaudio )"
@@ -24,34 +24,37 @@ RDEPEND="
dev-qt/qtgui:5
dev-qt/qthelp:5
dev-qt/qtprintsupport:5
+ >=dev-qt/qtsingleapplication-2.6.1_p20171024
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtxmlpatterns:5
>=media-libs/freetype-2.5.2
media-libs/libsndfile
- sys-libs/zlib
+ sys-libs/zlib:=
alsa? ( >=media-libs/alsa-lib-1.0.0 )
jack? ( virtual/jack )
mp3? ( media-sound/lame )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
- "
+"
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
virtual/pkgconfig
- "
+"
+
PATCHES=(
"${WORKDIR}/${P}-fix-buildsystem.patch"
+ "${FILESDIR}/${P}-qt-5.11.patch"
+ "${FILESDIR}/${P}-qtsingleapplication.patch"
)
-src_unpack() {
- git-r3_src_unpack
- default_src_unpack
-}
+S="${WORKDIR}/MuseScore-${PV}"
src_configure() {
local mycmakeargs=(
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+ -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-DBUILD_ALSA="$(usex alsa)"
-DBUILD_JACK="$(usex jack)"
-DBUILD_LAME="$(usex mp3)"
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 09988cf9c63..3272159f0c8 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,23 +24,25 @@ RDEPEND="
dev-qt/qtgui:5
dev-qt/qthelp:5
dev-qt/qtprintsupport:5
+ >=dev-qt/qtsingleapplication-2.6.1_p20171024
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtxmlpatterns:5
>=media-libs/freetype-2.5.2
media-libs/libsndfile
- sys-libs/zlib
+ sys-libs/zlib:=
alsa? ( >=media-libs/alsa-lib-1.0.0 )
jack? ( virtual/jack )
mp3? ( media-sound/lame )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
- "
+"
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
virtual/pkgconfig
- "
+"
+
PATCHES=(
"${WORKDIR}/${P}-fix-buildsystem.patch"
)
@@ -52,6 +54,8 @@ src_unpack() {
src_configure() {
local mycmakeargs=(
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+ -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-DBUILD_ALSA="$(usex alsa)"
-DBUILD_JACK="$(usex jack)"
-DBUILD_LAME="$(usex mp3)"
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2018-12-24 0:51 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2018-12-24 0:51 UTC (permalink / raw
To: gentoo-commits
commit: c06a62f24c1a4edffc64833984a41ce6596345bc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 00:50:05 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 00:50:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06a62f2
media-sound/musescore: Fix build with Qt 5.12
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../musescore/files/musescore-2.1.0-pch.patch | 2 +-
.../musescore/files/musescore-2.1.0-qt-5.12.patch | 48 ++++++++++++++++++++++
media-sound/musescore/musescore-2.1.0-r1.ebuild | 3 +-
3 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch b/media-sound/musescore/files/musescore-2.1.0-pch.patch
index d69d1cd2f65..6cce1bd81cf 100644
--- a/media-sound/musescore/files/musescore-2.1.0-pch.patch
+++ b/media-sound/musescore/files/musescore-2.1.0-pch.patch
@@ -28,4 +28,4 @@ index 66b0ddfce8..7fdfffcc9b 100644
+ COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
-
\ No newline at end of file
+
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
new file mode 100644
index 00000000000..9d9a1cca7ef
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
@@ -0,0 +1,48 @@
+From ff014657939f30c0052a1d2d66d87d13833c5255 Mon Sep 17 00:00:00 2001
+From: Joachim Schmitz <jojo@schmitz-digital.de>
+Date: Tue, 18 Sep 2018 14:42:43 +0200
+Subject: [PATCH] changes needed for MuseScore to build with Qt 5.12 (Alpha)
+
+One needed for MSVC only (and only since Alpha, not with the previous
+preview), the other needed for MSVC and MinGW.
+Neither seems to cause issues with Qt 5.9 (like AppVeyor and Travis CI
+prove)
+---
+ mscore/editstringdata.cpp | 4 ++--
+ mscore/prefsdialog.ui | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/mscore/editstringdata.cpp b/mscore/editstringdata.cpp
+index 21a621bac0..a86207e5db 100644
+--- a/mscore/editstringdata.cpp
++++ b/mscore/editstringdata.cpp
+@@ -52,7 +52,7 @@ EditStringData::EditStringData(QWidget *parent, QList<instrString> * strings, in
+ strg = (*_strings)[numOfStrings - i - 1];
+ _stringsLoc.append(strg);
+ QTableWidgetItem *newCheck = new QTableWidgetItem();
+- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
++ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+ newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
+ stringList->setItem(i, 0, newCheck);
+ QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
+@@ -168,7 +168,7 @@ void EditStringData::newStringClicked()
+ _stringsLoc.insert(i, strg);
+ stringList->insertRow(i);
+ QTableWidgetItem *newCheck = new QTableWidgetItem();
+- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
++ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+ newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
+ stringList->setItem(i, 0, newCheck);
+ QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
+diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui
+index 5dd493fdc7..21af750846 100644
+--- a/mscore/prefsdialog.ui
++++ b/mscore/prefsdialog.ui
+@@ -4276,7 +4276,6 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore's inter
+ </item>
+ </layout>
+ </widget>
+- <pixmapfunction>getPixmap</pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>Awl::ColorLabel</class>
diff --git a/media-sound/musescore/musescore-2.1.0-r1.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild
index 56805b5d007..d2c6bf1f093 100644
--- a/media-sound/musescore/musescore-2.1.0-r1.ebuild
+++ b/media-sound/musescore/musescore-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}/${P}-qt-5.11.patch"
"${FILESDIR}/${P}-qtsingleapplication.patch"
"${FILESDIR}/${P}-pch.patch"
+ "${FILESDIR}/${P}-qt-5.12.patch"
)
S="${WORKDIR}/MuseScore-${PV}"
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2019-02-01 19:50 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2019-02-01 19:50 UTC (permalink / raw
To: gentoo-commits
commit: 3bb529b5f53a6797bdb5276f971243376ffff03c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 1 19:47:21 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 1 19:50:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb529b5
media-sound/musescore-3.0.1: bump
Author: Gergely Nagy
Auhtor: Miroslav Šulc <fordfrog <AT> gentoo.org>
Closes: https://bugs.gentoo.org/665206
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 1 +
.../musescore/files/musescore-3.0.1-porttime.patch | 13 +++
media-sound/musescore/musescore-3.0.1.ebuild | 96 ++++++++++++++++++++++
3 files changed, 110 insertions(+)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index e8a7c31de1d..e3aa6440e5a 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,4 @@
DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
+DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89
diff --git a/media-sound/musescore/files/musescore-3.0.1-porttime.patch b/media-sound/musescore/files/musescore-3.0.1-porttime.patch
new file mode 100644
index 00000000000..b9bddf1d9d9
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.0.1-porttime.patch
@@ -0,0 +1,13 @@
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+index fcf9332..59db47a 100644
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -715,7 +715,7 @@ else (MINGW)
+ if (APPLE)
+ set(PORTMIDI_LIB portmidi)
+ else (APPLE)
+- set(PORTMIDI_LIB -lportmidi -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
++ set(PORTMIDI_LIB -lportmidi) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
+ endif (APPLE)
+ target_link_libraries(mscore ${PORTMIDI_LIB})
+ endif (USE_PORTMIDI)
diff --git a/media-sound/musescore/musescore-3.0.1.ebuild b/media-sound/musescore/musescore-3.0.1.ebuild
new file mode 100644
index 00000000000..bbb6c5744c7
--- /dev/null
+++ b/media-sound/musescore/musescore-3.0.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+RDEPEND="
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ >=dev-qt/qtsingleapplication-2.6.1_p20171024
+ dev-qt/qtsvg:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5
+ >=media-libs/freetype-2.5.2
+ media-libs/libsndfile
+ sys-libs/zlib:=
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ jack? ( virtual/jack )
+ mp3? ( media-sound/lame )
+ portaudio? ( media-libs/portaudio )
+ portmidi? ( media-libs/portmidi )
+ pulseaudio? ( media-sound/pulseaudio )
+ vorbis? ( media-libs/libvorbis )
+ webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-porttime.patch"
+)
+
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+ -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+ -DUSE_SYSTEM_FREETYPE=ON
+ -DBUILD_ALSA="$(usex alsa)"
+ -DBUILD_JACK="$(usex jack)"
+ -DBUILD_LAME="$(usex mp3)"
+ -DBUILD_PORTAUDIO="$(usex portaudio)"
+ -DBUILD_PORTMIDI="$(usex portmidi)"
+ -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+ -DSOUNDFONT3="$(usex vorbis)"
+ -DBUILD_WEBENGINE="$(usex webengine)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cd "${BUILD_DIR}" || die
+ cmake-utils_src_make -j1 lrelease manpages
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Fix man page symlink
+ rm "${D}"/usr/share/man/man1/musescore.1.gz || die "Failed to remove man broken symlink"
+ dosym ${PN}.1.bz2 /usr/share/man/man1/mscore.1.bz2 || die "Failed to create man symlink"
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2019-04-28 23:45 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-04-28 23:45 UTC (permalink / raw
To: gentoo-commits
commit: 9ff9ffa0c86ac6ab87dfadf08ed49a57fdeafd79
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 23:38:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 23:45:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff9ffa0
media-sound/musescore: Drop 2.1.0-r1
Closes: https://bugs.gentoo.org/630372
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/musescore/Manifest | 2 -
.../musescore/files/musescore-2.1.0-pch.patch | 31 --------
.../musescore/files/musescore-2.1.0-qt-5.11.patch | 21 -----
.../musescore/files/musescore-2.1.0-qt-5.12.patch | 48 ------------
.../musescore-2.1.0-qtsingleapplication.patch | 28 -------
media-sound/musescore/musescore-2.1.0-r1.ebuild | 89 ----------------------
6 files changed, 219 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index e0820b82051..0c4c655eec0 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,2 @@
DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5 SHA512 91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
-DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
-DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch b/media-sound/musescore/files/musescore-2.1.0-pch.patch
deleted file mode 100644
index 6cce1bd81cf..00000000000
--- a/media-sound/musescore/files/musescore-2.1.0-pch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5e8024c683891be677075d74cedfbf424e36bc31 Mon Sep 17 00:00:00 2001
-From: mirabilos <tg@debian.org>
-Date: Sun, 4 Mar 2018 16:38:21 +0100
-Subject: [PATCH] Fix numerous reports of missing all.h during compilation
-
-When disabling PCH, the all.h copying code is no longer run before
-AUTOMOC=caused *_autogen targets, so we must run it earlier.
-
-From Debian
----
- CMakeLists.txt | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 66b0ddfce8..7fdfffcc9b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -553,11 +553,8 @@ endif (NOT MINGW AND NOT APPLE)
- #
-
- # all.h is expected in PROJECT_BINARY_DIR by subdirs
--add_custom_command(
-- OUTPUT ${PROJECT_BINARY_DIR}/all.h
-- COMMAND ${CMAKE_COMMAND}
-- ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
-- DEPENDS ${PROJECT_SOURCE_DIR}/all.h
-+execute_process(
-+ COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
-
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
deleted file mode 100644
index 2fa6afd9395..00000000000
--- a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9c8a8ffe0cbb00ee93a10fe245da01a4d32ca086 Mon Sep 17 00:00:00 2001
-From: Orcan Ogetbil <orcan@localhost.localdomain>
-Date: Thu, 31 May 2018 21:04:51 -0400
-Subject: [PATCH] added missing #include <QButtonGroup> required by qt >= 5.11
-
----
- all.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/all.h b/all.h
-index 72db72b0ec..2ee0e8e807 100644
---- a/all.h
-+++ b/all.h
-@@ -131,6 +131,7 @@
- #include <QProgressBar>
- #include <QProgressDialog>
- #include <QRadioButton>
-+#include <QButtonGroup>
- #include <QSplashScreen>
- #include <QFontComboBox>
- #include <QApplication>
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
deleted file mode 100644
index 9d9a1cca7ef..00000000000
--- a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ff014657939f30c0052a1d2d66d87d13833c5255 Mon Sep 17 00:00:00 2001
-From: Joachim Schmitz <jojo@schmitz-digital.de>
-Date: Tue, 18 Sep 2018 14:42:43 +0200
-Subject: [PATCH] changes needed for MuseScore to build with Qt 5.12 (Alpha)
-
-One needed for MSVC only (and only since Alpha, not with the previous
-preview), the other needed for MSVC and MinGW.
-Neither seems to cause issues with Qt 5.9 (like AppVeyor and Travis CI
-prove)
----
- mscore/editstringdata.cpp | 4 ++--
- mscore/prefsdialog.ui | 1 -
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/mscore/editstringdata.cpp b/mscore/editstringdata.cpp
-index 21a621bac0..a86207e5db 100644
---- a/mscore/editstringdata.cpp
-+++ b/mscore/editstringdata.cpp
-@@ -52,7 +52,7 @@ EditStringData::EditStringData(QWidget *parent, QList<instrString> * strings, in
- strg = (*_strings)[numOfStrings - i - 1];
- _stringsLoc.append(strg);
- QTableWidgetItem *newCheck = new QTableWidgetItem();
-- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
-+ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
- newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
- stringList->setItem(i, 0, newCheck);
- QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
-@@ -168,7 +168,7 @@ void EditStringData::newStringClicked()
- _stringsLoc.insert(i, strg);
- stringList->insertRow(i);
- QTableWidgetItem *newCheck = new QTableWidgetItem();
-- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
-+ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
- newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
- stringList->setItem(i, 0, newCheck);
- QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
-diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui
-index 5dd493fdc7..21af750846 100644
---- a/mscore/prefsdialog.ui
-+++ b/mscore/prefsdialog.ui
-@@ -4276,7 +4276,6 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore's inter
- </item>
- </layout>
- </widget>
-- <pixmapfunction>getPixmap</pixmapfunction>
- <customwidgets>
- <customwidget>
- <class>Awl::ColorLabel</class>
diff --git a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
deleted file mode 100644
index 1e362dd3298..00000000000
--- a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4c28258db05dd6d33bbcd037a05a7fbbb66f67ab Mon Sep 17 00:00:00 2001
-From: Joachim Schmitz <jojo@schmitz-digital.de>
-Date: Wed, 8 Aug 2018 09:16:54 +0200
-Subject: [PATCH] Fix #52106: fails to compile with
- -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3a30c03d63..be6a50578a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -537,8 +537,13 @@ endif(APPLE)
- ##
-
- if (USE_SYSTEM_QTSINGLEAPPLICATION)
-+ if (USE_PATH_WITH_EXPLICIT_QT_VERSION)
-+ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions)
-+ find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6)
-+ else (USE_PATH_WITH_EXPLICIT_QT_VERSION)
- find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
- find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
-+ endif (USE_PATH_WITH_EXPLICIT_QT_VERSION)
- else(USE_SYSTEM_QTSINGLEAPPLICATION)
- subdirs (thirdparty/singleapp)
- set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/singleapp/src)
diff --git a/media-sound/musescore/musescore-2.1.0-r1.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild
deleted file mode 100644
index d2c6bf1f093..00000000000
--- a/media-sound/musescore/musescore-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-RDEPEND="
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- >=dev-qt/qtsingleapplication-2.6.1_p20171024
- dev-qt/qtsvg:5
- dev-qt/qtwebkit:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- >=media-libs/freetype-2.5.2
- media-libs/libsndfile
- media-sound/lame
- sys-libs/zlib:=
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- jack? ( virtual/jack )
- portaudio? ( media-libs/portaudio )
- portmidi? ( media-libs/portmidi )
- pulseaudio? ( media-sound/pulseaudio )
- vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${WORKDIR}/${P}-fix-buildsystem.patch"
- "${FILESDIR}/${P}-qt-5.11.patch"
- "${FILESDIR}/${P}-qtsingleapplication.patch"
- "${FILESDIR}/${P}-pch.patch"
- "${FILESDIR}/${P}-qt-5.12.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
- -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
- -DUSE_SYSTEM_FREETYPE=ON
- -DBUILD_ALSA="$(usex alsa)"
- -DBUILD_JACK="$(usex jack)"
- -DBUILD_LAME=ON
- -DBUILD_PORTAUDIO="$(usex portaudio)"
- -DBUILD_PORTMIDI="$(usex portmidi)"
- -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
- -DSOUNDFONT3="$(usex vorbis)"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cd "${BUILD_DIR}" || die
- cmake-utils_src_make -j1 lrelease manpages
- cmake-utils_src_compile
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2020-01-04 14:58 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2020-01-04 14:58 UTC (permalink / raw
To: gentoo-commits
commit: cbcd81d0463012d030b33ed6adc50ec87e5f0c03
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 14:58:14 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 14:58:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbcd81d0
media-sound/musescore: fixed compilation against qt 5.14
Closes: https://bugs.gentoo.org/703706
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/files/5583.patch | 212 +++++++++++++++++++++++++++
media-sound/musescore/musescore-3.3.3.ebuild | 3 +-
media-sound/musescore/musescore-3.3.4.ebuild | 3 +-
media-sound/musescore/musescore-9999.ebuild | 3 +-
4 files changed, 218 insertions(+), 3 deletions(-)
diff --git a/media-sound/musescore/files/5583.patch b/media-sound/musescore/files/5583.patch
new file mode 100644
index 00000000000..da4d0c52d04
--- /dev/null
+++ b/media-sound/musescore/files/5583.patch
@@ -0,0 +1,212 @@
+From 09d138946aad53962ce23298093747f0ce52304f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
+Date: Tue, 31 Dec 2019 17:39:34 +0100
+Subject: [PATCH 1/2] Specializes template routines.
+
+Qt 5.14 introduces serialisation/deserialisation for enum classes,
+this results in ambiguous templates between qdatastream.h and preferences.h.
+we specialize everything to workaround this.
+---
+ mscore/preferences.h | 41 ++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 36 insertions(+), 5 deletions(-)
+
+diff --git a/mscore/preferences.h b/mscore/preferences.h
+index bef3df8536..8c3ac9b0ed 100644
+--- a/mscore/preferences.h
++++ b/mscore/preferences.h
+@@ -233,21 +233,52 @@ extern Preferences preferences;
+
+ // Stream operators for enum classes
+ // enum classes don't play well with QSettings without custom serialization
+-template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
+-inline QDataStream &operator<<(QDataStream &out, const T &val)
++inline QDataStream&
++operator<<(QDataStream &out, const Ms::MuseScoreStyleType &val)
+ {
+ return out << static_cast<int>(val);
+ }
+
+-template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
+-inline QDataStream &operator>>(QDataStream &in, T &val)
++inline QDataStream&
++operator>>(QDataStream &in, Ms::MuseScoreStyleType &val)
+ {
+ int tmp;
+ in >> tmp;
+- val = static_cast<T>(tmp);
++ val = static_cast<Ms::MuseScoreStyleType>(tmp);
+ return in;
+ }
+
++inline QDataStream&
++operator<<(QDataStream &out, const Ms::SessionStart &val)
++{
++ return out << static_cast<int>(val);
++}
++
++inline QDataStream&
++operator>>(QDataStream &in, Ms::SessionStart &val)
++{
++ int tmp;
++ in >> tmp;
++ val = static_cast<Ms::SessionStart>(tmp);
++ return in;
++}
++
++inline QDataStream&
++operator<<(QDataStream &out, const Ms::MusicxmlExportBreaks &val)
++{
++ return out << static_cast<int>(val);
++}
++
++inline QDataStream&
++operator>>(QDataStream &in, Ms::MusicxmlExportBreaks &val)
++{
++ int tmp;
++ in >> tmp;
++ val = static_cast<Ms::MusicxmlExportBreaks>(tmp);
++ return in;
++}
++
++
+ class PreferenceVisitor {
+ public:
+ virtual void visit(QString key, IntPreference*) = 0;
+
+From 6b759bb5ee7b83fd8a82429e4cdb74279c5d33b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
+Date: Tue, 31 Dec 2019 17:42:04 +0100
+Subject: [PATCH 2/2] fix warnings: replace QString::null, with QString()
+
+---
+ mscore/capella.cpp | 2 +-
+ mscore/importmidi/importmidi.cpp | 2 +-
+ mscore/instrdialog.cpp | 2 +-
+ mscore/musescore.cpp | 12 ++++++------
+ mscore/musescore.h | 2 +-
+ mscore/network/loginmanager.cpp | 2 +-
+ 6 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/mscore/capella.cpp b/mscore/capella.cpp
+index 7144414e32..6243c8cca6 100644
+--- a/mscore/capella.cpp
++++ b/mscore/capella.cpp
+@@ -2708,7 +2708,7 @@ Score::FileError importCapella(MasterScore* score, const QString& name)
+ QMessageBox::warning(0,
+ QWidget::tr("Import Capella"),
+ QWidget::tr("Load failed: %1").arg(cf.error(errNo)),
+- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
++ QString(), QWidget::tr("Quit"), QString(), 0, 1);
+ }
+ fp.close();
+ // avoid another error message box
+diff --git a/mscore/importmidi/importmidi.cpp b/mscore/importmidi/importmidi.cpp
+index a5d8894686..8091a83369 100644
+--- a/mscore/importmidi/importmidi.cpp
++++ b/mscore/importmidi/importmidi.cpp
+@@ -1200,7 +1200,7 @@ Score::FileError importMidi(MasterScore *score, const QString &name)
+ QMessageBox::warning(0,
+ QWidget::tr("Load MIDI"),
+ QWidget::tr("Load failed: %1").arg(errorText),
+- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
++ QString(), QWidget::tr("Quit"), QString(), 0, 1);
+ }
+ fp.close();
+ qDebug("importMidi: bad file format");
+diff --git a/mscore/instrdialog.cpp b/mscore/instrdialog.cpp
+index fa7bacd622..8d81fe9e20 100644
+--- a/mscore/instrdialog.cpp
++++ b/mscore/instrdialog.cpp
+@@ -138,7 +138,7 @@ void InstrumentsDialog::on_loadButton_clicked()
+ QMessageBox::warning(0,
+ QWidget::tr("Load Style Failed"),
+ QString(strerror(errno)),
+- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
++ QString(), QWidget::tr("Quit"), QString(), 0, 1);
+ return;
+ }
+ instrumentsWidget->buildTemplateList();
+diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
+index dd4a4b95ca..07cb596abe 100644
+--- a/mscore/musescore.cpp
++++ b/mscore/musescore.cpp
+@@ -4013,7 +4013,7 @@ bool MuseScore::readLanguages(const QString& path)
+ QMessageBox::warning(0,
+ QWidget::tr("Load Languages Failed:"),
+ error,
+- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
++ QString(), QWidget::tr("Quit"), QString(), 0, 1);
+ return false;
+ }
+
+@@ -6753,7 +6753,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
+ QMessageBox::warning(0,
+ tr("Encoding Error"),
+ tr("Unable to open target file for writing"),
+- QString::null, QString::null);
++ QString(), QString());
+ }
+ return false;
+ }
+@@ -6792,7 +6792,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
+ QMessageBox::warning(0,
+ tr("Error Opening LAME library"),
+ tr("Could not open MP3 encoding library!"),
+- QString::null, QString::null);
++ QString(), QString());
+ qDebug("Could not open MP3 encoding library!");
+ return false;
+ }
+@@ -6804,7 +6804,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
+ QMessageBox::warning(0,
+ tr("Error Opening LAME library"),
+ tr("Not a valid or supported MP3 encoding library!"),
+- QString::null, QString::null);
++ QString(), QString());
+ qDebug("Not a valid or supported MP3 encoding library!");
+ return false;
+ }
+@@ -6829,7 +6829,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
+ if (!MScore::noGui) {
+ QMessageBox::warning(0, tr("Encoding Error"),
+ tr("Unable to initialize MP3 stream"),
+- QString::null, QString::null);
++ QString(), QString());
+ }
+ qDebug("Unable to initialize MP3 stream");
+ MScore::sampleRate = oldSampleRate;
+@@ -6996,7 +6996,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
+ QMessageBox::warning(0,
+ tr("Encoding Error"),
+ tr("Error %1 returned from MP3 encoder").arg(bytes),
+- QString::null, QString::null);
++ QString(), QString());
+ break;
+ }
+ else
+diff --git a/mscore/musescore.h b/mscore/musescore.h
+index 434072a12f..d8089a345c 100644
+--- a/mscore/musescore.h
++++ b/mscore/musescore.h
+@@ -142,7 +142,7 @@ struct LanguageItem {
+ LanguageItem(const QString k, const QString n) {
+ key = k;
+ name = n;
+- handbook = QString::null;
++ handbook = QString();
+ }
+ LanguageItem(const QString k, const QString n, const QString h) {
+ key = k;
+diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
+index 7bcfd892e0..4abf7e3e4e 100644
+--- a/mscore/network/loginmanager.cpp
++++ b/mscore/network/loginmanager.cpp
+@@ -680,7 +680,7 @@ void LoginManager::mediaUploadFinished()
+ QMessageBox::warning(0,
+ tr("Upload Error"),
+ tr("Sorry, MuseScore couldn't upload the audio file. Error %1").arg(e),
+- QString::null, QString::null);
++ QString(), QString());
+ }
+ }
+
diff --git a/media-sound/musescore/musescore-3.3.3.ebuild b/media-sound/musescore/musescore-3.3.3.ebuild
index cd4bca0639e..e0e03cdcb56 100644
--- a/media-sound/musescore/musescore-3.3.3.ebuild
+++ b/media-sound/musescore/musescore-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -54,6 +54,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+ "${FILESDIR}/5583.patch"
)
S="${WORKDIR}/MuseScore-${PV}"
diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
index cd4bca0639e..e0e03cdcb56 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -54,6 +54,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+ "${FILESDIR}/5583.patch"
)
S="${WORKDIR}/MuseScore-${PV}"
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 6b06e3b852c..cbaf17ea641 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -54,6 +54,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+ "${FILESDIR}/5583.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2020-03-04 16:19 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2020-03-04 16:19 UTC (permalink / raw
To: gentoo-commits
commit: a3ef499d0a877a3932a1ff7cc2a720b381c0492c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 4 16:19:17 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar 4 16:19:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ef499d
media-sound/musescore: removed obsolete 3.3.4
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 1 -
media-sound/musescore/files/5583.patch | 212 ---------------------------
media-sound/musescore/musescore-3.3.4.ebuild | 92 ------------
3 files changed, 305 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 3b2ea273841..98b47a3123e 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
-DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178 SHA512 4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861
DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
diff --git a/media-sound/musescore/files/5583.patch b/media-sound/musescore/files/5583.patch
deleted file mode 100644
index da4d0c52d04..00000000000
--- a/media-sound/musescore/files/5583.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 09d138946aad53962ce23298093747f0ce52304f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
-Date: Tue, 31 Dec 2019 17:39:34 +0100
-Subject: [PATCH 1/2] Specializes template routines.
-
-Qt 5.14 introduces serialisation/deserialisation for enum classes,
-this results in ambiguous templates between qdatastream.h and preferences.h.
-we specialize everything to workaround this.
----
- mscore/preferences.h | 41 ++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 36 insertions(+), 5 deletions(-)
-
-diff --git a/mscore/preferences.h b/mscore/preferences.h
-index bef3df8536..8c3ac9b0ed 100644
---- a/mscore/preferences.h
-+++ b/mscore/preferences.h
-@@ -233,21 +233,52 @@ extern Preferences preferences;
-
- // Stream operators for enum classes
- // enum classes don't play well with QSettings without custom serialization
--template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
--inline QDataStream &operator<<(QDataStream &out, const T &val)
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::MuseScoreStyleType &val)
- {
- return out << static_cast<int>(val);
- }
-
--template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
--inline QDataStream &operator>>(QDataStream &in, T &val)
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::MuseScoreStyleType &val)
- {
- int tmp;
- in >> tmp;
-- val = static_cast<T>(tmp);
-+ val = static_cast<Ms::MuseScoreStyleType>(tmp);
- return in;
- }
-
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::SessionStart &val)
-+{
-+ return out << static_cast<int>(val);
-+}
-+
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::SessionStart &val)
-+{
-+ int tmp;
-+ in >> tmp;
-+ val = static_cast<Ms::SessionStart>(tmp);
-+ return in;
-+}
-+
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::MusicxmlExportBreaks &val)
-+{
-+ return out << static_cast<int>(val);
-+}
-+
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::MusicxmlExportBreaks &val)
-+{
-+ int tmp;
-+ in >> tmp;
-+ val = static_cast<Ms::MusicxmlExportBreaks>(tmp);
-+ return in;
-+}
-+
-+
- class PreferenceVisitor {
- public:
- virtual void visit(QString key, IntPreference*) = 0;
-
-From 6b759bb5ee7b83fd8a82429e4cdb74279c5d33b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
-Date: Tue, 31 Dec 2019 17:42:04 +0100
-Subject: [PATCH 2/2] fix warnings: replace QString::null, with QString()
-
----
- mscore/capella.cpp | 2 +-
- mscore/importmidi/importmidi.cpp | 2 +-
- mscore/instrdialog.cpp | 2 +-
- mscore/musescore.cpp | 12 ++++++------
- mscore/musescore.h | 2 +-
- mscore/network/loginmanager.cpp | 2 +-
- 6 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/mscore/capella.cpp b/mscore/capella.cpp
-index 7144414e32..6243c8cca6 100644
---- a/mscore/capella.cpp
-+++ b/mscore/capella.cpp
-@@ -2708,7 +2708,7 @@ Score::FileError importCapella(MasterScore* score, const QString& name)
- QMessageBox::warning(0,
- QWidget::tr("Import Capella"),
- QWidget::tr("Load failed: %1").arg(cf.error(errNo)),
-- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+ QString(), QWidget::tr("Quit"), QString(), 0, 1);
- }
- fp.close();
- // avoid another error message box
-diff --git a/mscore/importmidi/importmidi.cpp b/mscore/importmidi/importmidi.cpp
-index a5d8894686..8091a83369 100644
---- a/mscore/importmidi/importmidi.cpp
-+++ b/mscore/importmidi/importmidi.cpp
-@@ -1200,7 +1200,7 @@ Score::FileError importMidi(MasterScore *score, const QString &name)
- QMessageBox::warning(0,
- QWidget::tr("Load MIDI"),
- QWidget::tr("Load failed: %1").arg(errorText),
-- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+ QString(), QWidget::tr("Quit"), QString(), 0, 1);
- }
- fp.close();
- qDebug("importMidi: bad file format");
-diff --git a/mscore/instrdialog.cpp b/mscore/instrdialog.cpp
-index fa7bacd622..8d81fe9e20 100644
---- a/mscore/instrdialog.cpp
-+++ b/mscore/instrdialog.cpp
-@@ -138,7 +138,7 @@ void InstrumentsDialog::on_loadButton_clicked()
- QMessageBox::warning(0,
- QWidget::tr("Load Style Failed"),
- QString(strerror(errno)),
-- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+ QString(), QWidget::tr("Quit"), QString(), 0, 1);
- return;
- }
- instrumentsWidget->buildTemplateList();
-diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
-index dd4a4b95ca..07cb596abe 100644
---- a/mscore/musescore.cpp
-+++ b/mscore/musescore.cpp
-@@ -4013,7 +4013,7 @@ bool MuseScore::readLanguages(const QString& path)
- QMessageBox::warning(0,
- QWidget::tr("Load Languages Failed:"),
- error,
-- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+ QString(), QWidget::tr("Quit"), QString(), 0, 1);
- return false;
- }
-
-@@ -6753,7 +6753,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
- QMessageBox::warning(0,
- tr("Encoding Error"),
- tr("Unable to open target file for writing"),
-- QString::null, QString::null);
-+ QString(), QString());
- }
- return false;
- }
-@@ -6792,7 +6792,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
- QMessageBox::warning(0,
- tr("Error Opening LAME library"),
- tr("Could not open MP3 encoding library!"),
-- QString::null, QString::null);
-+ QString(), QString());
- qDebug("Could not open MP3 encoding library!");
- return false;
- }
-@@ -6804,7 +6804,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
- QMessageBox::warning(0,
- tr("Error Opening LAME library"),
- tr("Not a valid or supported MP3 encoding library!"),
-- QString::null, QString::null);
-+ QString(), QString());
- qDebug("Not a valid or supported MP3 encoding library!");
- return false;
- }
-@@ -6829,7 +6829,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
- if (!MScore::noGui) {
- QMessageBox::warning(0, tr("Encoding Error"),
- tr("Unable to initialize MP3 stream"),
-- QString::null, QString::null);
-+ QString(), QString());
- }
- qDebug("Unable to initialize MP3 stream");
- MScore::sampleRate = oldSampleRate;
-@@ -6996,7 +6996,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
- QMessageBox::warning(0,
- tr("Encoding Error"),
- tr("Error %1 returned from MP3 encoder").arg(bytes),
-- QString::null, QString::null);
-+ QString(), QString());
- break;
- }
- else
-diff --git a/mscore/musescore.h b/mscore/musescore.h
-index 434072a12f..d8089a345c 100644
---- a/mscore/musescore.h
-+++ b/mscore/musescore.h
-@@ -142,7 +142,7 @@ struct LanguageItem {
- LanguageItem(const QString k, const QString n) {
- key = k;
- name = n;
-- handbook = QString::null;
-+ handbook = QString();
- }
- LanguageItem(const QString k, const QString n, const QString h) {
- key = k;
-diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
-index 7bcfd892e0..4abf7e3e4e 100644
---- a/mscore/network/loginmanager.cpp
-+++ b/mscore/network/loginmanager.cpp
-@@ -680,7 +680,7 @@ void LoginManager::mediaUploadFinished()
- QMessageBox::warning(0,
- tr("Upload Error"),
- tr("Sorry, MuseScore couldn't upload the audio file. Error %1").arg(e),
-- QString::null, QString::null);
-+ QString(), QString());
- }
- }
-
diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
deleted file mode 100644
index ae841455ad3..00000000000
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-DEPEND="
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtquickcontrols2:5
- >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
- dev-qt/qtsvg:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- >=media-libs/freetype-2.5.2
- media-libs/libsndfile
- sys-libs/zlib:=
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- jack? ( virtual/jack )
- mp3? ( media-sound/lame )
- portaudio? ( media-libs/portaudio )
- portmidi? ( media-libs/portmidi )
- pulseaudio? ( media-sound/pulseaudio )
- sf3? ( media-libs/libvorbis )
- webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
- "${FILESDIR}/5583.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
- cmake_src_prepare
-
- # Move soundfonts to the correct directory
- mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=ON
- -DDOWNLOAD_SOUNDFONT=OFF
- -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
- -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
- -DUSE_SYSTEM_FREETYPE=ON
- -DBUILD_ALSA="$(usex alsa)"
- -DBUILD_JACK="$(usex jack)"
- -DBUILD_LAME="$(usex mp3)"
- -DBUILD_PORTAUDIO="$(usex portaudio)"
- -DBUILD_PORTMIDI="$(usex portmidi)"
- -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
- -DSOUNDFONT3="$(usex sf3)"
- -DBUILD_WEBENGINE="$(usex webengine)"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cd "${BUILD_DIR}" || die
- cmake_build -j1 lrelease manpages
- cmake_src_compile
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2020-04-02 12:59 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2020-04-02 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 5c1b9f407d0ac6513c4215dd8ab43e041b5f4069
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 2 12:59:15 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 2 12:59:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1b9f40
media-sound/musescore: fixed compilation for 9999
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/musescore-9999-lambda-capture-this.patch | 13 +++++++++++++
media-sound/musescore/musescore-9999.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch b/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
new file mode 100644
index 00000000000..c0bb7083324
--- /dev/null
+++ b/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
@@ -0,0 +1,13 @@
+diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
+index 9804e1f32..83e0c0e47 100644
+--- a/mscore/scoreview.cpp
++++ b/mscore/scoreview.cpp
+@@ -2405,7 +2405,7 @@ void ScoreView::cmd(const char* s)
+ cv->updateGrips();
+ }},
+ #ifdef OMR
+- {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
++ {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
+ if (cv->score()->masterScore()->omr())
+ showOmr(!_score->masterScore()->showOmr());
+ }},
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 89e66d393cf..d6ea4938d86 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -55,6 +55,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+ "${FILESDIR}/${P}-lambda-capture-this.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2020-08-06 13:28 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2020-08-06 13:28 UTC (permalink / raw
To: gentoo-commits
commit: fee3a7887e5b7abbb31782464d8793e2594573b8
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 6 13:24:38 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 6 13:28:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee3a788
media-sound/musescore: bump to 3.5 + updated 9999
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 2 ++
.../files/musescore-3.5-lambda-capture-this.patch | 13 ++++++++++++
...usescore-3.5-remove-duplicite-declaration.patch | 12 +++++++++++
...{musescore-9999.ebuild => musescore-3.5.ebuild} | 24 ++++++++++++++++------
media-sound/musescore/musescore-9999.ebuild | 23 +++++++++++++++------
5 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index b3547c30c63..558cc4a8edc 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,4 @@
DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
+DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
+DIST musescore-3.5.tar.gz 66798006 BLAKE2B dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907 SHA512 db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96
diff --git a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
new file mode 100644
index 00000000000..283ffdc92e2
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
@@ -0,0 +1,13 @@
+diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
+index 94b1aef..6a7b4e8 100644
+--- a/mscore/scoreview.cpp
++++ b/mscore/scoreview.cpp
+@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s)
+ cv->updateGrips();
+ }},
+ #ifdef OMR
+- {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
++ {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
+ if (cv->score()->masterScore()->omr())
+ showOmr(!_score->masterScore()->showOmr());
+ }},
diff --git a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
new file mode 100644
index 00000000000..b4e1ad0baf5
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
@@ -0,0 +1,12 @@
+diff --git a/omr/pattern.h b/omr/pattern.h
+index b040497..1b8e0c4 100644
+--- a/omr/pattern.h
++++ b/omr/pattern.h
+@@ -24,7 +24,6 @@
+
+ namespace Ms {
+
+-enum class SymId;
+ class Sym;
+
+ //---------------------------------------------------------
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-3.5.ebuild
similarity index 80%
copy from media-sound/musescore/musescore-9999.ebuild
copy to media-sound/musescore/musescore-3.5.ebuild
index d6ea4938d86..d56a9bca792 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-3.5.ebuild
@@ -5,14 +5,21 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake xdg check-reqs
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+else
+ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/MuseScore-${PV}"
+fi
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="https://musescore.org/"
-# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -56,11 +63,16 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
"${FILESDIR}/${P}-lambda-capture-this.patch"
+ "${FILESDIR}/${P}-remove-duplicite-declaration.patch"
)
src_unpack() {
- git-r3_src_unpack
- unpack ${A}
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_src_unpack
+ unpack ${A}
+ else
+ default
+ fi
}
src_prepare() {
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index d6ea4938d86..51e4cf8aa99 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -5,14 +5,21 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake xdg check-reqs
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+else
+ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/MuseScore-${PV}"
+fi
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="https://musescore.org/"
-# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -59,8 +66,12 @@ PATCHES=(
)
src_unpack() {
- git-r3_src_unpack
- unpack ${A}
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_src_unpack
+ unpack ${A}
+ else
+ default
+ fi
}
src_prepare() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2020-10-17 9:07 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2020-10-17 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 8e1c8d3a4f3c790be8d7443c1f908b51e04605fe
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 09:06:42 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 09:07:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e1c8d3a
media-sound/musescore: removed duplicate patch
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../musescore/files/musescore-3.5.2-drop-redeclaration.patch | 12 ------------
media-sound/musescore/musescore-3.5.2.ebuild | 2 +-
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/media-sound/musescore/files/musescore-3.5.2-drop-redeclaration.patch b/media-sound/musescore/files/musescore-3.5.2-drop-redeclaration.patch
deleted file mode 100644
index b4e1ad0baf5..00000000000
--- a/media-sound/musescore/files/musescore-3.5.2-drop-redeclaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/omr/pattern.h b/omr/pattern.h
-index b040497..1b8e0c4 100644
---- a/omr/pattern.h
-+++ b/omr/pattern.h
-@@ -24,7 +24,6 @@
-
- namespace Ms {
-
--enum class SymId;
- class Sym;
-
- //---------------------------------------------------------
diff --git a/media-sound/musescore/musescore-3.5.2.ebuild b/media-sound/musescore/musescore-3.5.2.ebuild
index 0a71087360a..59c8b43c79b 100644
--- a/media-sound/musescore/musescore-3.5.2.ebuild
+++ b/media-sound/musescore/musescore-3.5.2.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
"${FILESDIR}/${PN}-3.5-lambda-capture-this.patch"
- "${FILESDIR}/${P}-drop-redeclaration.patch"
+ "${FILESDIR}/${PN}-3.5-remove-duplicite-declaration.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2021-02-28 11:47 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2021-02-28 11:47 UTC (permalink / raw
To: gentoo-commits
commit: 21c0d85046b22c455258b27c65c2d34537a13d87
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 11:46:45 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 11:47:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c0d850
media-sound/musescore: fixed compilation with -mp3
thanks to Ionen Wolkens <sudinave <AT> gmail.com> for the patch
Closes: https://bugs.gentoo.org/767760
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../musescore/files/musescore-3.6.1-rename-audioitem.patch | 12 ++++++++++++
media-sound/musescore/musescore-3.6.1.ebuild | 1 +
media-sound/musescore/musescore-3.6.2.ebuild | 1 +
3 files changed, 14 insertions(+)
diff --git a/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
new file mode 100644
index 00000000000..caf9ae67ec7
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
@@ -0,0 +1,12 @@
+Fix misnamed variable causing build failure with USE=-mp3
+https://bugs.gentoo.org/767760
+Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
+--- a/mscore/exportdialog.cpp
++++ b/mscore/exportdialog.cpp
+@@ -77,5 +77,5 @@
+ // Disable .mp3 option if unavailable
+ QStandardItem* mp3Item = fileTypeComboBoxModel->item(3);
+- mp3Item->setFlags(audioItem->flags() & ~Qt::ItemIsEnabled);
++ mp3Item->setFlags(mp3Item->flags() & ~Qt::ItemIsEnabled);
+ # endif
+ # ifndef HAS_AUDIOFILE
diff --git a/media-sound/musescore/musescore-3.6.1.ebuild b/media-sound/musescore/musescore-3.6.1.ebuild
index bb23b9e040e..9ef3d3c075b 100644
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ b/media-sound/musescore/musescore-3.6.1.ebuild
@@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+ "${FILESDIR}/${P}-rename-audioitem.patch"
)
src_unpack() {
diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild
index bb23b9e040e..d5a19eb9bdc 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+ "${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2023-01-09 12:03 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2023-01-09 12:03 UTC (permalink / raw
To: gentoo-commits
commit: c1ae317df122aeeed663423681fc75a55738752f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 12:02:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 12:03:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ae317d
media-sound/musescore: fix build for 9999
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/musescore-9999-missing-qt-includes.patch | 217 +++++++++++++++++++++
media-sound/musescore/musescore-9999.ebuild | 6 +-
2 files changed, 222 insertions(+), 1 deletion(-)
diff --git a/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch b/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch
new file mode 100644
index 000000000000..2cfa8f2b8fca
--- /dev/null
+++ b/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch
@@ -0,0 +1,217 @@
+https://github.com/musescore/MuseScore/pull/15775
+
+From 6f3168324d265b4df262c0c3a37bebdb056b6671 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 9 Jan 2023 11:55:35 +0000
+Subject: [PATCH] Add missing includes (mostly Qt)
+
+--- a/src/appshell/iapplicationactioncontroller.h
++++ b/src/appshell/iapplicationactioncontroller.h
+@@ -22,6 +22,9 @@
+ #ifndef MU_APPSHELL_IAPPLICATIONACTIONCONTROLLER_H
+ #define MU_APPSHELL_IAPPLICATIONACTIONCONTROLLER_H
+
++#include <QDragEnterEvent>
++#include <QDropEvent>
++#include <QDragMoveEvent>
+ #include <QEvent>
+
+ #include "modularity/imoduleexport.h"
+--- a/src/autobot/internal/api/interactiveapi.cpp
++++ b/src/autobot/internal/api/interactiveapi.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 "interactiveapi.h"
+
+ using namespace mu::api;
+--- a/src/autobot/internal/jsmoduleloader.cpp
++++ b/src/autobot/internal/jsmoduleloader.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 <QFileInfo>
++
+ #include "jsmoduleloader.h"
+
+ #include "scriptengine.h"
+--- a/src/framework/audio/internal/worker/playback.cpp
++++ b/src/framework/audio/internal/worker/playback.cpp
+@@ -19,6 +19,9 @@
+ * 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 <utility>
++
+ #include "playback.h"
+
+ #include "log.h"
+--- a/src/framework/global/thirdparty/deto_async/async/promise.h
++++ b/src/framework/global/thirdparty/deto_async/async/promise.h
+@@ -3,6 +3,9 @@
+
+ #include <memory>
+ #include <string>
++
++#include <QtCore/qcompilerdetection.h>
++
+ #include "internal/abstractinvoker.h"
+ #include "async.h"
+
+--- a/src/framework/ui/view/uitheme.h
++++ b/src/framework/ui/view/uitheme.h
+@@ -24,6 +24,7 @@
+ #define MU_UI_UITHEME_H
+
+ #include <QFont>
++#include <QPainter>
+ #include <QProxyStyle>
+
+ #include "modularity/ioc.h"
+--- a/src/importexport/bb/internal/bb.cpp
++++ b/src/importexport/bb/internal/bb.cpp
+@@ -20,6 +20,9 @@
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
++#include <QFile>
++#include <QFileInfo>
++
+ #include "bb.h"
+
+ #include "engravingerrors.h"
+--- a/src/importexport/imagesexport/internal/svggenerator.cpp
++++ b/src/importexport/imagesexport/internal/svggenerator.cpp
+@@ -22,6 +22,7 @@
+
+ #include <QTextStream>
+ #include <QBuffer>
++#include <QFile>
+ #include <QTextCodec>
+ #include <QPainterPath>
+ #include <QMimeType>
+--- a/src/importexport/midi/internal/midiimport/importmidi_model.h
++++ b/src/importexport/midi/internal/midiimport/importmidi_model.h
+@@ -26,6 +26,8 @@
+
+ #include <memory>
+
++#include <QAbstractTableModel>
++
+ namespace mu::iex::midi {
+ class TracksModel : public QAbstractTableModel
+ {
+--- a/src/importexport/midi/internal/midiimport/importmidi_operations.cpp
++++ b/src/importexport/midi/internal/midiimport/importmidi_operations.cpp
+@@ -21,6 +21,7 @@
+ */
+ #include "importmidi_operations.h"
+
++#include <QFile>
+ #include <QXmlStreamReader>
+
+ #include "log.h"
+--- a/src/importexport/musedata/internal/musedatareader.cpp
++++ b/src/importexport/musedata/internal/musedatareader.cpp
+@@ -19,6 +19,9 @@
+ * 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 <QFileInfo>
++
+ #include "musedatareader.h"
+
+ #include "musedata.h"
+--- a/src/multiinstances/internal/ipc/ipc.cpp
++++ b/src/multiinstances/internal/ipc/ipc.cpp
+@@ -21,6 +21,8 @@
+ */
+ #include "ipc.h"
+
++#include <QDataStream>
++
+ #include <QJsonDocument>
+ #include <QJsonObject>
+ #include <QJsonArray>
+--- a/src/notation/view/notationnavigator.h
++++ b/src/notation/view/notationnavigator.h
+@@ -23,6 +23,8 @@
+ #define MU_NOTATION_NOTATIONNAVIGATOR_H
+
+ #include <QObject>
++#include <QMouseEvent>
++#include <QPainter>
+ #include <QQuickPaintedItem>
+
+ #include "modularity/ioc.h"
+--- a/src/notation/view/notationviewinputcontroller.cpp
++++ b/src/notation/view/notationviewinputcontroller.cpp
+@@ -21,6 +21,7 @@
+ */
+ #include "notationviewinputcontroller.h"
+
++#include <QApplication>
+ #include <QMimeData>
+ #include <QQuickItem>
+ #include <QTimer>
+--- a/src/palette/view/widgets/palettewidget.cpp
++++ b/src/palette/view/widgets/palettewidget.cpp
+@@ -27,8 +27,10 @@
+ #include <QAccessible>
+ #include <QAccessibleEvent>
+ #include <QAction>
++#include <QApplication>
+ #include <QContextMenuEvent>
+ #include <QDrag>
++#include <QFileInfo>
+ #include <QMenu>
+ #include <QMimeData>
+ #include <QResizeEvent>
+--- a/src/project/internal/exportprojectscenario.cpp
++++ b/src/project/internal/exportprojectscenario.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 <QFile>
++
+ #include "exportprojectscenario.h"
+
+ #include "async/async.h"
+--- a/src/project/view/exportdialogmodel.cpp
++++ b/src/project/view/exportdialogmodel.cpp
+@@ -21,6 +21,7 @@
+ */
+ #include "exportdialogmodel.h"
+
++#include <QApplication>
+ #include <QItemSelectionModel>
+
+ #include "async/async.h"
+--- a/src/workspace/view/newworkspacemodel.h
++++ b/src/workspace/view/newworkspacemodel.h
+@@ -24,6 +24,7 @@
+ #define MU_WORKSPACE_NEWWORKSPACEMODEL_H
+
+ #include <QObject>
++#include <QVariant>
+
+ namespace mu::workspace {
+ class NewWorkspaceModel : public QObject
+--- a/thirdparty/beatroot/AgentList.h
++++ b/thirdparty/beatroot/AgentList.h
+@@ -18,6 +18,7 @@
+
+ #include "Event.h"
+
++#include <cstddef>
+ #include <vector>
+
+
+
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index d2e8794771d9..06685fa6b24a 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -62,6 +62,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-9999-missing-qt-includes.patch
+)
+
src_unpack() {
if [[ ${PV} == "9999" ]]; then
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2023-01-09 15:07 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2023-01-09 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 625de16ac98fd0b589e4fe77cd481d78dab48611
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 15:06:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 15:07:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625de16a
media-sound/musescore: drop upstreamed musescore-9999-missing-qt-includes.patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/musescore-9999-missing-qt-includes.patch | 216 ---------------------
media-sound/musescore/musescore-9999.ebuild | 4 -
2 files changed, 220 deletions(-)
diff --git a/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch b/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch
deleted file mode 100644
index b49f2e148f28..000000000000
--- a/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-https://github.com/musescore/MuseScore/pull/15775
-
-From 6f3168324d265b4df262c0c3a37bebdb056b6671 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 9 Jan 2023 11:55:35 +0000
-Subject: [PATCH] Add missing includes (mostly Qt)
-
---- a/src/appshell/iapplicationactioncontroller.h
-+++ b/src/appshell/iapplicationactioncontroller.h
-@@ -22,6 +22,9 @@
- #ifndef MU_APPSHELL_IAPPLICATIONACTIONCONTROLLER_H
- #define MU_APPSHELL_IAPPLICATIONACTIONCONTROLLER_H
-
-+#include <QDragEnterEvent>
-+#include <QDropEvent>
-+#include <QDragMoveEvent>
- #include <QEvent>
-
- #include "modularity/imoduleexport.h"
---- a/src/autobot/internal/api/interactiveapi.cpp
-+++ b/src/autobot/internal/api/interactiveapi.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 "interactiveapi.h"
-
- using namespace mu::api;
---- a/src/autobot/internal/jsmoduleloader.cpp
-+++ b/src/autobot/internal/jsmoduleloader.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 <QFileInfo>
-+
- #include "jsmoduleloader.h"
-
- #include "scriptengine.h"
---- a/src/framework/audio/internal/worker/playback.cpp
-+++ b/src/framework/audio/internal/worker/playback.cpp
-@@ -19,6 +19,9 @@
- * 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 <utility>
-+
- #include "playback.h"
-
- #include "log.h"
---- a/src/framework/global/thirdparty/deto_async/async/promise.h
-+++ b/src/framework/global/thirdparty/deto_async/async/promise.h
-@@ -3,6 +3,9 @@
-
- #include <memory>
- #include <string>
-+
-+#include <QtCore/qcompilerdetection.h>
-+
- #include "internal/abstractinvoker.h"
- #include "async.h"
-
---- a/src/framework/ui/view/uitheme.h
-+++ b/src/framework/ui/view/uitheme.h
-@@ -24,6 +24,7 @@
- #define MU_UI_UITHEME_H
-
- #include <QFont>
-+#include <QPainter>
- #include <QProxyStyle>
-
- #include "modularity/ioc.h"
---- a/src/importexport/bb/internal/bb.cpp
-+++ b/src/importexport/bb/internal/bb.cpp
-@@ -20,6 +20,9 @@
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-+#include <QFile>
-+#include <QFileInfo>
-+
- #include "bb.h"
-
- #include "engravingerrors.h"
---- a/src/importexport/imagesexport/internal/svggenerator.cpp
-+++ b/src/importexport/imagesexport/internal/svggenerator.cpp
-@@ -22,6 +22,7 @@
-
- #include <QTextStream>
- #include <QBuffer>
-+#include <QFile>
- #include <QTextCodec>
- #include <QPainterPath>
- #include <QMimeType>
---- a/src/importexport/midi/internal/midiimport/importmidi_model.h
-+++ b/src/importexport/midi/internal/midiimport/importmidi_model.h
-@@ -26,6 +26,8 @@
-
- #include <memory>
-
-+#include <QAbstractTableModel>
-+
- namespace mu::iex::midi {
- class TracksModel : public QAbstractTableModel
- {
---- a/src/importexport/midi/internal/midiimport/importmidi_operations.cpp
-+++ b/src/importexport/midi/internal/midiimport/importmidi_operations.cpp
-@@ -21,6 +21,7 @@
- */
- #include "importmidi_operations.h"
-
-+#include <QFile>
- #include <QXmlStreamReader>
-
- #include "log.h"
---- a/src/importexport/musedata/internal/musedatareader.cpp
-+++ b/src/importexport/musedata/internal/musedatareader.cpp
-@@ -19,6 +19,9 @@
- * 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 <QFileInfo>
-+
- #include "musedatareader.h"
-
- #include "musedata.h"
---- a/src/multiinstances/internal/ipc/ipc.cpp
-+++ b/src/multiinstances/internal/ipc/ipc.cpp
-@@ -21,6 +21,8 @@
- */
- #include "ipc.h"
-
-+#include <QDataStream>
-+
- #include <QJsonDocument>
- #include <QJsonObject>
- #include <QJsonArray>
---- a/src/notation/view/notationnavigator.h
-+++ b/src/notation/view/notationnavigator.h
-@@ -23,6 +23,8 @@
- #define MU_NOTATION_NOTATIONNAVIGATOR_H
-
- #include <QObject>
-+#include <QMouseEvent>
-+#include <QPainter>
- #include <QQuickPaintedItem>
-
- #include "modularity/ioc.h"
---- a/src/notation/view/notationviewinputcontroller.cpp
-+++ b/src/notation/view/notationviewinputcontroller.cpp
-@@ -21,6 +21,7 @@
- */
- #include "notationviewinputcontroller.h"
-
-+#include <QApplication>
- #include <QMimeData>
- #include <QQuickItem>
- #include <QTimer>
---- a/src/palette/view/widgets/palettewidget.cpp
-+++ b/src/palette/view/widgets/palettewidget.cpp
-@@ -27,8 +27,10 @@
- #include <QAccessible>
- #include <QAccessibleEvent>
- #include <QAction>
-+#include <QApplication>
- #include <QContextMenuEvent>
- #include <QDrag>
-+#include <QFileInfo>
- #include <QMenu>
- #include <QMimeData>
- #include <QResizeEvent>
---- a/src/project/internal/exportprojectscenario.cpp
-+++ b/src/project/internal/exportprojectscenario.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 <QFile>
-+
- #include "exportprojectscenario.h"
-
- #include "async/async.h"
---- a/src/project/view/exportdialogmodel.cpp
-+++ b/src/project/view/exportdialogmodel.cpp
-@@ -21,6 +21,7 @@
- */
- #include "exportdialogmodel.h"
-
-+#include <QApplication>
- #include <QItemSelectionModel>
-
- #include "async/async.h"
---- a/src/workspace/view/newworkspacemodel.h
-+++ b/src/workspace/view/newworkspacemodel.h
-@@ -24,6 +24,7 @@
- #define MU_WORKSPACE_NEWWORKSPACEMODEL_H
-
- #include <QObject>
-+#include <QVariant>
-
- namespace mu::workspace {
- class NewWorkspaceModel : public QObject
---- a/thirdparty/beatroot/AgentList.h
-+++ b/thirdparty/beatroot/AgentList.h
-@@ -18,6 +18,7 @@
-
- #include "Event.h"
-
-+#include <cstddef>
- #include <vector>
-
-
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index f26651950844..2cfc1a6e6ba3 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -63,10 +63,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-missing-qt-includes.patch
-)
-
src_unpack() {
if [[ ${PV} == "9999" ]]; then
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2024-08-04 10:14 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2024-08-04 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 5de7b085ed9ca4babd3f0f9891b99a9d9338cc5a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 10:13:47 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 10:14:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de7b085
media-sound/musescore: bump to 4.3.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 1 +
.../files/musescore-4.3.2-unbundle-deps.patch | 48 +++++++
media-sound/musescore/musescore-4.3.2.ebuild | 143 +++++++++++++++++++++
3 files changed, 192 insertions(+)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 64ea10b591d3..249ebeb79d4d 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -2,3 +2,4 @@ DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df
DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e SHA512 fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616
DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482 SHA512 db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d
+DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970 SHA512 9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
diff --git a/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
new file mode 100644
index 000000000000..6a3f44702f27
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
@@ -0,0 +1,48 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -188,7 +188,7 @@ if (MUE_BUILD_UNIT_TESTS)
+ FULL_DOCS "List XML files outputted by google test."
+ )
+
+- add_subdirectory(thirdparty/googletest)
++ find_package(GTest REQUIRED)
+ endif(MUE_BUILD_UNIT_TESTS)
+
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
++++ b/src/framework/audio/CMakeLists.txt
+@@ -268,10 +268,10 @@ if (MUE_ENABLE_AUDIO_EXPORT)
+ ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+ )
+
+- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
++ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
+ set(MODULE_LINK
+ ${MODULE_LINK}
+- lame
++ PkgConfig::lame
+ )
+ if (MUE_COMPILE_USE_SYSTEM_OPUSENC)
+ pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
+--- a/src/framework/audio/internal/encoders/mp3encoder.cpp
++++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
+@@ -22,7 +22,7 @@
+
+ #include "mp3encoder.h"
+
+-#include "lame.h"
++#include "lame/lame.h"
+
+ using namespace mu;
+ using namespace mu::audio;
+--- a/src/framework/testing/gtest.cmake
++++ b/src/framework/testing/gtest.cmake
+@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED)
+ target_link_libraries(${MODULE_TEST}
+ Qt5::Core
+ Qt5::Gui
+- gmock
++ GTest::gmock
+ global
+ ${MODULE_TEST_LINK}
+ )
diff --git a/media-sound/musescore/musescore-4.3.2.ebuild b/media-sound/musescore/musescore-4.3.2.ebuild
new file mode 100644
index 000000000000..b5a97d520654
--- /dev/null
+++ b/media-sound/musescore/musescore-4.3.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD=3500M
+VIRTUALX_REQUIRED="test"
+inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/musescore/MuseScore.git"
+else
+ SRC_URI="
+ https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="jack test video"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+RDEPEND="
+ dev-libs/tinyxml2:=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtnetworkauth:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtquickcontrols2:5[widgets]
+ >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+ dev-qt/qtsvg:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5
+ >=media-libs/alsa-lib-1.0.0
+ media-libs/flac:=
+ >=media-libs/freetype-2.5.2
+ media-libs/libopusenc
+ media-libs/libsndfile
+ media-libs/opus
+ media-sound/lame
+ sys-libs/zlib:=
+ jack? ( virtual/jack )
+ video? ( media-video/ffmpeg )
+"
+# dev-cpp/gtest is required even when tests are disabled!
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/gtest
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
+ "${FILESDIR}/${PN}-4.3.2-unbundle-deps.patch"
+ "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+ "${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
+)
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_src_unpack
+ unpack ${A}
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Move soundfonts to the correct directory
+ mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+
+ # Make sure we don't accidentally use bundled third party deps
+ # for which we want to use system packages instead.
+ rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
+ || die "Failed to remove unused thirdparty directories"
+}
+
+src_configure() {
+ # confuses rcc, bug #908808
+ filter-lto
+
+ # bug #766111
+ export PATH="$(qt5_get_bindir):${PATH}"
+
+ local mycmakeargs=(
+ -DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
+ -DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_SKIP_RPATH=TRUE
+ -DMUE_BUILD_CRASHPAD_CLIENT=OFF
+ -DMUE_BUILD_UNIT_TESTS="$(usex test)"
+ -DMUE_BUILD_UPDATE_MODULE=OFF
+ -DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
+ -DMUE_COMPILE_USE_CCACHE=OFF
+ -DMUE_COMPILE_USE_SYSTEM_FLAC=ON
+ -DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+ -DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
+ -DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
+ -DMUE_DOWNLOAD_SOUNDFONT=OFF
+ -DMUE_ENABLE_AUDIO_JACK=$(usex jack)
+ -DMUSESCORE_BUILD_MODE=release
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cd "${BUILD_DIR}" || die
+ cmake_build lrelease manpages
+ cmake_src_compile
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ # Hack to not install bundled libraries
+ rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2024-08-04 11:16 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2024-08-04 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 8ca909496214ef0f4b7bc78eee1876100fc61caf
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 11:15:47 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 11:16:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca90949
media-sound/musescore: dropped obsolete 4.0.2-r1
Closes: https://bugs.gentoo.org/922327
Closes: https://bugs.gentoo.org/922098
Closes: https://bugs.gentoo.org/921963
Closes: https://bugs.gentoo.org/909150
Closes: https://bugs.gentoo.org/908480
Closes: https://bugs.gentoo.org/908481
Closes: https://bugs.gentoo.org/908482
Closes: https://bugs.gentoo.org/907956
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 1 -
.../files/musescore-4.0.2-unbundle-deps.patch | 121 ------------------
.../musescore-4.0.2-uncompressed-man-pages.patch | 29 -----
media-sound/musescore/musescore-4.0.2-r1.ebuild | 139 ---------------------
4 files changed, 290 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 249ebeb79d4d..3175279d6972 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,5 +1,4 @@
DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e SHA512 fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616
DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482 SHA512 db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d
DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970 SHA512 9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
diff --git a/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch
deleted file mode 100644
index 6c299d90da67..000000000000
--- a/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Unbundling of all dependencies which are currently available as system packages
-and have not been modified (to our knowledge) by MuseScore.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,7 +206,7 @@ if (BUILD_UNIT_TESTS)
- FULL_DOCS "List XML files outputted by google test."
- )
-
-- add_subdirectory(thirdparty/googletest)
-+ find_package(GTest REQUIRED)
- endif(BUILD_UNIT_TESTS)
-
- add_subdirectory(share)
---- a/src/framework/audio/CMakeLists.txt
-+++ b/src/framework/audio/CMakeLists.txt
-@@ -216,11 +216,18 @@ if (ENABLE_AUDIO_EXPORT)
- ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
- )
-
-- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
-- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
-- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
-+ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
-+ pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
-+ pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
-+ pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
-
-- set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
-+ set(MODULE_LINK
-+ ${MODULE_LINK}
-+ PkgConfig::lame
-+ PkgConfig::libopusenc
-+ PkgConfig::flac
-+ PkgConfig::flacpp
-+ )
- endif()
-
- if (OS_IS_MAC)
---- a/src/framework/audio/internal/encoders/mp3encoder.cpp
-+++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
-@@ -22,7 +22,7 @@
-
- #include "mp3encoder.h"
-
--#include "lame.h"
-+#include "lame/lame.h"
-
- using namespace mu;
- using namespace mu::audio;
---- a/src/framework/audio/internal/encoders/oggencoder.cpp
-+++ b/src/framework/audio/internal/encoders/oggencoder.cpp
-@@ -22,7 +22,7 @@
-
- #include "oggencoder.h"
-
--#include "opusenc.h"
-+#include "opus/opusenc.h"
-
- #include "log.h"
-
---- a/src/framework/global/CMakeLists.txt
-+++ b/src/framework/global/CMakeLists.txt
-@@ -105,8 +105,6 @@ set(MODULE_SRC
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
-- ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp
-- ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
-@@ -124,6 +122,8 @@ set(MODULE_SRC
- ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
- )
-
-+find_package(tinyxml2 REQUIRED)
-+
- if (GLOBAL_NO_INTERNAL)
- set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
- else()
-@@ -184,6 +184,7 @@ set(MODULE_INCLUDE
- set(MODULE_LINK
- ${FS_LIB}
- ${Z_LIB}
-+ tinyxml2::tinyxml2
- )
-
- if (OS_IS_MAC)
---- a/src/framework/global/serialization/xmldom.cpp
-+++ b/src/framework/global/serialization/xmldom.cpp
-@@ -21,7 +21,7 @@
- */
- #include "xmldom.h"
-
--#include "thirdparty/tinyxml/tinyxml2.h"
-+#include <tinyxml2.h>
-
- #include "log.h"
-
---- a/src/framework/global/serialization/xmlstreamreader.cpp
-+++ b/src/framework/global/serialization/xmlstreamreader.cpp
-@@ -23,7 +23,7 @@
-
- #include <cstring>
-
--#include "thirdparty/tinyxml/tinyxml2.h"
-+#include <tinyxml2.h>
-
- #include "log.h"
-
---- a/src/framework/testing/gtest.cmake
-+++ b/src/framework/testing/gtest.cmake
-@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQ
- target_link_libraries(${MODULE_TEST}
- Qt5::Core
- Qt5::Gui
-- gmock
-+ GTest::gmock
- global
- ${MODULE_TEST_LINK}
- )
diff --git a/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch
deleted file mode 100644
index 078662a66bdb..000000000000
--- a/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/build/cmake/SetupAppImagePackaging.cmake
-+++ b/build/cmake/SetupAppImagePackaging.cmake
-@@ -85,7 +85,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
- # Compress man pages if gzip is installed (don't on OpenBSD)
- # Note: Compressing man pages is normal on Linux but not OpenBSD
- find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional)." )
-- if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+ if (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
- message(STATUS "Found 'gzip'. Man pages will be compressed.")
- set(MAN_TARGET ${MAN_BUILD})
- set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
-@@ -102,7 +102,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
- COMMAND echo "Man pages have been compressed ready for installation."
- VERBATIM
- )
-- else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+ else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
- if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
- message(STATUS "System is OpenBSD: Man pages will not be compressed.")
- else (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-@@ -112,7 +112,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE
- COMMAND echo "Man pages will be installed uncompressed."
- VERBATIM
- )
-- endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+ endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
- # Install man pages in either compressed or uncompressed form
- install( FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)
- # Create symlink alias for man pages so `man musescore` = `man mscore`
diff --git a/media-sound/musescore/musescore-4.0.2-r1.ebuild b/media-sound/musescore/musescore-4.0.2-r1.ebuild
deleted file mode 100644
index b2186e4cc9ea..000000000000
--- a/media-sound/musescore/musescore-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-#CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-VIRTUALX_REQUIRED="test"
-inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-else
- SRC_URI="
- https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug jumbo-build test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-RDEPEND="
- dev-libs/tinyxml2:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtnetworkauth:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtquickcontrols:5
- dev-qt/qtquickcontrols2:5[widgets]
- >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
- dev-qt/qtsvg:5
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- >=media-libs/alsa-lib-1.0.0
- media-libs/flac:=
- >=media-libs/freetype-2.5.2
- media-libs/libopusenc
- media-libs/libsndfile
- media-libs/opus
- media-sound/lame
- sys-libs/zlib:=
-"
-# dev-cpp/gtest is required even when tests are disabled!
-DEPEND="
- ${RDEPEND}
-
- dev-cpp/gtest
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-uncompressed-man-pages.patch"
- "${FILESDIR}/${P}-unbundle-deps.patch"
-)
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_src_unpack
- unpack ${A}
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Move soundfonts to the correct directory
- mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-
- # Make sure we don't accidentally use bundled third party deps
- # for which we want to use system packages instead.
- rm -r thirdparty/{flac,freetype,googletest,lame,opus,opusenc} \
- || die "Failed to remove unused thirdparty directories"
-}
-
-src_configure() {
- # confuses rcc, bug #908808
- filter-lto
-
- # bug #766111
- export PATH="$(qt5_get_bindir):${PATH}"
-
- local mycmakeargs=(
- -DMUSESCORE_BUILD_CONFIG=release
-
- -DBUILD_CRASHPAD_CLIENT=OFF
- -DBUILD_AUTOUPDATE=OFF
- # Jack support has been dropped in 4.0.0,
- # but its remnants are still in the build system and cause trouble.
- # https://github.com/musescore/MuseScore/issues/12775
- -DBUILD_JACK=OFF
- -DDOWNLOAD_SOUNDFONT=OFF
- -DSOUNDFONT3=ON
- -DBUILD_UNIT_TESTS="$(usex test)"
- -DCMAKE_SKIP_RPATH=ON
- -DTRY_USE_CCACHE=OFF
- -DBUILD_UNITY="$(usex jumbo-build)"
- -DUSE_SYSTEM_FREETYPE=ON
- )
- cmake_src_configure
-}
-
-src_compile() {
- cd "${BUILD_DIR}" || die
- cmake_build -j1 lrelease manpages
- cmake_src_compile
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # Hack to not install bundled libraries like libogg
- rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2024-08-04 11:24 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2024-08-04 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 79e1d8024e0c4da90c68a43fc09395663426741f
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 11:24:30 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 11:24:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e1d802
media-sound/musescore: dropped obsolete 4.2.1-r2
Bug: https://bugs.gentoo.org/937234
Closes: https://bugs.gentoo.org/927888
Bug: https://bugs.gentoo.org/926328
Bug: https://bugs.gentoo.org/923217
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 1 -
.../files/musescore-4.2.0-unbundle-deps.patch | 119 ------------------
media-sound/musescore/metadata.xml | 1 -
media-sound/musescore/musescore-4.2.1-r2.ebuild | 140 ---------------------
4 files changed, 261 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 3175279d6972..0c1a8f18e1b7 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482 SHA512 db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d
DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970 SHA512 9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
diff --git a/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch b/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
deleted file mode 100644
index 50b388814680..000000000000
--- a/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -185,7 +185,7 @@ if (MUE_BUILD_UNIT_TESTS)
- FULL_DOCS "List XML files outputted by google test."
- )
-
-- add_subdirectory(thirdparty/googletest)
-+ find_package(GTest REQUIRED)
- endif(MUE_BUILD_UNIT_TESTS)
-
- add_subdirectory(share)
---- a/src/framework/audio/CMakeLists.txt
-+++ b/src/framework/audio/CMakeLists.txt
-@@ -268,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT)
- ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
- )
-
-- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
-- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
-- add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
-+ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
-+ pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
-+ pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
-+ pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
-
-- set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
-+ set(MODULE_LINK
-+ ${MODULE_LINK}
-+ PkgConfig::lame
-+ PkgConfig::libopusenc
-+ PkgConfig::flac
-+ PkgConfig::flacpp
-+ )
- endif()
-
- if (ARCH_IS_X86_64)
---- a/src/framework/audio/internal/encoders/mp3encoder.cpp
-+++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
-@@ -22,7 +22,7 @@
-
- #include "mp3encoder.h"
-
--#include "lame.h"
-+#include "lame/lame.h"
-
- using namespace mu;
- using namespace mu::audio;
---- a/src/framework/audio/internal/encoders/oggencoder.cpp
-+++ b/src/framework/audio/internal/encoders/oggencoder.cpp
-@@ -22,7 +22,7 @@
-
- #include "oggencoder.h"
-
--#include "opusenc.h"
-+#include "opus/opusenc.h"
-
- #include "log.h"
-
---- a/src/framework/global/CMakeLists.txt
-+++ b/src/framework/global/CMakeLists.txt
-@@ -111,8 +111,6 @@ set(MODULE_SRC
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
-- ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp
-- ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
-@@ -130,6 +128,8 @@ set(MODULE_SRC
- ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
- )
-
-+find_package(tinyxml2 REQUIRED)
-+
- if (GLOBAL_NO_INTERNAL)
- set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
- else()
-@@ -209,6 +209,7 @@ list(APPEND MODULE_INCLUDE
- list(APPEND MODULE_LINK
- ${FS_LIB}
- ${Z_LIB}
-+ tinyxml2::tinyxml2
- )
-
- if (MUE_ENABLE_CUSTOM_ALLOCATOR)
---- a/src/framework/global/serialization/xmldom.cpp
-+++ b/src/framework/global/serialization/xmldom.cpp
-@@ -21,7 +21,7 @@
- */
- #include "xmldom.h"
-
--#include "thirdparty/tinyxml/tinyxml2.h"
-+#include <tinyxml2.h>
-
- #include "log.h"
-
---- a/src/framework/global/serialization/xmlstreamreader.cpp
-+++ b/src/framework/global/serialization/xmlstreamreader.cpp
-@@ -23,7 +23,7 @@
-
- #include <cstring>
-
--#include "thirdparty/tinyxml/tinyxml2.h"
-+#include <tinyxml2.h>
-
- #include "log.h"
-
---- a/src/framework/testing/gtest.cmake
-+++ b/src/framework/testing/gtest.cmake
-@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED)
- target_link_libraries(${MODULE_TEST}
- Qt5::Core
- Qt5::Gui
-- gmock
-+ GTest::gmock
- global
- ${MODULE_TEST_LINK}
- )
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index bb8981f3fa8a..bdf3cf8fbc6d 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -10,7 +10,6 @@
<remote-id type="github">musescore/MuseScore</remote-id>
</upstream>
<use>
- <flag name="jumbo-build">Combine source files to speed up build process, requires more memory</flag>
<flag name="osc">Enable OSC remote control protocol</flag>
<flag name="omr">Enable PDF import (OMR - optical music recognition)</flag>
<flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
diff --git a/media-sound/musescore/musescore-4.2.1-r2.ebuild b/media-sound/musescore/musescore-4.2.1-r2.ebuild
deleted file mode 100644
index 9e3eb5ad3fc8..000000000000
--- a/media-sound/musescore/musescore-4.2.1-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHECKREQS_DISK_BUILD=3500M
-VIRTUALX_REQUIRED="test"
-inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/musescore/MuseScore.git"
-else
- SRC_URI="
- https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="jack test video"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-RDEPEND="
- dev-libs/tinyxml2:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtnetworkauth:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtquickcontrols:5
- dev-qt/qtquickcontrols2:5[widgets]
- >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
- dev-qt/qtsvg:5
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- >=media-libs/alsa-lib-1.0.0
- media-libs/flac:=
- >=media-libs/freetype-2.5.2
- media-libs/libopusenc
- media-libs/libsndfile
- media-libs/opus
- media-sound/lame
- sys-libs/zlib:=
- jack? ( virtual/jack )
- video? ( media-video/ffmpeg )
-"
-# dev-cpp/gtest is required even when tests are disabled!
-DEPEND="
- ${RDEPEND}
- dev-cpp/gtest
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
- "${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
- "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
- "${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
-)
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_src_unpack
- unpack ${A}
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Move soundfonts to the correct directory
- mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-
- # Make sure we don't accidentally use bundled third party deps
- # for which we want to use system packages instead.
- rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
- || die "Failed to remove unused thirdparty directories"
-}
-
-src_configure() {
- # confuses rcc, bug #908808
- filter-lto
-
- # bug #766111
- export PATH="$(qt5_get_bindir):${PATH}"
-
- local mycmakeargs=(
- -DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
- -DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
- -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_SKIP_RPATH=TRUE
- -DMUE_BUILD_CRASHPAD_CLIENT=OFF
- -DMUE_BUILD_UNIT_TESTS="$(usex test)"
- -DMUE_BUILD_UPDATE_MODULE=OFF
- -DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
- -DMUE_COMPILE_USE_CCACHE=OFF
- -DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
- -DMUE_DOWNLOAD_SOUNDFONT=OFF
- -DMUE_ENABLE_AUDIO_JACK=$(usex jack)
- -DMUSESCORE_BUILD_MODE=release
- )
- cmake_src_configure
-}
-
-src_compile() {
- cd "${BUILD_DIR}" || die
- cmake_build lrelease manpages
- cmake_src_compile
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # Hack to not install bundled libraries
- rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/
@ 2024-08-27 9:12 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2024-08-27 9:12 UTC (permalink / raw
To: gentoo-commits
commit: 3c5013cb5f32ff38db883fe4dc27a127db09487d
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 09:12:40 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 09:12:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5013cb
media-sound/musescore: bump to 4.4.0 + updated live
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 1 +
media-sound/musescore/files/musescore-4.4.0-include.patch | 11 +++++++++++
.../{musescore-9999.ebuild => musescore-4.4.0.ebuild} | 1 +
media-sound/musescore/musescore-9999.ebuild | 1 +
4 files changed, 14 insertions(+)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 0c1a8f18e1b7..af7db4280db2 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,4 @@
DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970 SHA512 9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
+DIST musescore-4.4.0.tar.gz 144645529 BLAKE2B 477c6799fd253b1cf888ac3695fb60edf9e7612250ce66abad6a84dac44c088de96ba9af5c4c656e5fb6b247f57ba4c5156ebb6f9078ddb8ab928a1999e0c67b SHA512 70413d50bb00cfc1a5399dfab185aacca42b087ac6097d74da80129052e9e1489fc659a167e2e282edd08ae77b6fdbea2f4765ad1a575a50df26618f4a70ec5a
diff --git a/media-sound/musescore/files/musescore-4.4.0-include.patch b/media-sound/musescore/files/musescore-4.4.0-include.patch
new file mode 100644
index 000000000000..75257dffcf9c
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-include.patch
@@ -0,0 +1,11 @@
+--- a/src/framework/audio/internal/fx/reverb/vectorops.h
++++ b/src/framework/audio/internal/fx/reverb/vectorops.h
+@@ -27,6 +27,8 @@
+
+ #include <cstdint>
+
++#include <cstring>
++
+ //
+ // This header is provided for convenience, to easily wrap vector operations around
+ // their platform-specific optimised libraries (e.g. IPP, vDSP), if desired.
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-4.4.0.ebuild
similarity index 98%
copy from media-sound/musescore/musescore-9999.ebuild
copy to media-sound/musescore/musescore-4.4.0.ebuild
index 06e97196028f..7dc814a8631c 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-4.4.0.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+ "${FILESDIR}/${PN}-4.4.0-include.patch"
)
src_unpack() {
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 06e97196028f..7dc814a8631c 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+ "${FILESDIR}/${PN}-4.4.0-include.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2024-08-27 9:12 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-30 13:20 [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2024-08-27 9:12 Miroslav Šulc
2024-08-04 11:24 Miroslav Šulc
2024-08-04 11:16 Miroslav Šulc
2024-08-04 10:14 Miroslav Šulc
2023-01-09 15:07 Sam James
2023-01-09 12:03 Sam James
2021-02-28 11:47 Miroslav Šulc
2020-10-17 9:07 Miroslav Šulc
2020-08-06 13:28 Miroslav Šulc
2020-04-02 12:59 Miroslav Šulc
2020-03-04 16:19 Miroslav Šulc
2020-01-04 14:58 Miroslav Šulc
2019-04-28 23:45 Andreas Sturmlechner
2019-02-01 19:50 Miroslav Šulc
2018-12-24 0:51 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-21 21:23 Andreas Sturmlechner
2018-08-17 22:04 Andreas Sturmlechner
2017-12-09 23:13 Michał Górny
2017-07-30 15:45 David Seifert
2017-01-04 10:15 David Seifert
2016-11-29 8:29 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox