From 24d0263a0ac516ccc86df09146449fb040fb3689 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 28 Oct 2012 01:42:55 -0700
Subject: Sun Oct 28 01:42:24 PDT 2012

---
 extra/phonon/PKGBUILD        | 17 ++++++++++-------
 extra/phonon/fix-qmake.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 extra/phonon/fix-qmake.patch

(limited to 'extra/phonon')

diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index 4b8e99ac5..64418b965 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149569 2012-02-08 14:44:08Z andrea $
+# $Id: PKGBUILD 169725 2012-10-27 10:50:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
 pkgver=4.6.0
-pkgrel=2
+pkgrel=3
 epoch=1
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org/'
@@ -13,15 +13,18 @@ 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"
-        'fix-plugindir-for-qt-app.patch')
+        'fix-plugindir-for-qt-app.patch'
+        'fix-qmake.patch')
 md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
-         'e37d67038c2501f25ac7ee7c2de54a9a')
+         'e37d67038c2501f25ac7ee7c2de54a9a'
+         'c17d8617e9482f02b3e098842946b679')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
+  patch -p1 -i "${srcdir}"/fix-qmake.patch
+  cd ../
 
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -34,6 +37,6 @@ build() {
 }
 
 package(){
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/phonon/fix-qmake.patch b/extra/phonon/fix-qmake.patch
new file mode 100644
index 000000000..2add588d4
--- /dev/null
+++ b/extra/phonon/fix-qmake.patch
@@ -0,0 +1,27 @@
+From: Oswald Buddenhagen <ossi@kde.org>
+Date: Sat, 27 Oct 2012 07:58:16 +0000
+Subject: remove unnecessary if() statement
+X-Git-Url: http://quickgit.kde.org/?p=phonon.git&amp;a=commitdiff&amp;h=a8c431494d2a6f3785c132f14d00d38ea0e5b328
+---
+remove unnecessary if() statement
+
+as it happens, this works around a qmake breakage relating to parsing if()
+
+BUG: 295037
+FIXED-IN: 4.6.1
+---
+
+
+--- a/qt_phonon.pri
++++ b/qt_phonon.pri
+@@ -3,7 +3,7 @@
+ # the next build of Qt. So pretend we're not there in this case.
+ # This file is loaded by qt_config.prf, before .qmake.cache has been loaded.
+ # Consequently, we have to do some stunts to get values out of the cache.
+-if(!exists($$_QMAKE_CACHE_)| \
+-   !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
++!exists($$_QMAKE_CACHE_)| \
++   !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \
+     QT_CONFIG += phonon
+ 
+
-- 
cgit v1.2.3-54-g00ecf