[arch-commits] Commit in phonon/trunk (PKGBUILD fix-plugindir-for-qt-app.patch)

[Andrea Scarpino]

    Date: Wednesday, February 8, 2012 @ 09:43:44
  Author: andrea
Revision: 149568

upgpkg: phonon 1:4.6.0-2

Fix platform plugin loading that is outside of a KDE session; FS(#27850)

Added:
  phonon/trunk/fix-plugindir-for-qt-app.patch
Modified:
  phonon/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   13 +++++++++----
 fix-plugindir-for-qt-app.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-08 14:42:49 UTC (rev 149567)
+++ PKGBUILD	2012-02-08 14:43:44 UTC (rev 149568)
@@ -3,7 +3,7 @@
 
 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 @@
 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

Added: fix-plugindir-for-qt-app.patch
===================================================================
--- fix-plugindir-for-qt-app.patch	                        (rev 0)
+++ fix-plugindir-for-qt-app.patch	2012-02-08 14:43:44 UTC (rev 149568)
@@ -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})