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

[Andrea Scarpino]

    Date: Thursday, March 4, 2010 @ 07:40:01
  Author: andrea
Revision: 71110

upgpkg: pyqt 4.7.0-3
added Phonon and QtOpenGL modules (FS#18305)

Added:
  pyqt/trunk/fix-phonon-detection.patch
Modified:
  pyqt/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   19 ++++++++++++++-----
 fix-phonon-detection.patch |   11 +++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-04 02:26:34 UTC (rev 71109)
+++ PKGBUILD	2010-03-04 12:40:01 UTC (rev 71110)
@@ -6,22 +6,28 @@
 pkgname=pyqt
 pkgver=4.7.0
 _pkgver=4.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of Python bindings for the Qt toolkit"
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-depends=('sip>=4.10' 'qscintilla>=2.4.1' 'dbus-python' 'openssl')
 license=('GPL')
+depends=('sip' 'qscintilla' 'dbus-python' 'openssl')
+makedepends=('phonon' 'python-opengl')
+optdepends=('phonon' 'python-opengl')
 provides=('pyqt4')
 replaces=('pyqt4')
 conflicts=('pyqt4')
-source=(http://riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-${_pkgver}.tar.gz)
-md5sums=('4882179ab4da128aaa8520f146afb955')
-options=('force')
+source=("http://riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-${_pkgver}.tar.gz"
+	'fix-phonon-detection.patch')
+md5sums=('4882179ab4da128aaa8520f146afb955'
+         '364e2c96c6b2b1d98167b2c8b110d64c')
 
 build() {
   cd ${srcdir}/PyQt-x11-gpl-${_pkgver}
   
+  # already fixed upstream
+  patch -Np1 -i ${srcdir}/fix-phonon-detection.patch || return 1
+
   python configure.py --confirm-license \
     -b /usr/bin \
     -d /usr/lib/python2.6/site-packages \
@@ -31,7 +37,10 @@
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
 
   make || return 1
+}
 
+package(){
+  cd ${srcdir}/PyQt-x11-gpl-${_pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install || return 1
 }

Added: fix-phonon-detection.patch
===================================================================
--- fix-phonon-detection.patch	                        (rev 0)
+++ fix-phonon-detection.patch	2010-03-04 12:40:01 UTC (rev 71110)
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.7/configure.py~	2010-03-04 04:54:35.000000000 +0100
++++ PyQt-x11-gpl-4.7/configure.py	2010-03-04 04:56:46.000000000 +0100
+@@ -362,7 +364,7 @@
+         check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
+         check_module("QtXml", "qdom.h", "new QDomDocument()")
+         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+-        check_module("phonon", "Phonon/VideoWidget",
++        check_module("phonon", "phonon/videowidget.h",
+                 "new Phonon::VideoWidget()")
+         check_module("QtAssistant", "qassistantclient.h",
+                 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
\ No newline at end of file