[SCM] musescore/master: refresh patches

[tg at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7b5b8be34411f817c16c73dedb12961c4f3799e5
Author: mirabilos <tg at debian.org>
Date:   Fri Aug 4 23:42:26 2017 +0200

    refresh patches

diff --git a/debian/patches/02-global-flags.patch b/debian/patches/02-global-flags.patch
index 13890d1..be81168 100644
--- a/debian/patches/02-global-flags.patch
+++ b/debian/patches/02-global-flags.patch
@@ -6,24 +6,24 @@ Description: Put common flags into CMAKE_CXX_FLAGS
  This patch moves the common flags (c++ standard, warnings, etc) to
  CMAKE_CXX_FLAGS which gets used in all build types.
  .
- The flags in mtest are duplicated and inherited from the root CMakeLists.txt
- anyway, so they can be removed.
- .
  The PCH build was already not working, but after appplying this patch it fails
  outright (the PCH code ignores CMAKE_CXX_FLAGS and all custom flags) so just
  disable it.
+ .
+ The flags in mtest are duplicated and inherited from the root CMakeLists.txt
+ anyway, so they can be removed.
 Author: James Cowgill <jcowgill at debian.org>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -148,17 +148,20 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "
+@@ -154,17 +154,20 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "
  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")
-+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -stdlib=libc++ -Wno-inconsistent-missing-override")
++   set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -stdlib=libc++ -Wno-inconsistent-missing-override")
 +   set(CMAKE_CXX_FLAGS_DEBUG   "-g")
 +   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
  else (APPLE)
@@ -31,31 +31,33 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
        # -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_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -mno-ms-bitfields")
++      set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -std=c++11 -mno-ms-bitfields")
 +      set(CMAKE_CXX_FLAGS_DEBUG   "-g")
 +      set(CMAKE_CXX_FLAGS_RELEASE "-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_DEBUG   "-std=c++11 -fPIC -g")
 -      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
-+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
-+      set(CMAKE_CXX_FLAGS_DEBUG   "-fPIE -g")
++      set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
++      set(CMAKE_CXX_FLAGS_DEBUG   "-g")
 +      set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
     endif (MINGW)
  endif(APPLE)
  
-@@ -557,7 +560,7 @@ add_custom_command(
- if (MINGW)
-   set(BUILD_PCH false)
- else (MINGW)
+@@ -577,9 +580,7 @@ add_custom_command(
+     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+     )
+-if (NOT MINGW)
 -  set(BUILD_PCH true)
-+  set(BUILD_PCH false)
- endif(MINGW)
+-endif(NOT MINGW)
++set(BUILD_PCH false)
  
  precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+ 
 --- a/mtest/CMakeLists.txt
 +++ b/mtest/CMakeLists.txt
-@@ -112,20 +112,6 @@ target_link_libraries(
+@@ -113,19 +113,6 @@ target_link_libraries(
  
  set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
  
@@ -68,11 +70,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -      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_DEBUG   "-std=gnu++0x -fPIC -g")
 -      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
 -   endif (MINGW)
 -endif(APPLE)
--
  
- string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
  
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
diff --git a/debian/patches/04-manpage-errors.patch b/debian/patches/04-manpage-errors.patch
index 2e24e5f..486c5ac 100644
--- a/debian/patches/04-manpage-errors.patch
+++ b/debian/patches/04-manpage-errors.patch
@@ -6,7 +6,7 @@ Author: James Cowgill <jcowgill at 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)
+@@ -501,7 +501,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")

-- 
musescore packaging