update to 3.15.1

changes: bugfixes

6 files changed, 33 insertions, 33 deletions

diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common
index 3e1bc4ceca5..cbc2da273b0 100644
--- a/x11/py-qt3-base/Makefile.common
+++ b/x11/py-qt3-base/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.2 2005/10/06 17:57:49 drochner Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/11/22 18:52:45 drochner Exp $
 #
 
 # XXX: when updating version, be sure to update distinfo for both
 # XXX: PyQt-mac-gpl and PyQt-x11-gpl in py-qt3-qscintilla,
 # XXX: py-qt3-base, and py-qt3-modules.
 
-PYQT_VERSION=		3.15
+PYQT_VERSION=		3.15.1
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
 
diff --git a/x11/py-qt3-base/distinfo b/x11/py-qt3-base/distinfo
index 7f9701f0fd9..c8ea734a78a 100644
--- a/x11/py-qt3-base/distinfo
+++ b/x11/py-qt3-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/10/06 17:57:49 drochner Exp $
+$NetBSD: distinfo,v 1.10 2005/11/22 18:52:45 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-3.15.tar.gz) = 47c2729fb423dc19eb96255a1d0791c714b88754
-RMD160 (PyQt-x11-gpl-3.15.tar.gz) = d4db0a21013ea1b5338d74441ee50c41de7f25d9
-Size (PyQt-x11-gpl-3.15.tar.gz) = 789772 bytes
-SHA1 (patch-aa) = 9dd8356bf79f2a5fdb96603ccf679abd648d3585
+SHA1 (PyQt-x11-gpl-3.15.1.tar.gz) = 28ee34300e73b60f5f9f1dbdbb0bd051497a19ac
+RMD160 (PyQt-x11-gpl-3.15.1.tar.gz) = 56492774a425d3ca4175f02dd45d396f4322ec13
+Size (PyQt-x11-gpl-3.15.1.tar.gz) = 790366 bytes
+SHA1 (patch-aa) = 425ff917b8dd3c345bf86e49ccf7f91c5688e77a
 SHA1 (patch-ab) = 46cf5b2eb3481a9f5a1264f11abc57421c4d47a0
 SHA1 (patch-ac) = c3cd88ef6119f224920c0b8e6852b35052e6751a
diff --git a/x11/py-qt3-base/patches/patch-aa b/x11/py-qt3-base/patches/patch-aa
index fb3d7d32262..f0a26b9b338 100644
--- a/x11/py-qt3-base/patches/patch-aa
+++ b/x11/py-qt3-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2005/11/22 18:52:45 drochner Exp $
 
---- configure.py.orig	2005-08-30 19:42:52.000000000 +0200
+--- configure.py.orig	2005-11-14 18:31:26.000000000 +0100
 +++ configure.py
-@@ -733,7 +733,7 @@ def check_license():
+@@ -736,7 +736,7 @@ def check_license():
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -769,7 +769,7 @@ def create_makefiles():
+@@ -772,7 +772,7 @@ def create_makefiles():
  
          sipconfig.inform("Creating pyuic Makefile...")
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
              buildfile= "pyuic-prof.sbf"
  
              for xml in ("qdom.cpp", "qxml.cpp"):
-@@ -790,7 +790,7 @@ def create_makefiles():
+@@ -793,7 +793,7 @@ def create_makefiles():
          makefile.extra_defines.append("UIC")
          makefile.extra_defines.append("QT_INTERNAL_XML")
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
              makefile.extra_defines.append("QT_MODULE_XML")
  
          if sipcfg.qt_version < 0x030100:
-@@ -801,7 +801,7 @@ def create_makefiles():
+@@ -804,7 +804,7 @@ def create_makefiles():
  
          sipconfig.inform("Creating pylupdate Makefile...")
  
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
              buildfile= "pylupdate-prof.sbf"
  
              shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
-@@ -820,7 +820,7 @@ def create_makefiles():
+@@ -823,7 +823,7 @@ def create_makefiles():
  
          makefile.extra_defines.append("QT_INTERNAL_XML")
  
@@ -47,8 +47,8 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
              makefile.extra_defines.append("QT_MODULE_XML")
  
          makefile.generate()
-@@ -937,26 +937,26 @@ def main(argv):
-             sipconfig.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
+@@ -942,26 +942,26 @@ def main(argv):
+             sipconfig.error("This version of PyQt requires SIP v%s or later" % sipconfig.version_to_string(minv))
  
      # Check for QScintilla.
 -    check_qscintilla()
