From f1946e4c455eaf52c6bcc49a0781d2d4dd116690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Tue, 28 Jul 2015 23:53:39 +0300 Subject: [PATCH] phonon-qt5 fixed. --- desktop/kde/phonon/qt5-phonon/actions.py | 7 ++++-- .../phonon/qt5-phonon/files/qt-5.4.2.patch | 23 +++++++++++++++++++ desktop/kde/phonon/qt5-phonon/pspec.xml | 3 +++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 desktop/kde/phonon/qt5-phonon/files/qt-5.4.2.patch diff --git a/desktop/kde/phonon/qt5-phonon/actions.py b/desktop/kde/phonon/qt5-phonon/actions.py index 03991fc61b..c0ec460f79 100644 --- a/desktop/kde/phonon/qt5-phonon/actions.py +++ b/desktop/kde/phonon/qt5-phonon/actions.py @@ -9,10 +9,13 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - kde5.configure("-DPHONON_BUILD_PHONON4QT5=ON \ + kde5.configure("-DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \ -DPHONON_BUILD_PHONON4QT5=ON \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib/qt5") + -D__KDE_HAVE_GCC_VISIBILITY=NO \ + -DCMAKE_INSTALL_LIBDIR=lib") def build(): kde5.make() diff --git a/desktop/kde/phonon/qt5-phonon/files/qt-5.4.2.patch b/desktop/kde/phonon/qt5-phonon/files/qt-5.4.2.patch new file mode 100644 index 0000000000..f4231e3dac --- /dev/null +++ b/desktop/kde/phonon/qt5-phonon/files/qt-5.4.2.patch @@ -0,0 +1,23 @@ +From: Hrvoje Senjan +Date: Thu, 28 May 2015 15:56:47 +0000 +Subject: Yet another _include_dirs fix +X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=635b65fa417f49ac4ae189e926bf138efc6544d6 +--- +Yet another _include_dirs fix + +The variable is set as a definition, so mark it as such +--- + + +--- a/cmake/FindPhononInternal.cmake ++++ b/cmake/FindPhononInternal.cmake +@@ -409,7 +409,7 @@ + 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}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) + + if(NOT _compile_result) + message("${_compile_output_var}") + diff --git a/desktop/kde/phonon/qt5-phonon/pspec.xml b/desktop/kde/phonon/qt5-phonon/pspec.xml index 2b7b910e73..5febe24458 100644 --- a/desktop/kde/phonon/qt5-phonon/pspec.xml +++ b/desktop/kde/phonon/qt5-phonon/pspec.xml @@ -24,6 +24,9 @@ cmake + + qt-5.4.2.patch +