[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.8.0-4-20-ge1cd139

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=8315ff4

The following commit has been merged in the master branch:
commit 8315ff442ed8ca2a3b54530cd04210908d5f28ab
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Aug 8 19:36:07 2015 +0200

    New patch: fix_include_dirs
---
 debian/changelog                |  1 +
 debian/patches/fix_include_dirs | 26 ++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1283843..7cb02f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ phonon (4:4.8.3-1~) UNRELEASED; urgency=medium
   * Import upstream patch:
     upstream_dont_allocate_a_char_with_undefined_size
   * Import upstream patch: upstream_fix_build_with_qt_5.4.2
+  * New patch: fix_include_dirs
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 08 Aug 2015 17:14:09 +0200
 
diff --git a/debian/patches/fix_include_dirs b/debian/patches/fix_include_dirs
new file mode 100644
index 0000000..be8051e
--- /dev/null
+++ b/debian/patches/fix_include_dirs
@@ -0,0 +1,26 @@
+Index: phonon/cmake/FindPhononInternal.cmake
+===================================================================
+--- phonon.orig/cmake/FindPhononInternal.cmake	2015-08-08 19:31:07.325120567 +0200
++++ phonon/cmake/FindPhononInternal.cmake	2015-08-08 20:49:39.430450988 +0200
+@@ -399,6 +399,10 @@
+       string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}")
+    endif (GCC_IS_NEWER_THAN_4_1)
+ 
++   if (PHONON_BUILD_PHONON4QT5) # Qt5
++     string (REPLACE "-fPIE" "-fPIC" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++   endif(PHONON_BUILD_PHONON4QT5)
++
+    if (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32)
+       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+       set (KDE4_C_FLAGS "-fvisibility=hidden")
+@@ -409,7 +413,9 @@
+       file(WRITE "${_source_file}" "${_source}")
+       set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
+ 
+-      try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_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}")
diff --git a/debian/patches/series b/debian/patches/series
index c1752f1..ea16f4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ 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
+fix_include_dirs

-- 
Phonon Multimedia Framework packaging