phonon-qt5 fixed.

This commit is contained in:
Ertuğrul Erata
2015-07-28 23:53:39 +03:00
parent 97c92dc3fc
commit f1946e4c45
3 changed files with 31 additions and 2 deletions
+5 -2
View File
@@ -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()
@@ -0,0 +1,23 @@
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
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}")
+3
View File
@@ -24,6 +24,9 @@
<Dependency>cmake</Dependency>
<!--Dependency>xine-lib-devel</Dependency-->
</BuildDependencies>
<Patches>
<Patch>qt-5.4.2.patch</Patch>
</Patches>
</Source>
<Package>