diff --git a/phonon-4.8.3-cmake_wtf.patch b/phonon-4.8.3-cmake_wtf.patch new file mode 100644 index 0000000..d4e9d38 --- /dev/null +++ b/phonon-4.8.3-cmake_wtf.patch @@ -0,0 +1,15 @@ +diff -up phonon-4.8.3/cmake/FindPhononInternal.cmake.rex phonon-4.8.3/cmake/FindPhononInternal.cmake +--- phonon-4.8.3/cmake/FindPhononInternal.cmake.rex 2016-04-01 11:11:25.077037757 -0500 ++++ phonon-4.8.3/cmake/FindPhononInternal.cmake 2016-04-01 11:12:15.480620454 -0500 +@@ -407,9 +407,9 @@ if (CMAKE_COMPILER_IS_GNUCXX) + set(_source "#include \n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n") + set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_visibility.cpp) + file(WRITE "${_source_file}" "${_source}") +- set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}") ++ set(_include_dirs "${QT_INCLUDES}") + +- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) ++ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" INCLUDE_DIRECTORIES "${_include_dirs}" LINK_LIBRARIES "${Qt5Core_LIBRARIES}" OUTPUT_VARIABLE _compile_output_var) + + if(NOT _compile_result) + message("${_compile_output_var}") diff --git a/phonon.spec b/phonon.spec index 6e522f1..a47ae6a 100644 --- a/phonon.spec +++ b/phonon.spec @@ -37,6 +37,9 @@ Patch5: 0005-Yet-another-_include_dirs-fix.patch ## upstreamable patches Patch100: phonon-DEFAULT_SOURCE.patch +# followup to patch4/patch5 above that do not quite get it right and support Qt-5.6 symbol versioning +Patch101: phonon-4.8.3-cmake_wtf.patch + BuildRequires: automoc4 >= 0.9.86 BuildRequires: cmake >= 2.6.9 @@ -212,7 +215,8 @@ end %changelog * Sun Apr 03 2016 Rex Dieter - 4.8.3-10 -- fix _BSD_SOURCE is deprecated warnings +- FindPhononInternal.cmake: fix _BSD_SOURCE is deprecated warnings +- FindPhononInternal.cmake: do proper includes, fix FTBFS using Qt-5.6 * Thu Feb 04 2016 Fedora Release Engineering - 4.8.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild