From c16f3efb9e5dee0cf26b3a7795cc556ba13d818a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Apr 21 2016 18:37:37 +0000
Subject: phonon-4.9.0, disable qzeitgeist support


---

diff --git a/.gitignore b/.gitignore
index a3242c1..cb7a885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /phonon-4.8.3.tar.xz
+/phonon-4.9.0.tar.xz
diff --git a/0001-rename-phonon-meta-include-file-in-the-source-and-in.patch b/0001-rename-phonon-meta-include-file-in-the-source-and-in.patch
deleted file mode 100644
index 8129fd3..0000000
--- a/0001-rename-phonon-meta-include-file-in-the-source-and-in.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From ff981c63c88936d52f76e8604f9a06e38191741e Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Sat, 10 Jan 2015 11:36:51 +0100
-Subject: [PATCH 1/5] rename phonon meta include file in the source and instead
- rename on-install
-
-having phonon and Phonon in the same source dir screws with
-case-insensitive operating systems.
-
-note: this still is a problem if one installs as on the target it would
-still be the same setup with both cased files in the same directory.
-searching for the actual include lineup that debian was trying to solve
-appears as though it actualy never existed, so I am actually not sure
-where one should put the header to avoid this. perhaps it'd be best to
-simply not offer the compat option on !linux. it does certainly make a
-lot less sense on other systems anyway.
-
-CCMAIL: kde-mac@kde.org
----
- includes/CMakeLists.txt          | 18 +++++++++++++++---
- includes/old/phonon              | 35 -----------------------------------
- includes/old/phonon_meta_include | 35 +++++++++++++++++++++++++++++++++++
- 3 files changed, 50 insertions(+), 38 deletions(-)
- delete mode 100644 includes/old/phonon
- create mode 100644 includes/old/phonon_meta_include
-
-diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
-index 857fd4e..c27376a 100644
---- a/includes/CMakeLists.txt
-+++ b/includes/CMakeLists.txt
-@@ -91,10 +91,22 @@ set(COMPAT_HEADERS
-     old/Phonon/VolumeFaderInterface
-     old/Phonon/VolumeSlider
- )
--install(FILES ${COMPAT_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel)
-+
-+install(FILES ${COMPAT_HEADERS}
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon
-+    COMPONENT Devel)
-+# FIXME: phonon/Phonon (dir) and phonon/phonon (file) conflict on case-insensitive
-+#        systems if one enables this
- if (PHONON_INSTALL_QT_COMPAT_HEADERS)
--    install(FILES ${COMPAT_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon COMPONENT Devel) # <Phonon/Foo>
--    install(FILES old/phonon DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel) # <phonon/phonon> meta-include
-+    # <Phonon/Foo>
-+    install(FILES ${COMPAT_HEADERS}
-+        DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon
-+        COMPONENT Devel)
-+    # <phonon/phonon> meta-include
-+    install(FILES old/phonon_meta_include
-+        DESTINATION ${INCLUDE_INSTALL_DIR}/phonon
-+        COMPONENT Devel
-+        RENAME phonon)
- endif()
- 
- if (PHONON_BUILD_EXPERIMENTAL)
-diff --git a/includes/old/phonon b/includes/old/phonon
-deleted file mode 100644
-index 82522bf..0000000
---- a/includes/old/phonon
-+++ /dev/null
-@@ -1,35 +0,0 @@
--// This is a compatibility include for QtPhonon. It should not be used
--// in new software!
--
--#include "abstractaudiooutput.h"
--#include "abstractmediastream.h"
--#include "abstractvideooutput.h"
--#include "addoninterface.h"
--#include "audiooutput.h"
--#include "audiooutputinterface.h"
--#include "backendcapabilities.h"
--#include "backendinterface.h"
--#include "effect.h"
--#include "effectinterface.h"
--#include "effectparameter.h"
--#include "effectwidget.h"
--#include "globaldescriptioncontainer.h"
--#include "mediacontroller.h"
--#include "medianode.h"
--#include "mediaobject.h"
--#include "mediaobjectinterface.h"
--#include "mediasource.h"
--#include "objectdescription.h"
--#include "objectdescriptionmodel.h"
--#include "path.h"
--#include "phonondefs.h"
--#include "phononnamespace.h"
--#include "platformplugin.h"
--#include "seekslider.h"
--#include "streaminterface.h"
--#include "videoplayer.h"
--#include "videowidget.h"
--#include "videowidgetinterface.h"
--#include "volumefadereffect.h"
--#include "volumefaderinterface.h"
--#include "volumeslider.h"
-diff --git a/includes/old/phonon_meta_include b/includes/old/phonon_meta_include
-new file mode 100644
-index 0000000..82522bf
---- /dev/null
-+++ b/includes/old/phonon_meta_include
-@@ -0,0 +1,35 @@
-+// This is a compatibility include for QtPhonon. It should not be used
-+// in new software!
-+
-+#include "abstractaudiooutput.h"
-+#include "abstractmediastream.h"
-+#include "abstractvideooutput.h"
-+#include "addoninterface.h"
-+#include "audiooutput.h"
-+#include "audiooutputinterface.h"
-+#include "backendcapabilities.h"
-+#include "backendinterface.h"
-+#include "effect.h"
-+#include "effectinterface.h"
-+#include "effectparameter.h"
-+#include "effectwidget.h"
-+#include "globaldescriptioncontainer.h"
-+#include "mediacontroller.h"
-+#include "medianode.h"
-+#include "mediaobject.h"
-+#include "mediaobjectinterface.h"
-+#include "mediasource.h"
-+#include "objectdescription.h"
-+#include "objectdescriptionmodel.h"
-+#include "path.h"
-+#include "phonondefs.h"
-+#include "phononnamespace.h"
-+#include "platformplugin.h"
-+#include "seekslider.h"
-+#include "streaminterface.h"
-+#include "videoplayer.h"
-+#include "videowidget.h"
-+#include "videowidgetinterface.h"
-+#include "volumefadereffect.h"
-+#include "volumefaderinterface.h"
-+#include "volumeslider.h"
--- 
-1.9.3
-
diff --git a/0002-Don-t-allocate-a-char-with-an-undefined-size.patch b/0002-Don-t-allocate-a-char-with-an-undefined-size.patch
deleted file mode 100644
index 1c2c114..0000000
--- a/0002-Don-t-allocate-a-char-with-an-undefined-size.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e321435ac993e5e0a280263a1c702cec2b671e7c Mon Sep 17 00:00:00 2001
-From: Sergio Martins <iamsergio@gmail.com>
-Date: Sat, 2 May 2015 23:15:00 +0100
-Subject: [PATCH 2/5] Don't allocate a char[] with an undefined size.
-
-packetSize is still undefined at this point.
----
- phonon/experimental/packetpool.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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),
--- 
-1.9.3
-
diff --git a/0003-Fix-build-with-Qt-5.4.2.patch b/0003-Fix-build-with-Qt-5.4.2.patch
deleted file mode 100644
index ee645bb..0000000
--- a/0003-Fix-build-with-Qt-5.4.2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e5b7ede37a9c89b0ec69ee2be7c219a79e836fe1 Mon Sep 17 00:00:00 2001
-From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
-Date: Tue, 26 May 2015 20:43:05 +0200
-Subject: [PATCH 3/5] 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
----
- cmake/FindPhononInternal.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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}")
--- 
-1.9.3
-
diff --git a/0004-Specify-_include-dirs-as-INCLUDE_DIRECTORIES.patch b/0004-Specify-_include-dirs-as-INCLUDE_DIRECTORIES.patch
deleted file mode 100644
index a2b3cad..0000000
--- a/0004-Specify-_include-dirs-as-INCLUDE_DIRECTORIES.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 33df08b7046c2da7d9559e71620fc89ebf179429 Mon Sep 17 00:00:00 2001
-From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
-Date: Tue, 26 May 2015 21:02:58 +0200
-Subject: [PATCH 4/5] Specify _include dirs as INCLUDE_DIRECTORIES.
-
-It appears try_compile's CMAKE_FLAGS will take only one argument.
-Fixes build with includes in non-standard paths.
-
-CCMAIL: sitter@kde.org
----
- cmake/FindPhononInternal.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
-index 1d98f27..aced185 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 "${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_DIRECTORIES "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
- 
-       if(NOT _compile_result)
-          message("${_compile_output_var}")
--- 
-1.9.3
-
diff --git a/0005-Yet-another-_include_dirs-fix.patch b/0005-Yet-another-_include_dirs-fix.patch
deleted file mode 100644
index fb5abc7..0000000
--- a/0005-Yet-another-_include_dirs-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 635b65fa417f49ac4ae189e926bf138efc6544d6 Mon Sep 17 00:00:00 2001
-From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
-Date: Thu, 28 May 2015 17:56:47 +0200
-Subject: [PATCH 5/5] Yet another _include_dirs fix
-
-The variable is set as a definition, so mark it as such
----
- cmake/FindPhononInternal.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
-index aced185..9f6ab40 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 "${CMAKE_CXX_FLAGS}" INCLUDE_DIRECTORIES "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
-+      try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
- 
-       if(NOT _compile_result)
-          message("${_compile_output_var}")
--- 
-1.9.3
-
diff --git a/phonon-4.7.0-rpath_use_link_path.patch b/phonon-4.7.0-rpath_use_link_path.patch
deleted file mode 100644
index c1fcc03..0000000
--- a/phonon-4.7.0-rpath_use_link_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up phonon-4.7.0/cmake/FindPhononInternal.cmake.fix-rpath phonon-4.7.0/cmake/FindPhononInternal.cmake
---- phonon-4.7.0/cmake/FindPhononInternal.cmake.fix-rpath	2013-11-15 07:38:14.447106838 -0600
-+++ phonon-4.7.0/cmake/FindPhononInternal.cmake	2013-11-15 07:39:07.616134963 -0600
-@@ -216,7 +216,6 @@ endif(APPLE)
- # These two options below make it set the RPATH of the installed targets to all
- # RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
- # install directory. Alex
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
- set(_abs_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}")
- if (NOT IS_ABSOLUTE "${_abs_LIB_INSTALL_DIR}")
-    set(_abs_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
-@@ -224,6 +223,7 @@ endif()
- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
- list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemCxxLibDir)
- if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
-+   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
-    set(CMAKE_INSTALL_RPATH "${_abs_LIB_INSTALL_DIR}")
- endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
- 
diff --git a/phonon-4.8.3-cmake_wtf.patch b/phonon-4.8.3-cmake_wtf.patch
deleted file mode 100644
index d4e9d38..0000000
--- a/phonon-4.8.3-cmake_wtf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 <QtCore/QtGlobal>\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-DEFAULT_SOURCE.patch b/phonon-DEFAULT_SOURCE.patch
index 440f7cf..d245933 100644
--- a/phonon-DEFAULT_SOURCE.patch
+++ b/phonon-DEFAULT_SOURCE.patch
@@ -1,7 +1,8 @@
-diff -up phonon-4.8.3/cmake/FindPhononInternal.cmake.DEFAULT_SOURCE phonon-4.8.3/cmake/FindPhononInternal.cmake
---- phonon-4.8.3/cmake/FindPhononInternal.cmake.DEFAULT_SOURCE	2016-04-03 13:07:19.940647305 -0500
-+++ phonon-4.8.3/cmake/FindPhononInternal.cmake	2016-04-03 13:08:42.382258549 -0500
-@@ -242,7 +242,7 @@ endif (NOT _phonon_uninstall_target_crea
+diff -up phonon-4.9.0/cmake/FindPhononInternal.cmake.DEFAULT_SOURCE phonon-4.9.0/cmake/FindPhononInternal.cmake
+diff -up phonon-4.9.0/cmake/PhononQt4.cmake.DEFAULT_SOURCE phonon-4.9.0/cmake/PhononQt4.cmake
+--- phonon-4.9.0/cmake/PhononQt4.cmake.DEFAULT_SOURCE	2016-04-17 23:25:17.000000000 -0500
++++ phonon-4.9.0/cmake/PhononQt4.cmake	2016-04-21 12:56:35.156204422 -0500
+@@ -105,7 +105,7 @@ set(CMAKE_MODULE_PATH ${_phonon_cmake_mo
  
  if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
     if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
@@ -10,7 +11,7 @@ diff -up phonon-4.8.3/cmake/FindPhononInternal.cmake.DEFAULT_SOURCE phonon-4.8.3
        set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
        set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
  
-@@ -257,7 +257,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux OR C
+@@ -120,7 +120,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux OR C
        endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile)
     endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     if (CMAKE_C_COMPILER MATCHES "icc")
@@ -19,7 +20,7 @@ diff -up phonon-4.8.3/cmake/FindPhononInternal.cmake.DEFAULT_SOURCE phonon-4.8.3
        set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
        set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
     endif (CMAKE_C_COMPILER MATCHES "icc")
-@@ -342,7 +342,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -205,7 +205,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
       # It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS})
       # and also because it is/was needed by glibc for snprintf to be available when building C files.
       # See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c.
diff --git a/phonon-rpath_use_link_path.patch b/phonon-rpath_use_link_path.patch
new file mode 100644
index 0000000..941a59f
--- /dev/null
+++ b/phonon-rpath_use_link_path.patch
@@ -0,0 +1,19 @@
+diff -up phonon-4.9.0/cmake/PhononQt4.cmake.rpath phonon-4.9.0/cmake/PhononQt4.cmake
+--- phonon-4.9.0/cmake/PhononQt4.cmake.rpath	2016-04-21 13:00:50.788470084 -0500
++++ phonon-4.9.0/cmake/PhononQt4.cmake	2016-04-21 13:04:39.194600944 -0500
+@@ -33,7 +33,6 @@
+ # These two options below make it set the RPATH of the installed targets to all
+ # RPATH directories outside the current CMAKE_BINARY_DIR and also the library
+ # install directory. Alex
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+ set(_abs_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}")
+ if (NOT IS_ABSOLUTE "${_abs_LIB_INSTALL_DIR}")
+    set(_abs_LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
+@@ -41,6 +40,7 @@ endif()
+ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
+ list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${_abs_LIB_INSTALL_DIR}" _isSystemCxxLibDir)
+ if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
++   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+    set(CMAKE_INSTALL_RPATH "${_abs_LIB_INSTALL_DIR}")
+ endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
+ 
diff --git a/phonon.spec b/phonon.spec
index 8a8bc2b..90bd628 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -3,46 +3,36 @@
 # unresolvable dependency on phonon-backend (and friends)
 #define bootstrap 1
 
-%if 0%{?fedora}
+%if 0
 # enable zeitgeist support
 %define zeitgeist 1
 %endif
 
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.8.3
-Release: 12%{?dist}
+Version: 4.9.0
+Release: 1%{?dist}
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-%if 0%{?snap}
-Source0: phonon-%{version}-%{snap}.tar.xz
-%else
+
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
 %global stable unstable
 %else
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/phonon/%{version}/src/phonon-%{version}.tar.xz
-%endif
-
-Patch0: phonon-4.7.0-rpath_use_link_path.patch 
+Source0: http://download.kde.org/%{stable}/phonon/%{version}/phonon-%{version}.tar.xz
 
 ## upstream patches
-Patch1: 0001-rename-phonon-meta-include-file-in-the-source-and-in.patch
-Patch2: 0002-Don-t-allocate-a-char-with-an-undefined-size.patch
-Patch3: 0003-Fix-build-with-Qt-5.4.2.patch
-Patch4: 0004-Specify-_include-dirs-as-INCLUDE_DIRECTORIES.patch
-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
-
+Patch10: phonon-rpath_use_link_path.patch
+Patch11: phonon-DEFAULT_SOURCE.patch
 
 BuildRequires: automoc4 >= 0.9.86
-BuildRequires: cmake >= 2.6.9
+BuildRequires: cmake >= 2.8.9
+BuildRequires: extra-cmake-modules
+BuildRequires: kf5-rpm-macros
 BuildRequires: kde-filesystem
 BuildRequires: pkgconfig
 BuildRequires: pkgconfig(glib-2.0)
@@ -50,12 +40,12 @@ BuildRequires: pkgconfig(libpulse-mainloop-glib) > 0.9.15
 BuildRequires: pkgconfig(libxml-2.0)
 # Qt4
 BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDesigner) pkgconfig(QtOpenGL) pkgconfig(QtDeclarative) 
-# Qt5
-BuildRequires: pkgconfig(Qt5DBus) pkgconfig(Qt5Designer) pkgconfig(Qt5OpenGL) pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(Qt5Declarative)
 %if 0%{?zeitgeist}
 BuildRequires: pkgconfig(QZeitgeist)
 %endif
+# Qt5
+BuildRequires: pkgconfig(Qt5DBus) pkgconfig(Qt5Designer) pkgconfig(Qt5OpenGL) pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5Declarative)
 BuildRequires: pkgconfig(xcb)
 
 %global pulseaudio_version %((pkg-config --modversion libpulse 2>/dev/null || echo 0.9.15) | cut -d- -f1)
@@ -67,6 +57,7 @@ Provides: phonon-backend%{?_isa} = 4.7
 Requires: phonon-backend%{?_isa} => 4.7
 %endif
 Requires: pulseaudio-libs%{?_isa} >= %{pulseaudio_version}
+
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 Provides:  phonon-experimental = %{version}-%{release}
@@ -116,7 +107,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 mkdir %{_target_platform}-Qt5
 pushd %{_target_platform}-Qt5
-%{cmake} .. \
+%{cmake_kf5} .. \
   -DCMAKE_BUILD_TYPE:STRING="Release" \
   -DPHONON_BUILD_PHONON4QT5:BOOL=ON \
   -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON
@@ -198,7 +189,7 @@ end
 %dir %{_datadir}/phonon4qt5
 %{_libdir}/libphonon4qt5.so.4*
 %{_libdir}/libphonon4qt5experimental.so.4*
-%{_qt5_plugindir}/designer/libphononwidgets.so
+%{_qt5_plugindir}/designer/phononwidgets.so
 %dir %{_qt5_plugindir}/phonon4qt5_backend/
 
 %files qt5-devel
@@ -214,6 +205,9 @@ end
 
 
 %changelog
+* Thu Apr 21 2016 Rex Dieter <rdieter@fedoraproject.org> - 4.9.0-1
+- phonon-4.9.0, disable qzeitgeist support
+
 * Wed Apr 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 4.8.3-12
 - rebuild (qt5)
 
diff --git a/sources b/sources
index 7183f4c..35a3aab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88bb9867261803eed61ff53a7c026338  phonon-4.8.3.tar.xz
+8abeb7b1eaf4935668c7fb441fc2491a  phonon-4.9.0.tar.xz