[arch-commits] Commit in phonon/trunk (PKGBUILD fix-qmake.patch)

[Andrea Scarpino]

    Date: Saturday, October 27, 2012 @ 06:29:38
  Author: andrea
Revision: 169723

Fix qmake syntax (FS#32141)

Added:
  phonon/trunk/fix-qmake.patch
Modified:
  phonon/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   12 +++++++-----
 fix-qmake.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-27 06:52:55 UTC (rev 169722)
+++ PKGBUILD	2012-10-27 10:29:38 UTC (rev 169723)
@@ -3,7 +3,7 @@
 
 pkgname=phonon
 pkgver=4.6.0
-pkgrel=2
+pkgrel=3
 epoch=1
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org/'
@@ -15,13 +15,15 @@
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
         'fix-plugindir-for-qt-app.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 +36,6 @@
 }
 
 package(){
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }

Added: fix-qmake.patch
===================================================================
--- fix-qmake.patch	                        (rev 0)
+++ fix-qmake.patch	2012-10-27 10:29:38 UTC (rev 169723)
@@ -0,0 +1,27 @@
+From: Oswald Buddenhagen <ossi at 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&a=commitdiff&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
+ 
+