From d598202369c5b179a621012f018a9213007fa5a1 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 9 Nov 2015 20:17:55 -0200 Subject: [PATCH 1/2] phonon: Fix building with Qt 5.4.2 or newer 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 commit includes a backported patch from upcoming 4.9.0 release, also included in the 4.8 maintenance branch. Signed-off-by: Otavio Salvador --- .../phonon/files/fix-qt-5.4.2-or-newer.patch | 32 +++++++++++++++++++ recipes-kde/other/phonon/phonon_4.8.3.bb | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 recipes-kde/other/phonon/files/fix-qt-5.4.2-or-newer.patch diff --git a/recipes-kde/other/phonon/files/fix-qt-5.4.2-or-newer.patch b/recipes-kde/other/phonon/files/fix-qt-5.4.2-or-newer.patch new file mode 100644 index 00000000..30c0b04d --- /dev/null +++ b/recipes-kde/other/phonon/files/fix-qt-5.4.2-or-newer.patch @@ -0,0 +1,32 @@ +From: Hrvoje Senjan +Date: Tue, 26 May 2015 18:43:05 +0000 +Subject: Fix build with Qt >= 5.4.2 +X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=e5b7ede37a9c89b0ec69ee2be7c219a79e836fe1 +--- +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 + +--- +Upstream-Status: Backport [4.8.4] +--- 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} ${_include_dirs}" OUTPUT_VARIABLE _compile_output_var) + + if(NOT _compile_result) + message("${_compile_output_var}") + diff --git a/recipes-kde/other/phonon/phonon_4.8.3.bb b/recipes-kde/other/phonon/phonon_4.8.3.bb index 2088f4dc..520db7f0 100644 --- a/recipes-kde/other/phonon/phonon_4.8.3.bb +++ b/recipes-kde/other/phonon/phonon_4.8.3.bb @@ -9,11 +9,12 @@ inherit kde-base cmake-lib SRC_URI = " \ http://download.kde.org/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz \ file://0001-fix-PHONON_LIBRARY_PATH-was-usr-usr-lib-qt5-plugins.patch \ + file://fix-qt-5.4.2-or-newer.patch \ " SRC_URI[md5sum] = "88bb9867261803eed61ff53a7c026338" SRC_URI[sha256sum] = "a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16" -EXTRA_OECMAKE += "-DPHONON_BUILD_DEMOS=ON -DPHONON_BUILD_PHONON4QT5=ON" +EXTRA_OECMAKE += "-DPHONON_BUILD_DEMOS=ON -DPHONON_BUILD_PHONON4QT5=ON -D__KDE_HAVE_GCC_VISIBILITY=NO" # qml-plugin broken currently! PACKAGECONFIG[qml-plugin] = "-DPHONON_BUILD_DECLARATIVE_PLUGIN=ON,-DPHONON_BUILD_DECLARATIVE_PLUGIN=OFF,qtquick1" From 20e75bda4984902dc8e02756d3fdcaf7151bcc4d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 9 Nov 2015 20:19:27 -0200 Subject: [PATCH 2/2] libdbusmenu-qt5: Disable documentation generation To avoid adding Doxygen as dependency, the documentation generation is disabled now. Signed-off-by: Otavio Salvador --- .../libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+14.10.20140619.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+14.10.20140619.bb b/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+14.10.20140619.bb index 11ccb193..7cde1c82 100644 --- a/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+14.10.20140619.bb +++ b/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+14.10.20140619.bb @@ -13,6 +13,7 @@ S = "${WORKDIR}/libdbusmenu-qt-${PV}" EXTRA_OECMAKE += " \ -DUSE_QT5=On \ + -DWITH_DOC=OFF \ " do_install_append() {