From 4bc61018eec54dbe50e7556ce01d2ef2859b2c9f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 9 Feb 2012 23:14:54 +0000 Subject: Thu Feb 9 23:14:54 UTC 2012 --- extra/phonon/PKGBUILD | 15 ++++++++++----- extra/phonon/fix-plugindir-for-qt-app.patch | 11 +++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 extra/phonon/fix-plugindir-for-qt-app.patch (limited to 'extra/phonon') diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index ac5f39602..4b8e99ac5 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145472 2011-12-22 22:17:38Z andrea $ +# $Id: PKGBUILD 149569 2012-02-08 14:44:08Z andrea $ # Maintainer: Andrea Scarpino pkgname=phonon pkgver=4.6.0 -pkgrel=1 +pkgrel=2 epoch=1 arch=('i686' 'x86_64') url='http://phonon.kde.org/' @@ -12,17 +12,22 @@ pkgdesc="The multimedia framework for KDE" depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') optdepends=('pulseaudio: PulseAudio support') makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'fix-plugindir-for-qt-app.patch') +md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173' + 'e37d67038c2501f25ac7ee7c2de54a9a') build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \ -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer make diff --git a/extra/phonon/fix-plugindir-for-qt-app.patch b/extra/phonon/fix-plugindir-for-qt-app.patch new file mode 100644 index 000000000..376f294f7 --- /dev/null +++ b/extra/phonon/fix-plugindir-for-qt-app.patch @@ -0,0 +1,11 @@ +--- a/phonon/CMakeLists.txt ++++ b/phonon/CMakeLists.txt +@@ -78,7 +78,7 @@ if (PHONON_NO_PLATFORMPLUGIN) + add_definitions(-DQT_NO_PHONON_PLATFORMPLUGIN) + endif (PHONON_NO_PLATFORMPLUGIN) + +-add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins") ++add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins") + + automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS}) + target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -- cgit v1.2.3-54-g00ecf