[debian-edu-commits] debian-edu/pkg-team/ 01/01: Separate flags for WINE_BUILD_FLAGS

[Javier Serrano Polo]

This is an automated email from the git hooks/post-receive script.

jasp00-guest pushed a commit to branch master
in repository lmms.

commit ad3755bfeab4ca83989a415924ddabe1b66758e0
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Mon Dec 26 03:52:21 2016 +0100

    Separate flags for WINE_BUILD_FLAGS
---
 debian/changelog                      |  7 +++++++
 debian/patches/series                 |  1 +
 debian/patches/sort-resources.patch   |  1 +
 debian/patches/wine-flags-space.patch | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f4a84b3..9a210a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lmms (1.1.3-7) unstable; urgency=low
+
+  [ Javier Serrano Polo ]
+  * Separate flags for WINE_BUILD_FLAGS.
+
+ -- Javier Serrano Polo <javier at jasp.net>  Mon, 26 Dec 2016 03:36:02 +0100
+
 lmms (1.1.3-6) unstable; urgency=low
 
   [ Javier Serrano Polo ]
diff --git a/debian/patches/series b/debian/patches/series
index 1c3c50a..248be9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ honor-contributors.patch
 no-file.patch
 sort-resources.patch
 install-runpath.patch
+wine-flags-space.patch
diff --git a/debian/patches/sort-resources.patch b/debian/patches/sort-resources.patch
index a505892..833acd3 100644
--- a/debian/patches/sort-resources.patch
+++ b/debian/patches/sort-resources.patch
@@ -4,6 +4,7 @@ Description: Sort plug-in embedded resources
  builds.
 Author: Javier Serrano Polo <javier at jasp.net>
 Bug: https://github.com/LMMS/lmms/pull/3014
+Applied-Upstream: 1.2.0-rc2
 
 Index: lmms-1.1.3/cmake/modules/BuildPlugin.cmake
 ===================================================================
diff --git a/debian/patches/wine-flags-space.patch b/debian/patches/wine-flags-space.patch
new file mode 100644
index 0000000..7d24a0f
--- /dev/null
+++ b/debian/patches/wine-flags-space.patch
@@ -0,0 +1,18 @@
+Description: Separate flags for WINE_BUILD_FLAGS
+ CMAKE_CXX_FLAGS may not end with a space; add one.
+Author: Javier Serrano Polo <javier at jasp.net>
+Forwarded: https://github.com/LMMS/lmms/pull/3177
+
+Index: lmms-1.1.3/plugins/vst_base/CMakeLists.txt
+===================================================================
+--- lmms-1.1.3.orig/plugins/vst_base/CMakeLists.txt	2016-12-26 03:14:57.000000000 +0100
++++ lmms-1.1.3/plugins/vst_base/CMakeLists.txt	2016-12-26 03:16:37.000000000 +0100
+@@ -33,7 +33,7 @@
+ 	ENDIF()
+ ENDIF(LMMS_HOST_X86_64)
+ 
+-STRING(REPLACE " " ";" WINE_BUILD_FLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_EXE_LINKER_FLAGS} " " ${WINE_CXX_FLAGS})
++STRING(REPLACE " " ";" WINE_BUILD_FLAGS ${CMAKE_CXX_FLAGS} " " ${CMAKE_EXE_LINKER_FLAGS} " " ${WINE_CXX_FLAGS})
+ ADD_CUSTOM_COMMAND(
+ 		SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp"
+ 		COMMAND ${WINE_CXX}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git