diff options
| author | Johannes Huber <johu@gentoo.org> | 2013-11-11 21:26:59 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-11-11 21:26:59 +0100 |
| commit | dbdc919855dfa4a86c802dd46b890bdae16c5b2a (patch) | |
| tree | 8934c8e72d79bf65b9a49dafab4cb548a30eb3cb | |
| parent | ef5fdffc053431f14dd28ef4caf79733842d3cd4 (diff) | |
| download | kde-dbdc919855dfa4a86c802dd46b890bdae16c5b2a.tar.gz kde-dbdc919855dfa4a86c802dd46b890bdae16c5b2a.tar.bz2 kde-dbdc919855dfa4a86c802dd46b890bdae16c5b2a.zip | |
[media-libs/phonon] Fix install path for qt4 plugins wrt bug #476026.
Package-Manager: portage-2.2.7
| -rw-r--r-- | media-libs/phonon/files/phonon-4.7.0-plugin-install.patch | 13 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-9999.ebuild | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch b/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch new file mode 100644 index 00000000000..5f478cac18c --- /dev/null +++ b/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake +index 3245e9b..3427c62 100644 +--- a/cmake/FindPhononInternal.cmake ++++ b/cmake/FindPhononInternal.cmake +@@ -178,7 +178,7 @@ if (PHONON_BUILD_PHONON4QT5) + endif (PHONON_BUILD_PHONON4QT5) + set(BIN_INSTALL_DIR "bin" ) # CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)") + set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" ) # CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed" +-set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)") ++set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt4" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt4)") + if (PHONON_BUILD_PHONON4QT5) + set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE) + endif(PHONON_BUILD_PHONON4QT5) diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild index 988fd08ca4f..03630c41187 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-9999.ebuild @@ -26,6 +26,7 @@ COMMON_DEPEND=" !!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore:4 + dev-qt/designer:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qttest:4 @@ -61,6 +62,8 @@ REQUIRED_USE=" zeitgeist? ( qt4 ) " +PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) + pkg_setup() { MULTIBUILD_VARIANTS=() if use qt4; then @@ -74,6 +77,7 @@ pkg_setup() { src_configure() { myconfigure() { local mycmakeargs=( + -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE $(cmake-utils_use_with pulseaudio GLIB2) $(cmake-utils_use_with pulseaudio PulseAudio) ) |