From 06da9a987b1e0a3377b01dfad30158d1888f1dad Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 9 Dec 2017 23:50:57 +0100 Subject: 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(-) delete mode 100644 media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch delete mode 100644 media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch delete mode 100644 media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch delete mode 100644 media-sound/musescore/files/musescore-9999-fix-buildsystem.patch (limited to 'media-sound') diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest index 05a5d36252c8..549a036e403b 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 aa2749cad58d..000000000000 --- 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 0fb52db915ca..000000000000 --- 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 9667c4fadc1a..000000000000 --- 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 74ba5113874d..000000000000 --- 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 83c725c42826..84ac9cadf90a 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 a574e62b731d..27aff7756bea 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 4f547ddc3dbd..c5eb58ccd824 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 a04d054d3d85..8fb501377442 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() { -- cgit v1.2.3-65-gdbad