From dca7d17bce70b8281a8af67bf621c1001c77ee61 Mon Sep 17 00:00:00 2001 From: hasso Date: Wed, 17 Jun 2009 07:11:03 +0000 Subject: Update to 3.18.1 which makes it actually build with sip-4.8.x. Changes in 3.18.1 since 3.18: * Fixed the handwritten code for all QDomDocument.setContent() overloads which was using deprecated (and now removed) sipBuildResult() format characters. * Fixed a build problem that affected Python v2.5 and earlier. Changes in 3.18 since 3.17.6: * Removed some compiler warning messages. * Reverted the changes that removed the use of sipSelfWasArg in handwritten code. * Tweaked configure.py so that Python3 can run just enough of it to display an error message. * Fixed a regression in emitting Python signals to Qt signals. * Handwritten code changes for the removal of the sipProtectVirt_*() methods. * Fixed a build problem with the GPL version. * Refactored the signla/slot support. * Safety checking of latest signal/slot refactoring. * Safety commit of the PyQt3-specific meta-type and super-type (just stubs at the moment). * Use the %Plugin directive to enable PyQt3 signal support. * More changes to the QObject.sender() support. * Updated the QObject::sender() support in response to sip changes. * Moved the last of the type parsing from sip. * The type parsing now uses sipResolveTypedef(). * Added the type parsing support from the sip module as PyQt4 no longer uses it. * Replaced sipFindConnection() with sipFindSlot(). * Replaced sipFreeConnection() with sipFreeSipslot(). * Changes required by recent changes to the Qt support API. * Compatibility changes needed for SIP v4.8. * Merged the v3.17 maintenance branch into the trunk. * Made some char* in handwritten code const needed by SIP v4.8. --- x11/py-qt3-base/Makefile.common | 4 ++-- x11/py-qt3-base/distinfo | 16 ++++++++-------- x11/py-qt3-base/patches/patch-aa | 14 +++++++------- x11/py-qt3-modules/distinfo | 16 ++++++++-------- x11/py-qt3-modules/patches/patch-aa | 14 +++++++------- x11/py-qt3-qscintilla/distinfo | 16 ++++++++-------- x11/py-qt3-qscintilla/patches/patch-aa | 12 ++++++------ 7 files changed, 46 insertions(+), 46 deletions(-) (limited to 'x11') diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common index a12c0ca3124..ccd0a4da16c 100644 --- a/x11/py-qt3-base/Makefile.common +++ b/x11/py-qt3-base/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2008/12/21 17:14:17 wiz Exp $ +# $NetBSD: Makefile.common,v 1.12 2009/06/17 07:11:03 hasso Exp $ # # used by x11/py-qt3-base/Makefile # used by x11/py-qt3-modules/Makefile @@ -8,7 +8,7 @@ # XXX: PyQt-mac-gpl and PyQt-x11-gpl in py-qt3-qscintilla, # XXX: py-qt3-base, and py-qt3-modules. -PYQT_VERSION= 3.17.6 +PYQT_VERSION= 3.18.1 CATEGORIES= x11 python MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt3/ diff --git a/x11/py-qt3-base/distinfo b/x11/py-qt3-base/distinfo index 37e2695bcff..003c505da82 100644 --- a/x11/py-qt3-base/distinfo +++ b/x11/py-qt3-base/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.15 2008/12/21 17:14:17 wiz Exp $ +$NetBSD: distinfo,v 1.16 2009/06/17 07:11:03 hasso Exp $ -SHA1 (PyQt-mac-gpl-3.17.6.tar.gz) = 87c0e17d48a125e969b830b4ef32cfb47004fe38 -RMD160 (PyQt-mac-gpl-3.17.6.tar.gz) = ef3afa9430f040e28be25cfac107ac324cb78bf2 -Size (PyQt-mac-gpl-3.17.6.tar.gz) = 807961 bytes -SHA1 (PyQt-x11-gpl-3.17.6.tar.gz) = 68a6bbc0a8211a763165f2a4e8c79d9a3262a8d2 -RMD160 (PyQt-x11-gpl-3.17.6.tar.gz) = a1ac4f40d666092242994bb855404a6e4c7f649f -Size (PyQt-x11-gpl-3.17.6.tar.gz) = 813192 bytes -SHA1 (patch-aa) = e6ed02bf68c487ca356d16185766842f9203718e +SHA1 (PyQt-mac-gpl-3.18.1.tar.gz) = dbfb3e5443480705c36002167e0d6303fc751a3f +RMD160 (PyQt-mac-gpl-3.18.1.tar.gz) = db6685a6a231a7414a08674a0ea245260c234de2 +Size (PyQt-mac-gpl-3.18.1.tar.gz) = 813598 +SHA1 (PyQt-x11-gpl-3.18.1.tar.gz) = 310c17bd3b0f81f8b516c5b755250171fa9c9a04 +RMD160 (PyQt-x11-gpl-3.18.1.tar.gz) = 1278b805bcd0a3e34e68a07849c052382c452096 +Size (PyQt-x11-gpl-3.18.1.tar.gz) = 819441 bytes +SHA1 (patch-aa) = 418b159936234e82e9ec208a854d74c636933b95 SHA1 (patch-ab) = 4f4476e7f6f81fa1eb458a5dcdbaed3d13330f91 SHA1 (patch-ac) = 94cc4e24179d6557de35a8a019e37e5d35eca68d diff --git a/x11/py-qt3-base/patches/patch-aa b/x11/py-qt3-base/patches/patch-aa index 2c7d44db9cd..6e448914e18 100644 --- a/x11/py-qt3-base/patches/patch-aa +++ b/x11/py-qt3-base/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.6 2008/10/08 14:23:24 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2009/06/17 07:11:03 hasso Exp $ ---- configure.py.orig 2007-12-06 15:28:06.000000000 +0100 -+++ configure.py +--- configure.py.orig 2009-06-16 11:47:29 +0300 ++++ configure.py 2009-06-17 05:21:23 +0300 @@ -197,23 +197,23 @@ class ConfigurePyQt3(ConfigureBase): def check_modules(self): pyqt_modules.append("qt") @@ -76,16 +76,16 @@ $NetBSD: patch-aa,v 1.6 2008/10/08 14:23:24 wiz Exp $ makefile.extra_defines.append("QT_MODULE_XML") makefile.generate() -@@ -1002,7 +1002,7 @@ def check_license(): - print "Type 'no' to decline the terms of the license." - print +@@ -1010,7 +1010,7 @@ Type 'no' to decline the terms of the li + + """) - while 1: + while 0: try: resp = raw_input("Do you accept the terms of the license? ") except: -@@ -1380,7 +1380,7 @@ def main(argv): +@@ -1392,7 +1392,7 @@ def main(argv): check_license() # Check for QScintilla. diff --git a/x11/py-qt3-modules/distinfo b/x11/py-qt3-modules/distinfo index 97f8505e5d5..1a86fe1b4cd 100644 --- a/x11/py-qt3-modules/distinfo +++ b/x11/py-qt3-modules/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.14 2008/12/21 17:14:17 wiz Exp $ +$NetBSD: distinfo,v 1.15 2009/06/17 07:11:04 hasso Exp $ -SHA1 (PyQt-mac-gpl-3.17.6.tar.gz) = 87c0e17d48a125e969b830b4ef32cfb47004fe38 -RMD160 (PyQt-mac-gpl-3.17.6.tar.gz) = ef3afa9430f040e28be25cfac107ac324cb78bf2 -Size (PyQt-mac-gpl-3.17.6.tar.gz) = 807961 bytes -SHA1 (PyQt-x11-gpl-3.17.6.tar.gz) = 68a6bbc0a8211a763165f2a4e8c79d9a3262a8d2 -RMD160 (PyQt-x11-gpl-3.17.6.tar.gz) = a1ac4f40d666092242994bb855404a6e4c7f649f -Size (PyQt-x11-gpl-3.17.6.tar.gz) = 813192 bytes -SHA1 (patch-aa) = ae6f1d601d7d37ec5e30d96249fade6563aced9a +SHA1 (PyQt-mac-gpl-3.18.1.tar.gz) = dbfb3e5443480705c36002167e0d6303fc751a3f +RMD160 (PyQt-mac-gpl-3.18.1.tar.gz) = db6685a6a231a7414a08674a0ea245260c234de2 +Size (PyQt-mac-gpl-3.18.1.tar.gz) = 813598 +SHA1 (PyQt-x11-gpl-3.18.1.tar.gz) = 310c17bd3b0f81f8b516c5b755250171fa9c9a04 +RMD160 (PyQt-x11-gpl-3.18.1.tar.gz) = 1278b805bcd0a3e34e68a07849c052382c452096 +Size (PyQt-x11-gpl-3.18.1.tar.gz) = 819441 bytes +SHA1 (patch-aa) = 359e145af70889251f011a8f3bc62527aa47c6bd diff --git a/x11/py-qt3-modules/patches/patch-aa b/x11/py-qt3-modules/patches/patch-aa index d5db5df09a3..aac1f8ce873 100644 --- a/x11/py-qt3-modules/patches/patch-aa +++ b/x11/py-qt3-modules/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.6 2008/10/08 14:23:24 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2009/06/17 07:11:04 hasso Exp $ ---- configure.py.orig 2007-12-06 14:28:06.000000000 +0000 -+++ configure.py +--- configure.py.orig 2009-06-16 11:47:29 +0300 ++++ configure.py 2009-06-17 05:37:17 +0300 @@ -195,7 +195,7 @@ class ConfigurePyQt3(ConfigureBase): """This class defines the methods to configure PyQt v3. """ @@ -86,16 +86,16 @@ $NetBSD: patch-aa,v 1.6 2008/10/08 14:23:24 wiz Exp $ elif qt_version >= 0x020000: sipconfig.inform("Creating pyuic Makefile...") -@@ -1002,7 +941,7 @@ def check_license(): - print "Type 'no' to decline the terms of the license." - print +@@ -1010,7 +949,7 @@ Type 'no' to decline the terms of the li + + """) - while 1: + while 0: try: resp = raw_input("Do you accept the terms of the license? ") except: -@@ -1380,7 +1319,7 @@ def main(argv): +@@ -1392,7 +1331,7 @@ def main(argv): check_license() # Check for QScintilla. diff --git a/x11/py-qt3-qscintilla/distinfo b/x11/py-qt3-qscintilla/distinfo index b193c78cab3..ff628fa15a0 100644 --- a/x11/py-qt3-qscintilla/distinfo +++ b/x11/py-qt3-qscintilla/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.13 2008/12/21 17:14:17 wiz Exp $ +$NetBSD: distinfo,v 1.14 2009/06/17 07:11:04 hasso Exp $ -SHA1 (PyQt-mac-gpl-3.17.6.tar.gz) = 87c0e17d48a125e969b830b4ef32cfb47004fe38 -RMD160 (PyQt-mac-gpl-3.17.6.tar.gz) = ef3afa9430f040e28be25cfac107ac324cb78bf2 -Size (PyQt-mac-gpl-3.17.6.tar.gz) = 807961 bytes -SHA1 (PyQt-x11-gpl-3.17.6.tar.gz) = 68a6bbc0a8211a763165f2a4e8c79d9a3262a8d2 -RMD160 (PyQt-x11-gpl-3.17.6.tar.gz) = a1ac4f40d666092242994bb855404a6e4c7f649f -Size (PyQt-x11-gpl-3.17.6.tar.gz) = 813192 bytes -SHA1 (patch-aa) = d4fa6f3eb1f48be0694795a9bd9cd86541e7dc88 +SHA1 (PyQt-mac-gpl-3.18.1.tar.gz) = dbfb3e5443480705c36002167e0d6303fc751a3f +RMD160 (PyQt-mac-gpl-3.18.1.tar.gz) = db6685a6a231a7414a08674a0ea245260c234de2 +Size (PyQt-mac-gpl-3.18.1.tar.gz) = 813598 +SHA1 (PyQt-x11-gpl-3.18.1.tar.gz) = 310c17bd3b0f81f8b516c5b755250171fa9c9a04 +RMD160 (PyQt-x11-gpl-3.18.1.tar.gz) = 1278b805bcd0a3e34e68a07849c052382c452096 +Size (PyQt-x11-gpl-3.18.1.tar.gz) = 819441 bytes +SHA1 (patch-aa) = f6ac9f0735163c12def4460b53f2ddf3d50818c1 diff --git a/x11/py-qt3-qscintilla/patches/patch-aa b/x11/py-qt3-qscintilla/patches/patch-aa index 132bb6a6fdd..f9bfa845887 100644 --- a/x11/py-qt3-qscintilla/patches/patch-aa +++ b/x11/py-qt3-qscintilla/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2008/10/08 14:23:24 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2009/06/17 07:11:04 hasso Exp $ ---- configure.py.orig 2007-12-06 14:28:06.000000000 +0000 -+++ configure.py +--- configure.py.orig 2009-06-16 11:47:29 +0300 ++++ configure.py 2009-06-17 05:50:50 +0300 @@ -195,22 +195,6 @@ class ConfigurePyQt3(ConfigureBase): """This class defines the methods to configure PyQt v3. """ @@ -90,9 +90,9 @@ $NetBSD: patch-aa,v 1.5 2008/10/08 14:23:24 wiz Exp $ elif qt_version >= 0x020000: sipconfig.inform("Creating pyuic Makefile...") -@@ -1002,7 +928,7 @@ def check_license(): - print "Type 'no' to decline the terms of the license." - print +@@ -1010,7 +936,7 @@ Type 'no' to decline the terms of the li + + """) - while 1: + while 0: -- cgit v1.2.3