Attachment 115141 Details for Bug 156901 – patch-ports-audio-musescore.txt

[patch] patch-ports-audio-musescore.txt

patch-ports-audio-musescore.txt (text/plain), 3.24 KB, created by kamikaze on 2011-09-11 12:35:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kamikaze

Created: 2011-09-11 12:35:37 UTC

Size: 3.24 KB

patch

obsolete

>diff -Nur audio/musescore.orig/files/patch-mscore-CMakeLists.txt audio/musescore/files/patch-mscore-CMakeLists.txt
>--- audio/musescore.orig/files/patch-mscore-CMakeLists.txt	2011-09-05 01:36:44.000000000 +0200
>+++ audio/musescore/files/patch-mscore-CMakeLists.txt	2011-09-05 08:20:30.000000000 +0200
>@@ -1,5 +1,17 @@
> --- mscore/CMakeLists.txt.orig	2011-07-27 17:33:18.000000000 +0400
> +++ mscore/CMakeLists.txt	2011-07-29 21:06:37.000000000 +0400
>+@@ -55,6 +55,11 @@
>+       set(OsxFrameworks ${AudioToolboxFW} ${AudioUnitFW} ${CoreAudioFW} ${CoreMidiFW} ${SystemConfigurationFW} ${CoreServicesFW})
>+ endif (APPLE)
>+ 
>++string(STRIP "${CMAKE_CXX_COMPILER}" CMAKE_CXX_COMPILER)
>++string(STRIP "${CMAKE_CXX_COMPILER_ARG1}" CMAKE_CXX_COMPILER_ARG1)
>++string(STRIP "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}" _CMAKE_CXX_COMPILER)
>++string(REGEX REPLACE "[	 ]+" ";" _CMAKE_CXX_COMPILER ${_CMAKE_CXX_COMPILER})
>++
>+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
>+ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
>+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
> @@ -255,9 +255,9 @@
>     ${PROJECT_SOURCE_DIR}/mscore
>     ${PROJECT_BINARY_DIR}
>diff -Nur audio/musescore.orig/files/patch-mscore-al-CMakeLists.txt audio/musescore/files/patch-mscore-al-CMakeLists.txt
>--- audio/musescore.orig/files/patch-mscore-al-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ audio/musescore/files/patch-mscore-al-CMakeLists.txt	2011-09-05 00:20:19.000000000 +0200
>@@ -0,0 +1,11 @@
>+--- mscore.orig/al/CMakeLists.txt	2011-09-05 00:09:52.000000000 +0200
>++++ mscore/al/CMakeLists.txt	2011-09-05 00:16:25.000000000 +0200
>+@@ -28,7 +28,7 @@
>+ 
>+ add_custom_command(
>+    OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
>+-   COMMAND ${CMAKE_CXX_COMPILER}
>++   COMMAND ${_CMAKE_CXX_COMPILER}
>+      -g -Wextra -Wall
>+      -I"${QT_INCLUDE_DIR}"
>+      -o all.h.pch all.h
>diff -Nur audio/musescore.orig/files/patch-mscore-awl-CMakeLists.txt audio/musescore/files/patch-mscore-awl-CMakeLists.txt
>--- audio/musescore.orig/files/patch-mscore-awl-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ audio/musescore/files/patch-mscore-awl-CMakeLists.txt	2011-09-05 00:21:29.000000000 +0200
>@@ -0,0 +1,11 @@
>+--- mscore.orig/awl/CMakeLists.txt	2011-09-05 00:09:47.000000000 +0200
>++++ mscore/awl/CMakeLists.txt	2011-09-05 00:16:59.000000000 +0200
>+@@ -45,7 +45,7 @@
>+ 
>+ add_custom_command(
>+    OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
>+-   COMMAND ${CMAKE_CXX_COMPILER}
>++   COMMAND ${_CMAKE_CXX_COMPILER}
>+      -g -Wextra -Wall
>+      -I"${QT_INCLUDE_DIR}"
>+      -o all.h.pch all.h
>diff -Nur audio/musescore.orig/files/patch-mscore-mscore-CMakeLists.txt audio/musescore/files/patch-mscore-mscore-CMakeLists.txt
>--- audio/musescore.orig/files/patch-mscore-mscore-CMakeLists.txt	2011-09-05 01:37:13.000000000 +0200
>+++ audio/musescore/files/patch-mscore-mscore-CMakeLists.txt	2011-09-05 00:22:07.000000000 +0200
>@@ -1,5 +1,14 @@
> --- mscore/mscore/CMakeLists.txt.orig	2011-07-27 17:32:44.000000000 +0400
> +++ mscore/mscore/CMakeLists.txt	2011-07-29 05:31:28.000000000 +0400
>+@@ -47,7 +47,7 @@
>+ 
>+ add_custom_command(
>+    OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
>+-   COMMAND ${CMAKE_CXX_COMPILER}
>++   COMMAND ${_CMAKE_CXX_COMPILER}
>+      -g -Wextra -Wall
>+      -I"${QT_INCLUDE_DIR}"
>+      -o all.h.pch all.h
> @@ -61,7 +61,7 @@
>        PROPERTIES generated true
>        )

Actions: View | Diff

Attachments on bug 156901: 115134 | 115135 | 115136 | 115137 | 115138 | 115139 | 115140 | 115141 | 115142 | 115143 | 115144 | 115145 | 115146 | 115147 | 115148 | 115149 | 115150 | 115151 | 115152 | 115153 | 115154 | 115155 | 115156