update PyQt to 3.14

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

4 files changed, 60 insertions, 86 deletions

diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index 0d33129013e..9f38efe1a42 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/01/23 20:41:50 recht Exp $
+# $NetBSD: Makefile,v 1.12 2005/02/24 20:17:37 drochner Exp $
 #
 
-DISTNAME=		PyQt-x11-gpl-3.11
-PKGNAME=		${PYPKGPREFIX}-qt3-qscintilla-3.11
-PKGREVISION=	1
+DISTNAME=		PyQt-x11-gpl-3.14
+PKGNAME=		${PYPKGPREFIX}-qt3-qscintilla-3.14
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
 
diff --git a/x11/py-qt3-qscintilla/PLIST b/x11/py-qt3-qscintilla/PLIST
index 2a6a134465d..a6d843525ef 100644
--- a/x11/py-qt3-qscintilla/PLIST
+++ b/x11/py-qt3-qscintilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/05/09 17:06:07 recht Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/02/24 20:17:37 drochner Exp $
 ${PYSITELIB}/qtext.so
 share/sip${PYVERSSUFFIX}/qtext/copying.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintilla.sip
@@ -6,14 +6,19 @@ share/sip${PYVERSSUFFIX}/qtext/qextscintillaapis.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillabase.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillacommand.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillacommandset.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintilladocument.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexer.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerbash.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexercpp.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexercsharp.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerhtml.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexeridl.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerjava.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerjavascript.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerlua.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerperl.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerpython.sip
+share/sip${PYVERSSUFFIX}/qtext/qextscintillalexerruby.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillalexersql.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillamacro.sip
 share/sip${PYVERSSUFFIX}/qtext/qextscintillaprinter.sip
diff --git a/x11/py-qt3-qscintilla/distinfo b/x11/py-qt3-qscintilla/distinfo
index d9a29960f38..e11d8b6ad62 100644
--- a/x11/py-qt3-qscintilla/distinfo
+++ b/x11/py-qt3-qscintilla/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:19 wiz Exp $
+$NetBSD: distinfo,v 1.5 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) = fb0ba0dc3aa2b0e020a2e1ef05a04f14c0bf3242
+SHA1 (patch-aa) = 121dcbed6010852d9b3feaf6d2968d4c5e2624f6
diff --git a/x11/py-qt3-qscintilla/patches/patch-aa b/x11/py-qt3-qscintilla/patches/patch-aa
index a38c6c5945d..aa9bd44107c 100644
--- a/x11/py-qt3-qscintilla/patches/patch-aa
+++ b/x11/py-qt3-qscintilla/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 18:38:38.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,8 +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:
@@ -70,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:
@@ -81,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")
@@ -97,44 +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
-+#        )
- 
--        if sipcfg.qt_version < 0x030100:
--            makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
-+#        makefile.extra_defines.append("UIC")
-+#        makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib")
  
--        makefile.generate()
--        subdirs.append("pyuic3")
--
--        sipconfig.inform("Creating pylupdate Makefile...")
--
--        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...")
  
-@@ -856,15 +856,15 @@
+@@ -939,20 +939,20 @@ def main(argv):
      check_qscintilla()
  
      # Check which modules to build.
@@ -184,19 +147,26 @@ $NetBSD: patch-aa,v 1.2 2004/05/09 17:06:07 recht Exp $
 -    check_module("qttable", "qtable.h", "QTable()")
 -    check_module("qtxml", "qdom.h", "QDomImplementation()")
 -    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
--
--    if sipcfg.qt_version >= 0x030000:
--        check_module("qtsql", "qsql.h", "QSql()")
--        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
 +#    check_module("qtcanvas", "qcanvas.h", "QCanvas()")
 +#    check_module("qtnetwork", "qsocket.h", "QSocket()")
 +#    check_module("qttable", "qtable.h", "QTable()")
 +#    check_module("qtxml", "qdom.h", "QDomImplementation()")
 +#    check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
-+
+ 
+-    if sipcfg.qt_version >= 0x030000:
+-        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
 +#    if sipcfg.qt_version >= 0x030000:
-+#        check_module("qtsql", "qsql.h", "QSql()")
 +#        check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
  
+-        if sipcfg.qt_edition in ("enterprise", "free"):
+-            check_module("qtsql", "qsql.h", "QSql()")
++#        if sipcfg.qt_edition in ("enterprise", "free"):
++#            check_module("qtsql", "qsql.h", "QSql()")
+ 
+-            if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
+-                check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
++#            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")