[SCM] cantata/master: Refresh patches - drop cxxflags-hardening.patch adopted upstream - drop ffmpeg_3.0.patch adopted upstream

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4a323a943a99e462d5d3a5c6268c2215f5364942
Author: Stuart Prescott <stuart at debian.org>
Date:   Sat Jun 4 15:36:30 2016 +1000

    Refresh patches
    - drop cxxflags-hardening.patch adopted upstream
    - drop ffmpeg_3.0.patch adopted upstream

diff --git a/debian/patches/cxxflags-hardening.patch b/debian/patches/cxxflags-hardening.patch
deleted file mode 100644
index 0f95319..0000000
--- a/debian/patches/cxxflags-hardening.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/ffmpeg_3.0.patch b/debian/patches/ffmpeg_3.0.patch
deleted file mode 100644
index 3e5be80..0000000
--- a/debian/patches/ffmpeg_3.0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2015-11-02>
-
---- a/replaygain/ffmpeginput.cpp
-+++ b/replaygain/ffmpeginput.cpp
-@@ -21,7 +21,6 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #if LIBAVFORMAT_VERSION_MAJOR >= 54
--#include <libavutil/audioconvert.h>
- #include <libavutil/channel_layout.h>
- #endif
- #ifdef __cplusplus
diff --git a/debian/patches/series b/debian/patches/series
index 09d493d..6e2866a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-ffmpeg_3.0.patch
-cxxflags-hardening.patch
 ebur128-location.patch

-- 
cantata packaging