diff --git a/x11/py-qt3-modules/distinfo b/x11/py-qt3-modules/distinfo
index 6a915f356c5..fd2a39a7c11 100644
--- a/x11/py-qt3-modules/distinfo
+++ b/x11/py-qt3-modules/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2005/10/06 17:57:49 drochner Exp $
+$NetBSD: distinfo,v 1.11 2005/11/22 18:52:45 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-3.15.tar.gz) = 47c2729fb423dc19eb96255a1d0791c714b88754
-RMD160 (PyQt-x11-gpl-3.15.tar.gz) = d4db0a21013ea1b5338d74441ee50c41de7f25d9
-Size (PyQt-x11-gpl-3.15.tar.gz) = 789772 bytes
-SHA1 (patch-aa) = 298f30c8e549f107b042fc59539537bac3a463f6
+SHA1 (PyQt-x11-gpl-3.15.1.tar.gz) = 28ee34300e73b60f5f9f1dbdbb0bd051497a19ac
+RMD160 (PyQt-x11-gpl-3.15.1.tar.gz) = 56492774a425d3ca4175f02dd45d396f4322ec13
+Size (PyQt-x11-gpl-3.15.1.tar.gz) = 790366 bytes
+SHA1 (patch-aa) = e7d4fb83c8a374b99cd7f3076ef95647c88bb66b
diff --git a/x11/py-qt3-modules/patches/patch-aa b/x11/py-qt3-modules/patches/patch-aa
index 74fa250640d..75b5f81eb7a 100644
--- a/x11/py-qt3-modules/patches/patch-aa
+++ b/x11/py-qt3-modules/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2005/11/22 18:52:45 drochner Exp $
 
---- configure.py.orig	2005-08-30 19:42:52.000000000 +0200
+--- configure.py.orig	2005-11-14 18:31:26.000000000 +0100
 +++ configure.py
-@@ -38,7 +38,7 @@ pyqt_version_str = "3.15"
+@@ -38,7 +38,7 @@ pyqt_version_str = "3.15.1"
  sip_min_v3_version = 0x030c00
  sip_min_v4_version = 0x040300
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
  qt_sip_flags = []
  qtext_sip_flags = []
  qtpe_sip_flags = []
-@@ -733,7 +733,7 @@ def check_license():
+@@ -736,7 +736,7 @@ def check_license():
      print "Type 'no' to decline the terms of the license."
      print
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
          try:
              resp = raw_input("Do you accept the terms of the license? ")
          except:
-@@ -767,64 +767,64 @@ def create_makefiles():
+@@ -770,64 +770,64 @@ def create_makefiles():
          # The Professional Edition needs special handling.
          prof = (sipcfg.qt_edition == "professional")
  
@@ -138,8 +138,8 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
      elif sipcfg.qt_version >= 0x020000:
          sipconfig.inform("Creating pyuic Makefile...")
  
-@@ -937,7 +937,7 @@ def main(argv):
-             sipconfig.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
+@@ -942,7 +942,7 @@ def main(argv):
+             sipconfig.error("This version of PyQt requires SIP v%s or later" % sipconfig.version_to_string(minv))
  
      # Check for QScintilla.
 -    check_qscintilla()
@@ -147,7 +147,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $
  
      # Check which modules to build.
      check_module("qtcanvas", "qcanvas.h", "QCanvas()")
-@@ -955,8 +955,8 @@ def main(argv):
+@@ -960,8 +960,8 @@ def main(argv):
              if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
                  check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
  
diff --git a/x11/py-qt3-qscintilla/distinfo b/x11/py-qt3-qscintilla/distinfo
index 91d5b431873..18c494b3fff 100644
--- a/x11/py-qt3-qscintilla/distinfo
+++ b/x11/py-qt3-qscintilla/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/10/06 17:57:49 drochner Exp $
+$NetBSD: distinfo,v 1.10 2005/11/22 18:52:45 drochner Exp $
 
-SHA1 (PyQt-x11-gpl-3.15.tar.gz) = 47c2729fb423dc19eb96255a1d0791c714b88754
-RMD160 (PyQt-x11-gpl-3.15.tar.gz) = d4db0a21013ea1b5338d74441ee50c41de7f25d9
-Size (PyQt-x11-gpl-3.15.tar.gz) = 789772 bytes
+SHA1 (PyQt-x11-gpl-3.15.1.tar.gz) = 28ee34300e73b60f5f9f1dbdbb0bd051497a19ac
+RMD160 (PyQt-x11-gpl-3.15.1.tar.gz) = 56492774a425d3ca4175f02dd45d396f4322ec13
+Size (PyQt-x11-gpl-3.15.1.tar.gz) = 790366 bytes
 SHA1 (patch-aa) = 390a4651ebc7545bb75f230addb892828a0203f8