audio-creation/musescore: version 2.0.3

10 files changed, 664 insertions, 16 deletions

diff --git a/audio-creation/musescore/01-debundle-freetype.patch b/audio-creation/musescore/01-debundle-freetype.patch
new file mode 100644
index 0000000000..c24ced50d1
--- /dev/null
+++ b/audio-creation/musescore/01-debundle-freetype.patch
@@ -0,0 +1,94 @@
+Description: Use the system copy of freetype
+Author: James Cowgill <jcowgill@debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,18 +218,18 @@ SET(QT_USE_QTHELP        TRUE)
+ ## freetype2 >= 2.5.2
+ ##
+ 
+-##if (APPLE)
+-##      PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR FREETYPE_LIBRARIES FREETYPE_CPP)
+-##      if (FREETYPE_INCLUDE_DIRS)
+-##          STRING(REGEX REPLACE  "\"" "" FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
+-##          STRING(REGEX REPLACE  "\"" "" FREETYPE_LIBDIR ${FREETYPE_LIBDIR})
+-##          message("freetype2 detected ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_LIBDIR} ${FREETYPE_LIBRARIES}")
+-##      else (FREETYPE_INCLUDE_DIRS)
+-##          message(FATAL_ERROR "freetype >= 2.5.2 is required\n")
+-##      endif (FREETYPE_INCLUDE_DIRS)
+-##else (APPLE)
+-##    find_package(Freetype REQUIRED)
+-##endif (APPLE)
++if (APPLE)
++      PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR FREETYPE_LIBRARIES FREETYPE_CPP)
++      if (FREETYPE_INCLUDE_DIRS)
++          STRING(REGEX REPLACE  "\"" "" FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
++          STRING(REGEX REPLACE  "\"" "" FREETYPE_LIBDIR ${FREETYPE_LIBDIR})
++          message("freetype2 detected ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_LIBDIR} ${FREETYPE_LIBRARIES}")
++      else (FREETYPE_INCLUDE_DIRS)
++          message(FATAL_ERROR "freetype >= 2.5.2 is required\n")
++      endif (FREETYPE_INCLUDE_DIRS)
++else (APPLE)
++    find_package(Freetype REQUIRED)
++endif (APPLE)
+ 
+ ##
+ ## alsa >= 1.0.0
+@@ -606,7 +606,6 @@ if (OSC)
+       subdirs (thirdparty/ofqf)
+ endif (OSC)
+ 
+-subdirs (thirdparty/freetype)
+ 
+ 
+ ##
+@@ -622,8 +621,7 @@ include_directories(
+    ${VORBIS_INCDIR}
+    ${SNDFILE_INCDIR}
+    ${LAME_INCLUDE_DIR}
+-#   ${FREETYPE_INCLUDE_DIRS}
+-   ${PROJECT_SOURCE_DIR}/thirdparty/freetype/include
++   ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
+ ##
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -385,7 +385,7 @@ if (MINGW)
+       portaudio
+       portmidi
+       winmm
+-      mscore_freetype
++      freetype
+       z
+       )
+ 
+@@ -477,7 +477,7 @@ else (MINGW)
+    target_link_libraries(mscore
+       ${ALSA_LIB}
+       ${QT_LIBRARIES}
+-      mscore_freetype
++      freetype
+       z
+       dl
+       pthread
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -17,7 +17,6 @@ enable_testing()
+ include_directories(
+       ${PROJECT_BINARY_DIR}
+       ${PROJECT_SOURCE_DIR}
+-      ${PROJECT_SOURCE_DIR}/thirdparty/freetype/include
+       )
+ 
+ if (OMR)
+@@ -108,7 +107,7 @@ add_executable(
+ target_link_libraries(
+       mtest
+       ${QT_LIBRARIES}
+-      mscore_freetype
++      freetype
+       )
+ 
+ set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
diff --git a/audio-creation/musescore/04-manpage-errors.patch b/audio-creation/musescore/04-manpage-errors.patch
new file mode 100644
index 0000000000..2e24e5f4e7
--- /dev/null
+++ b/audio-creation/musescore/04-manpage-errors.patch
@@ -0,0 +1,27 @@
+Description: Fix errors in mscore.1 manpage
+ CMake doesn't support single quotes, so the old value of MAN_PORTABLE was
+ causing errors. Insert manual line break to help groff displaying a long line.
+Author: James Cowgill <jcowgill@debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -478,7 +478,7 @@ if (NOT MINGW AND NOT APPLE)
+                        build/rm-empty-dirs              DESTINATION bin COMPONENT portable ${SCRIPT_PERMS})
+       install(FILES    build/Linux+BSD/portable/qt.conf DESTINATION bin COMPONENT portable)
+     else (${MSCORE_INSTALL_SUFFIX} MATCHES "portable")
+-      set(MAN_PORTABLE '.\"') # comment out lines in man page that are only relevent to the portable version
++      set(MAN_PORTABLE .\\\") # comment out lines in man page that are only relevent to the portable version
+     endif (${MSCORE_INSTALL_SUFFIX} MATCHES "portable")
+     # install desktop file (perform variable substitution first)
+     configure_file(build/Linux+BSD/mscore.desktop.in mscore${MSCORE_INSTALL_SUFFIX}.desktop)
+--- a/build/Linux+BSD/mscore.1.in
++++ b/build/Linux+BSD/mscore.1.in
+@@ -69,6 +69,7 @@ For help with the full MuseScore program
+ These pages cover the topics in this manual and may be more up-to-date:
+ 
+ <https://musescore.org/handbook/command-line-options-0>
++.br
+ <https://musescore.org/handbook/revert-factory-settings-0>
+ 
+ .SH OPTIONS
diff --git a/audio-creation/musescore/BUILD b/audio-creation/musescore/BUILD
index 92c81f0d65..af480f4a18 100755
--- a/audio-creation/musescore/BUILD
+++ b/audio-creation/musescore/BUILD
@@ -1,2 +1,2 @@
-PATH="$QT5DIR/bin:$PATH"
-make PREFIX="$INSTALL_ROOT/usr"
+qt5_cmake_build &&
+make lrelease
diff --git a/audio-creation/musescore/CONFIGURE b/audio-creation/musescore/CONFIGURE
new file mode 100755
index 0000000000..7eb4bb8b76
--- /dev/null
+++ b/audio-creation/musescore/CONFIGURE
@@ -0,0 +1,9 @@
+config_query_option  MUSESCORE_AEOLUS                 \
+                     "Enable organ synthesizer?" n    \
+                     "-DAEOLUS=on"                    \
+                     "-DAEOLUS=off"                   &&
+
+config_query_option  MUSESCORE_ZERBERUS                   \
+                     "Enable experimental sfz sampler?" y \
+                     "-DZERBERUS=on"                      \
+                     "-DZERBERUS=off"
diff --git a/audio-creation/musescore/DEPENDS b/audio-creation/musescore/DEPENDS
index fd2c800b46..060429a960 100755
--- a/audio-creation/musescore/DEPENDS
+++ b/audio-creation/musescore/DEPENDS
@@ -1,16 +1,42 @@
 depends cmake &&
 depends -sub CXX gcc &&
-depends alsa-lib &&
-depends portaudio19 &&
-depends lame &&
-depends libsndfile &&
+optional_depends alsa-lib \
+                 "-DBUILD_ALSA=on" \
+                 "-DBUILD_ALSA=off" \
+                 "support for the alsa audio backend" &&
+optional_depends portaudio19 \
+                 "-DBUILD_PORTAUDIO=on" \
+                 "-DBUILD_PORTAUDIO=off" \
+                 "support for the portaudio backend" &&
+optional_depends pulseaudio \
+                 "-DBUILD_PULSEAUDIO=on" \
+                 "-DBUILD_PULSEAUDIO=off" \
+                 "support for the pulseaudio backend" &&
+optional_depends JACK-DRIVER \
+                 "-DBUILD_JACK=on" \
+                 "-DBUILD_JACK=off" \
+                 "support for the jack backend" &&
+optional_depends lame \
+                 "-DBUILD_LAME=on" \
+                 "-DBUILD_LAME=off" \
+                 "for mp3 export" &&
+optional_depends libsndfile \
+                 "-DHAS_AUDIOFILE=on" \
+                 "-DHAS_AUDIOFILE=off" \
+                 "for audio export" &&
+optional_depends libvorbis \
+                 "-DSOUNDFONT3=on" \
+                 "-DSOUNDFONT3=off" \
+                 "support for vorbis-compressed sound fonts" &&
+if is_depends_enabled $SPELL libvorbis; then
+  depends libogg
+fi &&
 depends qtbase &&
 depends qttools &&
 depends qtdeclarative &&
-depends qtquick1 &&
 depends qtquickcontrols &&
 depends qtscript &&
 depends qtxmlpatterns &&
 depends qtsvg &&
 depends SSL &&
-depends WEBKIT_QT 
+depends WEBKIT_QT
diff --git a/audio-creation/musescore/DETAILS b/audio-creation/musescore/DETAILS
index cee4f7743c..6ab33c49fd 100755
--- a/audio-creation/musescore/DETAILS
+++ b/audio-creation/musescore/DETAILS
@@ -1,10 +1,8 @@
            SPELL=musescore
-         VERSION=2.0.2
-          SOURCE="MuseScore-${VERSION}.zip"
-# If you find a more canonical URL, go ahead. The website offers
-# a generic version-less link that resolves to that below (always?).
-   SOURCE_URL[0]=http://ftp.osuosl.org/pub/${SPELL}/releases/MuseScore-$VERSION/${SOURCE}
-     SOURCE_HASH=sha512:5302dd4492a86c67c142d687b2122cb59eda0dc0238cf2813c17278bbdd22d65172081576da68e7d25484158c8fea207517a1b2cec5b60a1a3c56869e62f5c19
+         VERSION=2.0.3
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]="https://github.com/musescore/MuseScore/archive/v${VERSION}.tar.gz"
+     SOURCE_HASH=sha512:4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/MuseScore-${VERSION}"
         WEB_SITE="https://musescore.org"
       LICENSE[0]=GPLv2
diff --git a/audio-creation/musescore/HISTORY b/audio-creation/musescore/HISTORY
index cd0e785f0e..6e5c69e38d 100644
--- a/audio-creation/musescore/HISTORY
+++ b/audio-creation/musescore/HISTORY
@@ -1,3 +1,14 @@
+2017-01-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 2.0.3
+	* BUILD, DEPENDS: use cmake
+	* DEPENDS: make lots of depencies optional
+	* CONFIGURE: add configuration options for synthesizers
+	* INSTALL: removed
+	* DETAILS: pull source from github
+	* PRE_BUILD, 01-debundle-freetype.patch, 04-manpage-errors.patch,
+	  musescore-2.0.3-fix-buildsystem.patch: add patches from gentoo/debian to
+	  fix build errors
+
 2017-01-13 Treeve Jelbert <treeve@sourcemage.org>
 	* DEPENDS: qtwebkit => WEBKIT_QT
 
diff --git a/audio-creation/musescore/INSTALL b/audio-creation/musescore/INSTALL
deleted file mode 100755
index b0e78211ac..0000000000
--- a/audio-creation/musescore/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH="$QT5DIR/bin:$PATH" &&
-make PREFIX="$INSTALL_ROOT/usr" install
diff --git a/audio-creation/musescore/PRE_BUILD b/audio-creation/musescore/PRE_BUILD
new file mode 100755
index 0000000000..bc20e3030a
--- /dev/null
+++ b/audio-creation/musescore/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/musescore-2.0.3-fix-buildsystem.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/01-debundle-freetype.patch"            &&
+patch -p1 < "$SPELL_DIRECTORY/04-manpage-errors.patch"
diff --git a/audio-creation/musescore/musescore-2.0.3-fix-buildsystem.patch b/audio-creation/musescore/musescore-2.0.3-fix-buildsystem.patch
new file mode 100644
index 0000000000..0fb52db915
--- /dev/null
+++ b/audio-creation/musescore/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)