Import upstream patches to fix qt5 build

4 files changed, 56 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 7ccfebd..1283843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ phonon (4:4.8.3-1~) UNRELEASED; urgency=medium
     option.
   * Refresh patches.
   * Update phonon_is_not_forced_in_KDE patch
+  * Import upstream patch:
+    upstream_dont_allocate_a_char_with_undefined_size
+  * Import upstream patch: upstream_fix_build_with_qt_5.4.2
 
  -- Maximiliano Curia <maxy@debian.org>  Sat, 08 Aug 2015 17:14:09 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 0afc6c3..c1752f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ do_not_assume_existing_backend.patch
 phonon-inc.patch
 phonon_is_not_forced_in_KDE.diff
 findqt4_optional_x11.diff
+upstream_dont_allocate_a_char_with_undefined_size
+upstream_fix_build_with_qt_5.4.2
diff --git a/debian/patches/upstream_dont_allocate_a_char_with_undefined_size b/debian/patches/upstream_dont_allocate_a_char_with_undefined_size
new file mode 100644
index 0000000..299b341
--- /dev/null
+++ b/debian/patches/upstream_dont_allocate_a_char_with_undefined_size
@@ -0,0 +1,21 @@
+commit e321435ac993e5e0a280263a1c702cec2b671e7c
+Author: Sergio Martins <iamsergio@gmail.com>
+Date:   Sat May 2 23:15:00 2015 +0100
+
+    Don't allocate a char[] with an undefined size.
+    
+    packetSize is still undefined at this point.
+
+diff --git a/phonon/experimental/packetpool.cpp b/phonon/experimental/packetpool.cpp
+index a1effe1..8ebe134 100644
+--- a/phonon/experimental/packetpool.cpp
++++ b/phonon/experimental/packetpool.cpp
+@@ -35,7 +35,7 @@ int PacketPool::unusedPackets() const { return d_ptr->ringBufferSize; }
+ 
+ PacketPoolPrivate::PacketPoolPrivate(int _packetSize, int _poolSize)
+     : freePackets(new PacketPrivate *[_poolSize]),
+-    packetMemory(new char[packetSize * _poolSize]),
++    packetMemory(new char[_packetSize * _poolSize]),
+     readPosition(0), writePosition(0),
+     ringBufferSize(_poolSize),
+     packetSize(_packetSize),
diff --git a/debian/patches/upstream_fix_build_with_qt_5.4.2 b/debian/patches/upstream_fix_build_with_qt_5.4.2
new file mode 100644
index 0000000..18eadc8
--- /dev/null
+++ b/debian/patches/upstream_fix_build_with_qt_5.4.2
@@ -0,0 +1,30 @@
+commit e5b7ede37a9c89b0ec69ee2be7c219a79e836fe1
+Author: Hrvoje Senjan <hrvoje.senjan@gmail.com>
+Date:   Tue May 26 20:43:05 2015 +0200
+
+    Fix build with Qt >= 5.4.2
+    
+    Or with commit 3eca75d cherry picked. Qt will now require using
+    -fPIC flag for it's consumers. For cmake Qt5Core exports the flag in
+    it's public interface, but since visibility try_compile test
+    does not link against any lib, we need to pass collected CMAKE_CXX_FLAGS
+    (which have gathered -fPIC flag at that phase)
+    
+    This, for now only resolves the issue with gcc builds.
+    Other compilers will need to be checked.
+    
+    REVIEW: 123874
+
+diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
+index 44862b5..1d98f27 100644
+--- a/cmake/FindPhononInternal.cmake
++++ b/cmake/FindPhononInternal.cmake
+@@ -409,7 +409,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+       file(WRITE "${_source_file}" "${_source}")
+       set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
+ 
+-      try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
++      try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS} ${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
+ 
+       if(NOT _compile_result)
+          message("${_compile_output_var}")