[pkgsrc/trunk]: pkgsrc/x11/py-qt4 update to 4.5.4

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b5e2aa16cf9
branches:  trunk
changeset: 396641:2b5e2aa16cf9
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Jul 29 19:47:24 2009 +0000

description:
update to 4.5.4
changes: bugfixes

diffstat:

 x11/py-qt4/Makefile         |   4 ++--
 x11/py-qt4/distinfo         |  10 +++++-----
 x11/py-qt4/patches/patch-aa |  31 ++++++-------------------------
 3 files changed, 13 insertions(+), 32 deletions(-)

diffs (72 lines):

diff -r 6032f59257a9 -r 2b5e2aa16cf9 x11/py-qt4/Makefile
--- a/x11/py-qt4/Makefile       Wed Jul 29 19:44:51 2009 +0000
+++ b/x11/py-qt4/Makefile       Wed Jul 29 19:47:24 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2009/07/22 09:39:49 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/29 19:47:24 drochner Exp $
 #
 
 PKGNAME=               ${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=          4.5.1
+PYQT_VERSION=          4.5.4
 CATEGORIES=            x11 python
 MASTER_SITES=          http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 
diff -r 6032f59257a9 -r 2b5e2aa16cf9 x11/py-qt4/distinfo
--- a/x11/py-qt4/distinfo       Wed Jul 29 19:44:51 2009 +0000
+++ b/x11/py-qt4/distinfo       Wed Jul 29 19:47:24 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/07/08 05:41:29 hasso Exp $
+$NetBSD: distinfo,v 1.5 2009/07/29 19:47:24 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-4.5.1.tar.gz) = b50b58c3e6f9a15e0986fe63d978eb85db363a46
-RMD160 (PyQt-x11-gpl-4.5.1.tar.gz) = ef0ace225b66d21aa83106364850cfa960e67705
-Size (PyQt-x11-gpl-4.5.1.tar.gz) = 6942490 bytes
-SHA1 (patch-aa) = 04a94719d57043b9d729a8dc536fcee16acbbb94
+SHA1 (PyQt-x11-gpl-4.5.4.tar.gz) = be8b01b8b2343a6a85f18d16f10bc549e88265d6
+RMD160 (PyQt-x11-gpl-4.5.4.tar.gz) = 0f7a48edb65116c8fb23357f66d164ff1fe48684
+Size (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 bytes
+SHA1 (patch-aa) = ff6010dec03d1e17e2023d2f6d4418a03bf21bcc
diff -r 6032f59257a9 -r 2b5e2aa16cf9 x11/py-qt4/patches/patch-aa
--- a/x11/py-qt4/patches/patch-aa       Wed Jul 29 19:44:51 2009 +0000
+++ b/x11/py-qt4/patches/patch-aa       Wed Jul 29 19:47:24 2009 +0000
@@ -1,15 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2009/07/08 05:41:30 hasso Exp $
-
-Force shared libraries, from
-http://cvs.fedora.redhat.com/viewvc/devel/PyQt4/PyQt-x11-gpl-4.4.4-QT_SHARED.patch?revision=1.1&view=markup&pathrev=HEAD
+$NetBSD: patch-aa,v 1.3 2009/07/29 19:47:24 drochner Exp $
 
-ActiveQt seems to be under open source license starting from 4.5.2.
-
---- configure.py.orig  2009-06-16 11:37:38 +0300
-+++ configure.py       2009-06-26 10:10:30 +0300
-@@ -1675,11 +1675,7 @@ int main(int, char **)
-     out << QT_VERSION << '\\n';
-     out << QT_EDITION << '\\n';
+--- configure.py.orig  2009-07-14 15:31:43.000000000 +0200
++++ configure.py
+@@ -1680,11 +1680,7 @@ int main(int, char **)
+ 
+     out << QLibraryInfo::licensee() << '\\n';
  
 -#if defined(QT_SHARED) || defined(QT_DLL)
      out << "shared\\n";
@@ -19,17 +14,3 @@
  
      // Determine which features should be disabled.
  
-@@ -1786,10 +1782,10 @@ int main(int, char **)
- 
-     # Now convert the edition to a descriptive string.  The order of testing is
-     # important.
--    if qt_edition & 0x200:
-+    # if qt_edition & 0x200:
-         # It has ActiveQt.
--        qt_edition = "Desktop"
--    elif qt_edition & 0x008:
-+      # qt_edition = "Desktop"
-+    if qt_edition & 0x008:
-         # It has OpenGL.
-         qt_edition = "free"
-     elif qt_edition & 0x002: