Changes 4.8.1:

* Support for the QT_BEGIN_NAMESPACE and QT_END_NAMESPACE macros to allow
  PyQt to be built against Qt built with namespace support.
* Bug fixes.

Changes 4.8:
* Added support for Qt v4.7 including the new QtDeclarative module.
* pyqtProperty() can now be used as a method decorator in the same way that
  the standard Python property type can be used.
* Added the notify argument to pyqtProperty().
* Unbound signals can now be subscripted in the same way that bound signals
  can.
* Added the missing << operator to QPolygon, QPolygonF and
  QXmlStreamAttributes.
* PyQt will now automatically keep a reference to objects set with some sort
  of setter method when Qt expects the underlying C++ instance to stay valid
  but does not take ownership of it.
* Added the lightmaps.py and stardelegate.py examples from Hans-Peter Jansen.
* Added the --assume-shared option to configure.py.
* The QtAssistant module is no longer built with Qt v4.7 and later.

3 files changed, 50 insertions, 32 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index f7f2003ed62..76d40bfd4ac 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.29 2010/09/14 11:03:04 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.30 2010/11/15 13:07:24 adam Exp $
 
-PKGNAME=		${PYPKGPREFIX}-qt4-${PYQT_VERSION}
-PYQT_VERSION=		4.7.6
-PKGREVISION=		1
-CATEGORIES=		x11 python
-MASTER_SITES=		http://www.riverbankcomputing.com/static/Downloads/PyQt4/
+PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
+PYQT_VERSION=	4.8.1
+CATEGORIES=	x11 python
+MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		Python binding for Qt4
-HOMEPAGE=		http://www.riverbankcomputing.com/software/pyqt/intro
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Python binding for Qt4
+HOMEPAGE=	http://www.riverbankcomputing.com/software/pyqt/intro
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
@@ -24,20 +22,20 @@ CONFIGURE_ARGS+=	-q ${QTDIR}/bin/qmake
 CONFIGURE_ARGS+=	--confirm-license
 CONFIGURE_ARGS+=	--qsci-api
 
-INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR:Q}
+INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
-PY_PATCHPLIST=			yes
-PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+PY_PATCHPLIST=		yes
+PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 # This is a hack. CPPFLAGS and CXXFLAGS from the environment are ignored,
 # however, so I don't know a better way to fix it.
-SUBST_CLASSES+=			PIC
-SUBST_STAGE.PIC=		post-configure
-SUBST_FILES.PIC=		qpy/QtCore/Makefile qpy/QtGui/Makefile
-SUBST_SED.PIC=			-e "s/CXXFLAGS      =/CXXFLAGS      = -fPIC/"
-SUBST_MESSAGE.PIC=		Adding -fPIC to CXXFLAGS.
+SUBST_CLASSES+=		PIC
+SUBST_STAGE.PIC=	post-configure
+SUBST_FILES.PIC=	qpy/QtCore/Makefile qpy/QtGui/Makefile
+SUBST_SED.PIC=		-e "s/CXXFLAGS      =/CXXFLAGS      = -fPIC/"
+SUBST_MESSAGE.PIC=	Adding -fPIC to CXXFLAGS.
 
-#SUBST_CLASSES+=		pyversfx
+#SUBST_CLASSES+=	pyversfx
 #SUBST_STAGE.pyversfx=	pre-configure
 #SUBST_FILES.pyversfx=	pyuic4/pyuic.sbf pylupdate4/pylupdate.sbf
 #SUBST_SED.pyversfx=	-e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
@@ -46,8 +44,8 @@ SUBST_MESSAGE.PIC=		Adding -fPIC to CXXFLAGS.
 
 PLIST_SRC=		${PKGDIR}/PLIST.common
 .if ${OPSYS} == "Darwin"
+# XXX this is not recorded in distinfo
 DISTNAME=		PyQt-mac-gpl-${PYQT_VERSION}
-PLIST_SRC+=		${PKGDIR}/PLIST.Darwin
 .else
 DISTNAME=		PyQt-x11-gpl-${PYQT_VERSION}
 PLIST_SRC+=		${PKGDIR}/PLIST.X11
@@ -71,8 +69,4 @@ BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.6.1nb3
 .include "../../x11/qt4-libs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.4.0nb1
 .include "../../x11/qt4-tools/buildlink3.mk"
-# ${PYSITELIB}/qt.so depends on libqassistantclient.so
-#  which is part of qt4-tools, so we need a runtime dependency
-#  XXX split this pkg?
-BUILDLINK_DEPMETHOD.qt4-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt4/PLIST.common b/x11/py-qt4/PLIST.common
index 25a8453c5d9..2a0005d458b 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST.common,v 1.13 2010/09/02 09:20:19 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.14 2010/11/15 13:07:24 adam Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
 ${PYSITELIB}/PyQt4/Qt.so
-${PYSITELIB}/PyQt4/QtAssistant.so
 ${PYSITELIB}/PyQt4/QtCore.so
+${PYSITELIB}/PyQt4/QtDeclarative.so
 ${PYSITELIB}/PyQt4/QtDesigner.so
 ${PYSITELIB}/PyQt4/QtGui.so
 ${PYSITELIB}/PyQt4/QtHelp.so
@@ -56,13 +56,12 @@ ${PYSITELIB}/PyQt4/uic/uiparser.py
 ${PYSITELIB}/PyQt4/uic/widget-plugins/phonon.py
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qaxcontainer.py
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qscintilla.py
+${PYSITELIB}/PyQt4/uic/widget-plugins/qtdeclarative.py
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qtwebkit.py
 ${PYSITELIB}/dbus/mainloop/qt.so
 qt4/plugins/designer/libpythonplugin.la
 qt4/qsci/api/python/PyQt4.api
 share/sip${PYVERSSUFFIX}/Qt/Qtmod.sip
