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

[Andrea Scarpino]

    Date: Sunday, March 21, 2010 @ 17:41:35
  Author: andrea
Revision: 73036

upgpkg: pyqt 4.7.2-1
upstream release

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-21 21:41:31 UTC (rev 73035)
+++ PKGBUILD	2010-03-21 21:41:35 UTC (rev 73036)
@@ -4,9 +4,9 @@
 # Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
 
 pkgname=pyqt
-pkgver=4.7.0
-_pkgver=4.7
-pkgrel=3
+pkgver=4.7.2
+_pkgver=4.7.2
+pkgrel=1
 pkgdesc="A set of Python bindings for the Qt toolkit"
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
@@ -17,17 +17,12 @@
 provides=('pyqt4')
 replaces=('pyqt4')
 conflicts=('pyqt4')
-source=("http://riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-${_pkgver}.tar.gz"
-	'fix-phonon-detection.patch')
-md5sums=('4882179ab4da128aaa8520f146afb955'
-         '364e2c96c6b2b1d98167b2c8b110d64c')
+source=("http://riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-${_pkgver}.tar.gz")
+md5sums=('e7782e9146ec8aa0e76bcdb0ca5b9491')
 
 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 \

Deleted: fix-phonon-detection.patch
===================================================================
--- fix-phonon-detection.patch	2010-03-21 21:41:31 UTC (rev 73035)
+++ fix-phonon-detection.patch	2010-03-21 21:41:35 UTC (rev 73036)
@@ -1,11 +0,0 @@
---- 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