update PyQt to 3.14

changes:
-support for new qscintilla
-added support for QUuid, QMetaObject and QMetaProperty classes
-bugfixes

3 files changed, 42 insertions, 80 deletions

diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index 34e31d38e7c..b035e6fda9a 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/01/23 20:41:50 recht Exp $
+# $NetBSD: Makefile,v 1.13 2005/02/24 20:17:37 drochner Exp $
 #
 
-DISTNAME=		PyQt-x11-gpl-3.11
-PKGNAME=		${PYPKGPREFIX}-qt3-modules-3.11
-PKGREVISION=	1
+DISTNAME=		PyQt-x11-gpl-3.14
+PKGNAME=		${PYPKGPREFIX}-qt3-modules-3.14
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
 
diff --git a/x11/py-qt3-modules/distinfo b/x11/py-qt3-modules/distinfo
index 24b70a6752c..a3c536d6344 100644
--- a/x11/py-qt3-modules/distinfo
+++ b/x11/py-qt3-modules/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:36:18 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/02/24 20:17:37 drochner Exp $
 
 SHA1 (PyQt-x11-gpl-3.11.tar.gz) = 7b4949d97cdf989119681d34f8c30fede2d04e82
 RMD160 (PyQt-x11-gpl-3.11.tar.gz) = 985e21b213b195944f766f249d8fc44916c2f1ec
 Size (PyQt-x11-gpl-3.11.tar.gz) = 757652 bytes
-SHA1 (patch-aa) = cdf9fcfb3ef1c90a4864a6415edd58e42bbc6292
+SHA1 (patch-aa) = 7119fe04aa5bb82c2775a9458238cc99590c3c1c
diff --git a/x11/py-qt3-modules/patches/patch-aa b/x11/py-qt3-modules/patches/patch-aa
index 60c006e56df..bfa4661ca0a 100644
--- a/x11/py-qt3-modules/patches/patch-aa
+++ b/x11/py-qt3-modules/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
+$NetBSD: patch-aa,v 1.3 2005/02/24 20:17:37 drochner Exp $
 
---- configure.py.orig	2004-03-11 20:23:30.000000000 +0100
-+++ configure.py	2004-05-09 17:37:45.000000000 +0200
-@@ -38,7 +38,7 @@
- sip_min_v3_version = 0x030a01
- sip_min_v4_version = 0x040000
+--- configure.py.orig	2005-02-19 16:49:33.000000000 +0100
++++ configure.py
+@@ -38,7 +38,7 @@ pyqt_version_str = "3.14"
+ sip_min_v3_version = 0x030c00
+ sip_min_v4_version = 0x040200
  
 -pyqt_modules = ["qt"]
 +pyqt_modules = []
  qt_sip_flags = []
  qtext_sip_flags = []
  qtpe_sip_flags = []
-@@ -663,7 +663,7 @@
+@@ -732,7 +732,7 @@ def check_license():
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -20,18 +20,15 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -697,82 +697,82 @@
+@@ -766,64 +766,64 @@ def create_makefiles():
          # The Professional Edition needs special handling.
          prof = (sipcfg.qt_edition == "professional")
  
 -        sipconfig.inform("Creating pyuic Makefile...")
-+#        sipconfig.inform("Creating pyuic Makefile...")
- 
--        if prof:
+-
+-        if prof or "qtxml" not in pyqt_modules:
 -            buildfile= "pyuic-prof.sbf"
-+#        if prof:
-+#            buildfile= "pyuic-prof.sbf"
- 
+-
 -            for xml in ("qdom.cpp", "qxml.cpp"):
 -                shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
 -        else:
@@ -50,14 +47,19 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
 -        makefile.extra_defines.append("UIC")
 -        makefile.extra_defines.append("QT_INTERNAL_XML")
 -
--        if prof:
+-        if prof or "qtxml" not in pyqt_modules:
 -            makefile.extra_defines.append("QT_MODULE_XML")
--
++#        sipconfig.inform("Creating pyuic Makefile...")
+ 
 -        if sipcfg.qt_version < 0x030100:
 -            makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
--
++#        if prof or "qtxml" not in pyqt_modules:
++#            buildfile= "pyuic-prof.sbf"
+ 
 -        makefile.generate()
 -        subdirs.append("pyuic3")
