Wed Jun 17 07:11:04 2009 UTC ()
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.


(hasso)
diff -r1.11 -r1.12 pkgsrc/x11/py-qt3-base/Makefile.common
diff -r1.15 -r1.16 pkgsrc/x11/py-qt3-base/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/py-qt3-base/patches/patch-aa
diff -r1.14 -r1.15 pkgsrc/x11/py-qt3-modules/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/py-qt3-modules/patches/patch-aa
diff -r1.13 -r1.14 pkgsrc/x11/py-qt3-qscintilla/distinfo
diff -r1.5 -r1.6 pkgsrc/x11/py-qt3-qscintilla/patches/patch-aa
cvs diff -r1.11 -r1.12 pkgsrc/x11/py-qt3-base/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/py-qt3-base/Attic/Makefile.common 2008/12/21 17:14:17 1.11
+++ pkgsrc/x11/py-qt3-base/Attic/Makefile.common 2009/06/17 07:11:03 1.12
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile.common,v 1.11 2008/12/21 17:14:17 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.12 2009/06/17 07:11:03 hasso Exp $
2# 2#
3# used by x11/py-qt3-base/Makefile 3# used by x11/py-qt3-base/Makefile
4# used by x11/py-qt3-modules/Makefile 4# used by x11/py-qt3-modules/Makefile
5# used by x11/py-qt3-qscintilla/Makefile 5# used by x11/py-qt3-qscintilla/Makefile
6# 6#
7# XXX: when updating version, be sure to update distinfo for both 7# XXX: when updating version, be sure to update distinfo for both
8# XXX: PyQt-mac-gpl and PyQt-x11-gpl in py-qt3-qscintilla, 8# XXX: PyQt-mac-gpl and PyQt-x11-gpl in py-qt3-qscintilla,
9# XXX: py-qt3-base, and py-qt3-modules. 9# XXX: py-qt3-base, and py-qt3-modules.
10 10
11PYQT_VERSION= 3.17.6 11PYQT_VERSION= 3.18.1
12CATEGORIES= x11 python 12CATEGORIES= x11 python
13MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt3/ 13MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt3/
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.riverbankcomputing.com/software/pyqt/intro 16HOMEPAGE= http://www.riverbankcomputing.com/software/pyqt/intro
17 17
18PYTHON_VERSIONS_ACCEPTED= 25 24 23 18PYTHON_VERSIONS_ACCEPTED= 25 24 23
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22.if ${OPSYS} == "Darwin" 22.if ${OPSYS} == "Darwin"
23DISTNAME= PyQt-mac-gpl-${PYQT_VERSION} 23DISTNAME= PyQt-mac-gpl-${PYQT_VERSION}
24.else 24.else
cvs diff -r1.15 -r1.16 pkgsrc/x11/py-qt3-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-qt3-base/Attic/distinfo 2008/12/21 17:14:17 1.15
+++ pkgsrc/x11/py-qt3-base/Attic/distinfo 2009/06/17 07:11:03 1.16
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.15 2008/12/21 17:14:17 wiz Exp $ 1$NetBSD: distinfo,v 1.16 2009/06/17 07:11:03 hasso Exp $
2 2
3SHA1 (PyQt-mac-gpl-3.17.6.tar.gz) = 87c0e17d48a125e969b830b4ef32cfb47004fe38 3SHA1 (PyQt-mac-gpl-3.18.1.tar.gz) = dbfb3e5443480705c36002167e0d6303fc751a3f
4RMD160 (PyQt-mac-gpl-3.17.6.tar.gz) = ef3afa9430f040e28be25cfac107ac324cb78bf2 4RMD160 (PyQt-mac-gpl-3.18.1.tar.gz) = db6685a6a231a7414a08674a0ea245260c234de2
5Size (PyQt-mac-gpl-3.17.6.tar.gz) = 807961 bytes 5Size (PyQt-mac-gpl-3.18.1.tar.gz) = 813598
6SHA1 (PyQt-x11-gpl-3.17.6.tar.gz) = 68a6bbc0a8211a763165f2a4e8c79d9a3262a8d2 6SHA1 (PyQt-x11-gpl-3.18.1.tar.gz) = 310c17bd3b0f81f8b516c5b755250171fa9c9a04
7RMD160 (PyQt-x11-gpl-3.17.6.tar.gz) = a1ac4f40d666092242994bb855404a6e4c7f649f 7RMD160 (PyQt-x11-gpl-3.18.1.tar.gz) = 1278b805bcd0a3e34e68a07849c052382c452096
8Size (PyQt-x11-gpl-3.17.6.tar.gz) = 813192 bytes 8Size (PyQt-x11-gpl-3.18.1.tar.gz) = 819441 bytes
9SHA1 (patch-aa) = e6ed02bf68c487ca356d16185766842f9203718e 9SHA1 (patch-aa) = 418b159936234e82e9ec208a854d74c636933b95
10SHA1 (patch-ab) = 4f4476e7f6f81fa1eb458a5dcdbaed3d13330f91 10SHA1 (patch-ab) = 4f4476e7f6f81fa1eb458a5dcdbaed3d13330f91
11SHA1 (patch-ac) = 94cc4e24179d6557de35a8a019e37e5d35eca68d 11SHA1 (patch-ac) = 94cc4e24179d6557de35a8a019e37e5d35eca68d
cvs diff -r1.6 -r1.7 pkgsrc/x11/py-qt3-base/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/py-qt3-base/patches/Attic/patch-aa 2008/10/08 14:23:24 1.6
+++ pkgsrc/x11/py-qt3-base/patches/Attic/patch-aa 2009/06/17 07:11:03 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.6 2008/10/08 14:23:24 wiz Exp $ 1$NetBSD: patch-aa,v 1.7 2009/06/17 07:11:03 hasso Exp $
2 2
3--- configure.py.orig 2007-12-06 15:28:06.000000000 +0100 3--- configure.py.orig 2009-06-16 11:47:29 +0300
4+++ configure.py 4+++ configure.py 2009-06-17 05:21:23 +0300
5@@ -197,23 +197,23 @@ class ConfigurePyQt3(ConfigureBase): 5@@ -197,23 +197,23 @@ class ConfigurePyQt3(ConfigureBase):
6 def check_modules(self): 6 def check_modules(self):
7 pyqt_modules.append("qt") 7 pyqt_modules.append("qt")
8  8
9- check_module("qtcanvas", "qcanvas.h", "QCanvas()") 9- check_module("qtcanvas", "qcanvas.h", "QCanvas()")
10- check_module("qtnetwork", "qsocket.h", "QSocket()") 10- check_module("qtnetwork", "qsocket.h", "QSocket()")
11- check_module("qttable", "qtable.h", "QTable()") 11- check_module("qttable", "qtable.h", "QTable()")
12- check_module("qtxml", "qdom.h", "QDomImplementation()") 12- check_module("qtxml", "qdom.h", "QDomImplementation()")
13- check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1) 13- check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
14+ #check_module("qtcanvas", "qcanvas.h", "QCanvas()") 14+ #check_module("qtcanvas", "qcanvas.h", "QCanvas()")
15+ #check_module("qtnetwork", "qsocket.h", "QSocket()") 15+ #check_module("qtnetwork", "qsocket.h", "QSocket()")
16+ #check_module("qttable", "qtable.h", "QTable()") 16+ #check_module("qttable", "qtable.h", "QTable()")
17+ #check_module("qtxml", "qdom.h", "QDomImplementation()") 17+ #check_module("qtxml", "qdom.h", "QDomImplementation()")
@@ -66,31 +66,31 @@ $NetBSD: patch-aa,v 1.6 2008/10/08 14:23 @@ -66,31 +66,31 @@ $NetBSD: patch-aa,v 1.6 2008/10/08 14:23
66+ if prof: # or "qtxml" not in pyqt_modules: 66+ if prof: # or "qtxml" not in pyqt_modules:
67 buildfile= "pylupdate-prof.sbf" 67 buildfile= "pylupdate-prof.sbf"
68  68
69 shutil.copyfile(qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp") 69 shutil.copyfile(qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
70@@ -340,7 +340,7 @@ class ConfigurePyQt3(ConfigureBase): 70@@ -340,7 +340,7 @@ class ConfigurePyQt3(ConfigureBase):
71  71
72 makefile.extra_defines.append("QT_INTERNAL_XML") 72 makefile.extra_defines.append("QT_INTERNAL_XML")
73  73
74- if prof or "qtxml" not in pyqt_modules: 74- if prof or "qtxml" not in pyqt_modules:
75+ if prof: # or "qtxml" not in pyqt_modules: 75+ if prof: # or "qtxml" not in pyqt_modules:
76 makefile.extra_defines.append("QT_MODULE_XML") 76 makefile.extra_defines.append("QT_MODULE_XML")
77  77
78 makefile.generate() 78 makefile.generate()
79@@ -1002,7 +1002,7 @@ def check_license(): 79@@ -1010,7 +1010,7 @@ Type 'no' to decline the terms of the li
80 print "Type 'no' to decline the terms of the license." 80
81 print 81 """)
82  82
83- while 1: 83- while 1:
84+ while 0: 84+ while 0:
85 try: 85 try:
86 resp = raw_input("Do you accept the terms of the license? ") 86 resp = raw_input("Do you accept the terms of the license? ")
87 except: 87 except:
88@@ -1380,7 +1380,7 @@ def main(argv): 88@@ -1392,7 +1392,7 @@ def main(argv):
89 check_license() 89 check_license()
90  90
91 # Check for QScintilla. 91 # Check for QScintilla.
92- check_qscintilla() 92- check_qscintilla()
93+ #check_qscintilla() 93+ #check_qscintilla()
94  94
95 # Check which modules to build. 95 # Check which modules to build.
96 qtmod_lib = pyqt.check_modules() 96 qtmod_lib = pyqt.check_modules()
cvs diff -r1.14 -r1.15 pkgsrc/x11/py-qt3-modules/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-qt3-modules/Attic/distinfo 2008/12/21 17:14:17 1.14
+++ pkgsrc/x11/py-qt3-modules/Attic/distinfo 2009/06/17 07:11:04 1.15
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.14 2008/12/21 17:14:17 wiz Exp $ 1$NetBSD: distinfo,v 1.15 2009/06/17 07:11:04 hasso Exp $
2 2
3SHA1 (PyQt-mac-gpl-3.17.6.tar.gz) = 87c0e17d48a125e969b830b4ef32cfb47004fe38 3SHA1 (PyQt-mac-gpl-3.18.1.tar.gz) = dbfb3e5443480705c36002167e0d6303fc751a3f
4RMD160 (PyQt-mac-gpl-3.17.6.tar.gz) = ef3afa9430f040e28be25cfac107ac324cb78bf2 4RMD160 (PyQt-mac-gpl-3.18.1.tar.gz) = db6685a6a231a7414a08674a0ea245260c234de2
5Size (PyQt-mac-gpl-3.17.6.tar.gz) = 807961 bytes 5Size (PyQt-mac-gpl-3.18.1.tar.gz) = 813598
6SHA1 (PyQt-x11-gpl-3.17.6.tar.gz) = 68a6bbc0a8211a763165f2a4e8c79d9a3262a8d2 6SHA1 (PyQt-x11-gpl-3.18.1.tar.gz) = 310c17bd3b0f81f8b516c5b755250171fa9c9a04
7RMD160 (PyQt-x11-gpl-3.17.6.tar.gz) = a1ac4f40d666092242994bb855404a6e4c7f649f 7RMD160 (PyQt-x11-gpl-3.18.1.tar.gz) = 1278b805bcd0a3e34e68a07849c052382c452096
8Size (PyQt-x11-gpl-3.17.6.tar.gz) = 813192 bytes 8Size (PyQt-x11-gpl-3.18.1.tar.gz) = 819441 bytes
9SHA1 (patch-aa) = ae6f1d601d7d37ec5e30d96249fade6563aced9a 9SHA1 (patch-aa) = 359e145af70889251f011a8f3bc62527aa47c6bd
cvs diff -r1.6 -r1.7 pkgsrc/x11/py-qt3-modules/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/py-qt3-modules/patches/Attic/patch-aa 2008/10/08 14:23:24 1.6
+++ pkgsrc/x11/py-qt3-modules/patches/Attic/patch-aa 2009/06/17 07:11:04 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.6 2008/10/08 14:23:24 wiz Exp $ 1$NetBSD: patch-aa,v 1.7 2009/06/17 07:11:04 hasso Exp $
2 2
3--- configure.py.orig 2007-12-06 14:28:06.000000000 +0000 3--- configure.py.orig 2009-06-16 11:47:29 +0300
4+++ configure.py 4+++ configure.py 2009-06-17 05:37:17 +0300
5@@ -195,7 +195,7 @@ class ConfigurePyQt3(ConfigureBase): 5@@ -195,7 +195,7 @@ class ConfigurePyQt3(ConfigureBase):
6 """This class defines the methods to configure PyQt v3. 6 """This class defines the methods to configure PyQt v3.
7 """ 7 """
8 def check_modules(self): 8 def check_modules(self):
9- pyqt_modules.append("qt") 9- pyqt_modules.append("qt")
10+ #pyqt_modules.append("qt") 10+ #pyqt_modules.append("qt")
11  11
12 check_module("qtcanvas", "qcanvas.h", "QCanvas()") 12 check_module("qtcanvas", "qcanvas.h", "QCanvas()")
13 check_module("qtnetwork", "qsocket.h", "QSocket()") 13 check_module("qtnetwork", "qsocket.h", "QSocket()")
14@@ -212,8 +212,6 @@ class ConfigurePyQt3(ConfigureBase): 14@@ -212,8 +212,6 @@ class ConfigurePyQt3(ConfigureBase):
15 if sys.platform == "win32" and sipcfg.sip_version >= 0x040200: 15 if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
16 check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer") 16 check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
17  17
@@ -76,31 +76,31 @@ $NetBSD: patch-aa,v 1.6 2008/10/08 14:23 @@ -76,31 +76,31 @@ $NetBSD: patch-aa,v 1.6 2008/10/08 14:23
76- warnings=1 76- warnings=1
77- ) 77- )
78- 78-
79- makefile.extra_defines.append("QT_INTERNAL_XML") 79- makefile.extra_defines.append("QT_INTERNAL_XML")
80- 80-
81- if prof or "qtxml" not in pyqt_modules: 81- if prof or "qtxml" not in pyqt_modules:
82- makefile.extra_defines.append("QT_MODULE_XML") 82- makefile.extra_defines.append("QT_MODULE_XML")
83- 83-
84- makefile.generate() 84- makefile.generate()
85- tool_dirs.append("pylupdate3") 85- tool_dirs.append("pylupdate3")
86 elif qt_version >= 0x020000: 86 elif qt_version >= 0x020000:
87 sipconfig.inform("Creating pyuic Makefile...") 87 sipconfig.inform("Creating pyuic Makefile...")
88  88
89@@ -1002,7 +941,7 @@ def check_license(): 89@@ -1010,7 +949,7 @@ Type 'no' to decline the terms of the li
90 print "Type 'no' to decline the terms of the license." 90
91 print 91 """)
92  92
93- while 1: 93- while 1:
94+ while 0: 94+ while 0:
95 try: 95 try:
96 resp = raw_input("Do you accept the terms of the license? ") 96 resp = raw_input("Do you accept the terms of the license? ")
97 except: 97 except:
98@@ -1380,7 +1319,7 @@ def main(argv): 98@@ -1392,7 +1331,7 @@ def main(argv):
99 check_license() 99 check_license()
100  100
101 # Check for QScintilla. 101 # Check for QScintilla.
102- check_qscintilla() 102- check_qscintilla()
103+ #check_qscintilla() 103+ #check_qscintilla()
104  104
105 # Check which modules to build. 105 # Check which modules to build.
106 qtmod_lib = pyqt.check_modules() 106 qtmod_lib = pyqt.check_modules()
cvs diff -r1.13 -r1.14 pkgsrc/x11/py-qt3-qscintilla/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-qt3-qscintilla/Attic/distinfo 2008/12/21 17:14:17 1.13
+++ pkgsrc/x11/py-qt3-qscintilla/Attic/distinfo 2009/06/17 07:11:04 1.14
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.13 2008/12/21 17:14:17 wiz Exp $ 1$NetBSD: distinfo,v 1.14 2009/06/17 07:11:04 hasso Exp $
2 2
3SHA1 (PyQt-mac-gpl-3.17.6.tar.gz) = 87c0e17d48a125e969b830b4ef32cfb47004fe38 3SHA1 (PyQt-mac-gpl-3.18.1.tar.gz) = dbfb3e5443480705c36002167e0d6303fc751a3f
4RMD160 (PyQt-mac-gpl-3.17.6.tar.gz) = ef3afa9430f040e28be25cfac107ac324cb78bf2 4RMD160 (PyQt-mac-gpl-3.18.1.tar.gz) = db6685a6a231a7414a08674a0ea245260c234de2
5Size (PyQt-mac-gpl-3.17.6.tar.gz) = 807961 bytes 5Size (PyQt-mac-gpl-3.18.1.tar.gz) = 813598
6SHA1 (PyQt-x11-gpl-3.17.6.tar.gz) = 68a6bbc0a8211a763165f2a4e8c79d9a3262a8d2 6SHA1 (PyQt-x11-gpl-3.18.1.tar.gz) = 310c17bd3b0f81f8b516c5b755250171fa9c9a04
7RMD160 (PyQt-x11-gpl-3.17.6.tar.gz) = a1ac4f40d666092242994bb855404a6e4c7f649f 7RMD160 (PyQt-x11-gpl-3.18.1.tar.gz) = 1278b805bcd0a3e34e68a07849c052382c452096
8Size (PyQt-x11-gpl-3.17.6.tar.gz) = 813192 bytes 8Size (PyQt-x11-gpl-3.18.1.tar.gz) = 819441 bytes
9SHA1 (patch-aa) = d4fa6f3eb1f48be0694795a9bd9cd86541e7dc88 9SHA1 (patch-aa) = f6ac9f0735163c12def4460b53f2ddf3d50818c1
cvs diff -r1.5 -r1.6 pkgsrc/x11/py-qt3-qscintilla/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/py-qt3-qscintilla/patches/Attic/patch-aa 2008/10/08 14:23:24 1.5
+++ pkgsrc/x11/py-qt3-qscintilla/patches/Attic/patch-aa 2009/06/17 07:11:04 1.6
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.5 2008/10/08 14:23:24 wiz Exp $ 1$NetBSD: patch-aa,v 1.6 2009/06/17 07:11:04 hasso Exp $
2 2
3--- configure.py.orig 2007-12-06 14:28:06.000000000 +0000 3--- configure.py.orig 2009-06-16 11:47:29 +0300
4+++ configure.py 4+++ configure.py 2009-06-17 05:50:50 +0300
5@@ -195,22 +195,6 @@ class ConfigurePyQt3(ConfigureBase): 5@@ -195,22 +195,6 @@ class ConfigurePyQt3(ConfigureBase):
6 """This class defines the methods to configure PyQt v3. 6 """This class defines the methods to configure PyQt v3.
7 """ 7 """
8 def check_modules(self): 8 def check_modules(self):
9- pyqt_modules.append("qt") 9- pyqt_modules.append("qt")
10- 10-
11- check_module("qtcanvas", "qcanvas.h", "QCanvas()") 11- check_module("qtcanvas", "qcanvas.h", "QCanvas()")
12- check_module("qtnetwork", "qsocket.h", "QSocket()") 12- check_module("qtnetwork", "qsocket.h", "QSocket()")
13- check_module("qttable", "qtable.h", "QTable()") 13- check_module("qttable", "qtable.h", "QTable()")
14- check_module("qtxml", "qdom.h", "QDomImplementation()") 14- check_module("qtxml", "qdom.h", "QDomImplementation()")
15- check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1) 15- check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
16- 16-
17- if qt_version >= 0x030000: 17- if qt_version >= 0x030000:
@@ -80,22 +80,22 @@ $NetBSD: patch-aa,v 1.5 2008/10/08 14:23 @@ -80,22 +80,22 @@ $NetBSD: patch-aa,v 1.5 2008/10/08 14:23
80- warnings=1 80- warnings=1
81- ) 81- )
82- 82-
83- makefile.extra_defines.append("QT_INTERNAL_XML") 83- makefile.extra_defines.append("QT_INTERNAL_XML")
84- 84-
85- if prof or "qtxml" not in pyqt_modules: 85- if prof or "qtxml" not in pyqt_modules:
86- makefile.extra_defines.append("QT_MODULE_XML") 86- makefile.extra_defines.append("QT_MODULE_XML")
87- 87-
88- makefile.generate() 88- makefile.generate()
89- tool_dirs.append("pylupdate3") 89- tool_dirs.append("pylupdate3")
90 elif qt_version >= 0x020000: 90 elif qt_version >= 0x020000:
91 sipconfig.inform("Creating pyuic Makefile...") 91 sipconfig.inform("Creating pyuic Makefile...")
92  92
93@@ -1002,7 +928,7 @@ def check_license(): 93@@ -1010,7 +936,7 @@ Type 'no' to decline the terms of the li
94 print "Type 'no' to decline the terms of the license." 94
95 print 95 """)
96  96
97- while 1: 97- while 1:
98+ while 0: 98+ while 0:
99 try: 99 try:
100 resp = raw_input("Do you accept the terms of the license? ") 100 resp = raw_input("Do you accept the terms of the license? ")
101 except: 101 except: