pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 update PyQt to 3.14
details: https://anonhg.NetBSD.org/pkgsrc/rev/b213a4f91165
branches: trunk
changeset: 489685:b213a4f91165
user: drochner <drochner%pkgsrc.org@localhost>
date: Thu Feb 24 20:17:36 2005 +0000
description:
update PyQt to 3.14
changes:
-support for new qscintilla
-added support for QUuid, QMetaObject and QMetaProperty classes
-bugfixes
diffstat:
x11/py-qt3-base/Makefile | 7 +-
x11/py-qt3-base/PLIST | 4 +-
x11/py-qt3-base/distinfo | 4 +-
x11/py-qt3-base/patches/patch-aa | 78 +++++++++++++++----
x11/py-qt3-modules/Makefile | 7 +-
x11/py-qt3-modules/distinfo | 4 +-
x11/py-qt3-modules/patches/patch-aa | 111 +++++++++-------------------
x11/py-qt3-qscintilla/Makefile | 7 +-
x11/py-qt3-qscintilla/PLIST | 7 +-
x11/py-qt3-qscintilla/distinfo | 4 +-
x11/py-qt3-qscintilla/patches/patch-aa | 128 ++++++++++++--------------------
11 files changed, 171 insertions(+), 190 deletions(-)
diffs (truncated from 664 to 300 lines):
diff -r 2ef8e6683fd5 -r b213a4f91165 x11/py-qt3-base/Makefile
--- a/x11/py-qt3-base/Makefile Thu Feb 24 20:12:10 2005 +0000
+++ b/x11/py-qt3-base/Makefile Thu Feb 24 20:17:36 2005 +0000
@@ -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:36 drochner Exp $
#
-DISTNAME= PyQt-x11-gpl-3.11
-PKGNAME= ${PYPKGPREFIX}-qt3-base-3.11
-PKGREVISION= 1
+DISTNAME= PyQt-x11-gpl-3.14
+PKGNAME= ${PYPKGPREFIX}-qt3-base-3.14
CATEGORIES= x11 python
MASTER_SITES= http://www.river-bank.demon.co.uk/download/PyQt/
diff -r 2ef8e6683fd5 -r b213a4f91165 x11/py-qt3-base/PLIST
--- a/x11/py-qt3-base/PLIST Thu Feb 24 20:12:10 2005 +0000
+++ b/x11/py-qt3-base/PLIST Thu Feb 24 20:17:36 2005 +0000
@@ -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 $
bin/pylupdate${PYVERSSUFFIX}
bin/pyuic${PYVERSSUFFIX}
${PYSITELIB}/pyqtconfig.py
@@ -79,6 +79,7 @@
share/sip${PYVERSSUFFIX}/qt/qmenubar.sip
share/sip${PYVERSSUFFIX}/qt/qmenudata.sip
share/sip${PYVERSSUFFIX}/qt/qmessagebox.sip
+share/sip${PYVERSSUFFIX}/qt/qmetaobject.sip
share/sip${PYVERSSUFFIX}/qt/qmime.sip
share/sip${PYVERSSUFFIX}/qt/qmotifplusstyle.sip
share/sip${PYVERSSUFFIX}/qt/qmotifstyle.sip
@@ -161,6 +162,7 @@
share/sip${PYVERSSUFFIX}/qt/qurl.sip
share/sip${PYVERSSUFFIX}/qt/qurlinfo.sip
share/sip${PYVERSSUFFIX}/qt/qurloperator.sip
+share/sip${PYVERSSUFFIX}/qt/quuid.sip
share/sip${PYVERSSUFFIX}/qt/qvalidator.sip
share/sip${PYVERSSUFFIX}/qt/qvaluelist.sip
share/sip${PYVERSSUFFIX}/qt/qvariant.sip
diff -r 2ef8e6683fd5 -r b213a4f91165 x11/py-qt3-base/distinfo
--- a/x11/py-qt3-base/distinfo Thu Feb 24 20:12:10 2005 +0000
+++ b/x11/py-qt3-base/distinfo Thu Feb 24 20:17:36 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:18 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) = 1d16293b66739d2d4fbfd45b4ad850c6c2842863
+SHA1 (patch-aa) = f77e1969b0403e96c9445018ed71f431f32dcfb2
SHA1 (patch-ab) = 46cf5b2eb3481a9f5a1264f11abc57421c4d47a0
SHA1 (patch-ac) = c3cd88ef6119f224920c0b8e6852b35052e6751a
diff -r 2ef8e6683fd5 -r b213a4f91165 x11/py-qt3-base/patches/patch-aa
--- a/x11/py-qt3-base/patches/patch-aa Thu Feb 24 20:12:10 2005 +0000
+++ b/x11/py-qt3-base/patches/patch-aa Thu Feb 24 20:17:36 2005 +0000
@@ -1,8 +1,8 @@
-$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 11:30:42.000000000 +0200
-@@ -663,7 +663,7 @@
+--- configure.py.orig 2005-02-19 16:49:33.000000000 +0100
++++ configure.py
+@@ -732,7 +732,7 @@ def check_license():
print "Type 'no' to decline the terms of the license."
print
@@ -11,12 +11,48 @@
try:
resp = raw_input("Do you accept the terms of the license? ")
except:
-@@ -853,21 +853,21 @@
+@@ -768,7 +768,7 @@ def create_makefiles():
+
+ sipconfig.inform("Creating pyuic Makefile...")
+
+- if prof or "qtxml" not in pyqt_modules:
++ if prof: #or "qtxml" not in pyqt_modules:
+ buildfile= "pyuic-prof.sbf"
+
+ for xml in ("qdom.cpp", "qxml.cpp"):
+@@ -789,7 +789,7 @@ def create_makefiles():
+ makefile.extra_defines.append("UIC")
+ makefile.extra_defines.append("QT_INTERNAL_XML")
+
+- if prof or "qtxml" not in pyqt_modules:
++ if prof: #or "qtxml" not in pyqt_modules:
+ makefile.extra_defines.append("QT_MODULE_XML")
+
+ if sipcfg.qt_version < 0x030100:
+@@ -800,7 +800,7 @@ def create_makefiles():
+
+ sipconfig.inform("Creating pylupdate Makefile...")
+
+- if prof or "qtxml" not in pyqt_modules:
++ if prof: #or "qtxml" not in pyqt_modules:
+ buildfile= "pylupdate-prof.sbf"
+
+ shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
+@@ -819,7 +819,7 @@ def create_makefiles():
+
+ makefile.extra_defines.append("QT_INTERNAL_XML")
+
+- if prof or "qtxml" not in pyqt_modules:
++ if prof: #or "qtxml" not in pyqt_modules:
+ makefile.extra_defines.append("QT_MODULE_XML")
+
+ makefile.generate()
+@@ -936,26 +936,26 @@ def main(argv):
sipcfg.error("This version of PyQt requires SIP v%s or later" % sipcfg.version_to_string(minv))
# Check for QScintilla.
- check_qscintilla()
-+ #check_qscintilla()
++# check_qscintilla()
# Check which modules to build.
- check_module("qtcanvas", "qcanvas.h", "QCanvas()")
@@ -24,24 +60,32 @@
- check_module("qttable", "qtable.h", "QTable()")
- check_module("qtxml", "qdom.h", "QDomImplementation()")
- check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
-+ #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)
++# 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("qtsql", "qsql.h", "QSql()")
-+ # check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
++# 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")
-+ #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")
diff -r 2ef8e6683fd5 -r b213a4f91165 x11/py-qt3-modules/Makefile
--- a/x11/py-qt3-modules/Makefile Thu Feb 24 20:12:10 2005 +0000
+++ b/x11/py-qt3-modules/Makefile Thu Feb 24 20:17:36 2005 +0000
@@ -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 -r 2ef8e6683fd5 -r b213a4f91165 x11/py-qt3-modules/distinfo
--- a/x11/py-qt3-modules/distinfo Thu Feb 24 20:12:10 2005 +0000
+++ b/x11/py-qt3-modules/distinfo Thu Feb 24 20:17:36 2005 +0000
@@ -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 -r 2ef8e6683fd5 -r b213a4f91165 x11/py-qt3-modules/patches/patch-aa
--- a/x11/py-qt3-modules/patches/patch-aa Thu Feb 24 20:12:10 2005 +0000
+++ b/x11/py-qt3-modules/patches/patch-aa Thu Feb 24 20:17:36 2005 +0000
@@ -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 @@
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 @@
- 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 @@
+# 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 @@
+
+# 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 @@
+# qt=1,
+# warnings=1
+# )
-+
+
+- if prof or "qtxml" not in pyqt_modules:
+- buildfile= "pylupdate-prof.sbf"
+# makefile.extra_defines.append("QT_INTERNAL_XML")
-+
-+# if prof:
-+# makefile.extra_defines.append("QT_MODULE_XML")
-+
-+# makefile.generate()
Home |
Main Index |
Thread Index |
Old Index