+-
+-        sipconfig.inform("Creating pylupdate Makefile...")
 +#            for xml in ("qdom.cpp", "qxml.cpp"):
 +#                shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml)
 +#        else:
@@ -76,7 +78,7 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
 +#        makefile.extra_defines.append("UIC")
 +#        makefile.extra_defines.append("QT_INTERNAL_XML")
 +
-+#        if prof:
++#        if prof or "qtxml" not in pyqt_modules:
 +#            makefile.extra_defines.append("QT_MODULE_XML")
 +
 +#        if sipcfg.qt_version < 0x030100:
@@ -87,7 +89,7 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
 +
 +#        sipconfig.inform("Creating pylupdate Makefile...")
 +
-+#        if prof:
++#        if prof or "qtxml" not in pyqt_modules:
 +#            buildfile= "pylupdate-prof.sbf"
 +
 +#            shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
@@ -103,38 +105,17 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
 +#            qt=1,
 +#            warnings=1
 +#        )
-+
-+#        makefile.extra_defines.append("QT_INTERNAL_XML")
-+
-+#        if prof:
-+#            makefile.extra_defines.append("QT_MODULE_XML")
-+
-+#        makefile.generate()
-+#        subdirs.append("pylupdate3")
-+#    elif sipcfg.qt_version >= 0x020000:
-+#        sipconfig.inform("Creating pyuic Makefile...")
-+
-+#        makefile = sipconfig.ProgramMakefile(
-+#            configuration=sipcfg,
-+#            build_file="pyuic.sbf",
-+#            dir="pyuic2",
-+#            install_dir=opt_pyqtbindir,
-+#            console=1,
-+#            qt=1,
-+#            warnings=1
-+#        )
  
--        sipconfig.inform("Creating pylupdate Makefile...")
-+#        makefile.extra_defines.append("UIC")
-+#        makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
- 
--        if prof:
+-        if prof or "qtxml" not in pyqt_modules:
 -            buildfile= "pylupdate-prof.sbf"
--
++#        makefile.extra_defines.append("QT_INTERNAL_XML")
+ 
 -            shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
 -        else:
 -            buildfile= "pylupdate.sbf"
--
++#        if prof or "qtxml" not in pyqt_modules:
++#            makefile.extra_defines.append("QT_MODULE_XML")
+ 
 -        makefile = sipconfig.ProgramMakefile(
 -            configuration=sipcfg,
 -            build_file=buildfile,
@@ -147,35 +128,17 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
 -
 -        makefile.extra_defines.append("QT_INTERNAL_XML")
 -
--        if prof:
+-        if prof or "qtxml" not in pyqt_modules:
 -            makefile.extra_defines.append("QT_MODULE_XML")
 -
 -        makefile.generate()
 -        subdirs.append("pylupdate3")
--    elif sipcfg.qt_version >= 0x020000:
--        sipconfig.inform("Creating pyuic Makefile...")
--
--        makefile = sipconfig.ProgramMakefile(
--            configuration=sipcfg,
--            build_file="pyuic.sbf",
--            dir="pyuic2",
--            install_dir=opt_pyqtbindir,
--            console=1,
--            qt=1,
--            warnings=1
--        )
--
--        makefile.extra_defines.append("UIC")
--        makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
--
--        makefile.generate()
--        subdirs.append("pyuic2")
 +#        makefile.generate()
-+#        subdirs.append("pyuic2")
- 
-     sipconfig.inform("Creating top level Makefile...")
++#        subdirs.append("pylupdate3")
+     elif sipcfg.qt_version >= 0x020000:
+         sipconfig.inform("Creating pyuic Makefile...")
  
-@@ -853,7 +853,7 @@
+@@ -936,7 +936,7 @@ def main(argv):
              sipcfg.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
  
      # Check for QScintilla.
@@ -184,14 +147,14 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
  
      # Check which modules to build.
      check_module("qtcanvas", "qcanvas.h", "QCanvas()")
-@@ -866,8 +866,8 @@
-         check_module("qtsql", "qsql.h", "QSql()")
-         check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
+@@ -954,8 +954,8 @@ def main(argv):
+             if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
+                 check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
  
 -    if qsci_version:
 -        check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
-+    #if qsci_version:
-+    #    check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
++#    if qsci_version:
++#        check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
  
      if opt_qtpetag:
          pyqt_modules.append("qtpe")