-share/sip${PYVERSSUFFIX}/QtAssistant/QtAssistantmod.sip
-share/sip${PYVERSSUFFIX}/QtAssistant/qassistantclient.sip
 share/sip${PYVERSSUFFIX}/QtCore/QtCoremod.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstractanimation.sip
 share/sip${PYVERSSUFFIX}/QtCore/qabstracteventdispatcher.sip
@@ -85,6 +84,7 @@ share/sip${PYVERSSUFFIX}/QtCore/qdatetime.sip
 share/sip${PYVERSSUFFIX}/QtCore/qdir.sip
 share/sip${PYVERSSUFFIX}/QtCore/qdiriterator.sip
 share/sip${PYVERSSUFFIX}/QtCore/qeasingcurve.sip
+share/sip${PYVERSSUFFIX}/QtCore/qelapsedtimer.sip
 share/sip${PYVERSSUFFIX}/QtCore/qeventloop.sip
 share/sip${PYVERSSUFFIX}/QtCore/qeventtransition.sip
 share/sip${PYVERSSUFFIX}/QtCore/qfile.sip
@@ -155,6 +155,25 @@ share/sip${PYVERSSUFFIX}/QtCore/qvariantanimation.sip
 share/sip${PYVERSSUFFIX}/QtCore/qvector.sip
 share/sip${PYVERSSUFFIX}/QtCore/qwaitcondition.sip
 share/sip${PYVERSSUFFIX}/QtCore/qxmlstream.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/QtDeclarativemod.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativecomponent.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativecontext.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativeengine.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativeerror.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativeexpression.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativeextensionplugin.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativeimageprovider.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativeitem.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativelist.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativeparserstatus.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativeproperty.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativepropertymap.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativepropertyvaluesource.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativescriptstring.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qdeclarativeview.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qpydeclarativelistproperty.sip
+share/sip${PYVERSSUFFIX}/QtDeclarative/qpydeclarativepropertyvaluesource.sip
 share/sip${PYVERSSUFFIX}/QtDesigner/QtDesignermod.sip
 share/sip${PYVERSSUFFIX}/QtDesigner/abstractactioneditor.sip
 share/sip${PYVERSSUFFIX}/QtDesigner/abstractformbuilder.sip
@@ -327,6 +346,7 @@ share/sip${PYVERSSUFFIX}/QtGui/qsplitter.sip
 share/sip${PYVERSSUFFIX}/QtGui/qstackedlayout.sip
 share/sip${PYVERSSUFFIX}/QtGui/qstackedwidget.sip
 share/sip${PYVERSSUFFIX}/QtGui/qstandarditemmodel.sip
+share/sip${PYVERSSUFFIX}/QtGui/qstatictext.sip
 share/sip${PYVERSSUFFIX}/QtGui/qstatusbar.sip
 share/sip${PYVERSSUFFIX}/QtGui/qstringlistmodel.sip
 share/sip${PYVERSSUFFIX}/QtGui/qstyle.sip
@@ -402,6 +422,8 @@ share/sip${PYVERSSUFFIX}/QtNetwork/qhttp.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qlocalserver.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qlocalsocket.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkaccessmanager.sip
+share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkconfigmanager.sip
+share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkconfiguration.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkcookie.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkcookiejar.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkdiskcache.sip
@@ -409,6 +431,7 @@ share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkinterface.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkproxy.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkreply.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qnetworkrequest.sip
+share/sip${PYVERSSUFFIX}/QtNetwork/qnetworksession.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qssl.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qsslcertificate.sip
 share/sip${PYVERSSUFFIX}/QtNetwork/qsslcipher.sip
@@ -423,6 +446,7 @@ share/sip${PYVERSSUFFIX}/QtNetwork/qurlinfo.sip
 share/sip${PYVERSSUFFIX}/QtOpenGL/QtOpenGLmod.sip
 share/sip${PYVERSSUFFIX}/QtOpenGL/opengl_types.sip
 share/sip${PYVERSSUFFIX}/QtOpenGL/qgl.sip
+share/sip${PYVERSSUFFIX}/QtOpenGL/qglbuffer.sip
 share/sip${PYVERSSUFFIX}/QtOpenGL/qglcolormap.sip
 share/sip${PYVERSSUFFIX}/QtOpenGL/qglframebufferobject.sip
 share/sip${PYVERSSUFFIX}/QtOpenGL/qglpixelbuffer.sip
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index faf7dafcfc0..f83f2c0fe34 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2010/09/07 16:36:02 drochner Exp $
+$NetBSD: distinfo,v 1.16 2010/11/15 13:07:24 adam Exp $
 
-SHA1 (PyQt-x11-gpl-4.7.6.tar.gz) = 79170b33e3c4ee5716c48e131dafd30147b01c7c
-RMD160 (PyQt-x11-gpl-4.7.6.tar.gz) = ed9fdbee4989ab12a6bf8107468c04d333038f1f
-Size (PyQt-x11-gpl-4.7.6.tar.gz) = 7817245 bytes
+SHA1 (PyQt-x11-gpl-4.8.1.tar.gz) = e064ed38817bafde72f2a57679d80d40c7015afb
+RMD160 (PyQt-x11-gpl-4.8.1.tar.gz) = e5ba0d98359ce315432f479a5f44b2c1ae69b77a
+Size (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 bytes
 SHA1 (patch-aa) = 2313842ad3dd2650bc89d06e88b5cd75e5affdbd