[SCM] cantata/master: Ensure compiler flags are not overridden

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2f6878cf25812b9beb3825654933d86c770b9772
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Feb 8 02:02:41 2016 +1100

    Ensure compiler flags are not overridden

diff --git a/debian/patches/cxxflags-hardening.patch b/debian/patches/cxxflags-hardening.patch
new file mode 100644
index 0000000..0f95319
--- /dev/null
+++ b/debian/patches/cxxflags-hardening.patch
@@ -0,0 +1,15 @@
+Description: ensure hardening data is not overridden by build system
+ CMakeLists.txt ignored the externally set values of CXXFLAGS, preventing
+ hardening flags from being passed into the build.
+Author: Stuart Prescott <stuart at debian.org>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -279,7 +279,7 @@
+     set(QTINCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS}
+                    ${Qt5Svg_INCLUDE_DIRS} ${Qt5Sql_INCLUDE_DIRS})
+     add_definitions(${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5Xml_DEFINITIONS} ${Qt5Concurrent_DEFINITIONS} ${Qt5Svg_DEFINITIONS} ${Qt5Sql_DEFINITIONS})
+-    set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+     if (NOT ENABLE_UBUNTU AND NOT APPLE AND NOT WIN32)
+         # Does Ubuntu/Touch version need DBus?
+         find_package(Qt5DBus)
diff --git a/debian/patches/series b/debian/patches/series
index 9932563..5aaf4f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 # only needed for Qt in wheezy
+cxxflags-hardening.patch
 ebur128-location.patch
diff --git a/debian/rules b/debian/rules
index f7dbe87..2badcfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
 
 export QT_SELECT=5
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@ --parallel --with kde
 

-- 
cantata packaging