Thu Aug 21 21:33:07 2014 UTC ()
Update to 4.11.1:

v4.11.1 3rd July 2014
  - Added the -tr-function, -trUtf8-function and -translate-function command
    line options to pylupdate4.
  - Bug fixes.

v4.11 26th May 2014
  - By default a Python slot is only invoked if the underlying C++ instance
    still exists.
  - Added the no_receiver_check argument to connect().
  - Added support for Qt v4.8.6.
  - Added --target-py-version, --sysroot and --no-tools options to
    configure-ng.py.
  - Cross-compiling (specifically to iOS and Android when building against Qt
    v5) is now supported.
  - SIP v4.16 is now required.
  - Bug fixes.

v4.10.4 14th March 2014
  - Added the port of the webftpclient from Moritz Warning.
  - The --use-arch argument to configure.py can now be specified more than
    once.
  - Bug fixes.

v4.10.3 21st August 2013
  - Bug fixes.


(wiz)
diff -r1.73 -r1.74 pkgsrc/x11/py-qt4/Makefile
diff -r1.23 -r1.24 pkgsrc/x11/py-qt4/PLIST.common
diff -r1.32 -r1.33 pkgsrc/x11/py-qt4/distinfo
diff -r1.10 -r1.11 pkgsrc/x11/py-qt4/patches/patch-aa
cvs diff -r1.73 -r1.74 pkgsrc/x11/py-qt4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-qt4/Attic/Makefile 2014/02/12 23:18:53 1.73
+++ pkgsrc/x11/py-qt4/Attic/Makefile 2014/08/21 21:33:07 1.74
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.73 2014/02/12 23:18:53 tron Exp $ 1# $NetBSD: Makefile,v 1.74 2014/08/21 21:33:07 wiz Exp $
2 2
3PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION} 3PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION}
4PYQT_VERSION= 4.10.2 4PYQT_VERSION= 4.11.1
5PKGREVISION= 1 
6CATEGORIES= x11 python 5CATEGORIES= x11 python
7#MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt4/ 6#MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt4/
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= Python binding for Qt4 10COMMENT= Python binding for Qt4
12HOMEPAGE= http://www.riverbankcomputing.com/software/pyqt/intro 11HOMEPAGE= http://www.riverbankcomputing.com/software/pyqt/intro
13 12
14USE_LIBTOOL= yes 13USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config 14USE_TOOLS+= gmake pkg-config
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17 16
18CONFIGURE_ARGS+= -b ${PREFIX}/bin 17CONFIGURE_ARGS+= -b ${PREFIX}/bin
cvs diff -r1.23 -r1.24 pkgsrc/x11/py-qt4/Attic/PLIST.common (expand / switch to unified diff)

--- pkgsrc/x11/py-qt4/Attic/PLIST.common 2013/09/05 15:29:05 1.23
+++ pkgsrc/x11/py-qt4/Attic/PLIST.common 2014/08/21 21:33:07 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.common,v 1.23 2013/09/05 15:29:05 drochner Exp $ 1@comment $NetBSD: PLIST.common,v 1.24 2014/08/21 21:33:07 wiz Exp $
2bin/pylupdate4 2bin/pylupdate4
3bin/pyrcc4 3bin/pyrcc4
4bin/pyuic4 4bin/pyuic4
5${PYSITELIB}/PyQt4/Qt.so 5${PYSITELIB}/PyQt4/Qt.so
6${PYSITELIB}/PyQt4/QtCore.so 6${PYSITELIB}/PyQt4/QtCore.so
7${PYSITELIB}/PyQt4/QtDeclarative.so 7${PYSITELIB}/PyQt4/QtDeclarative.so
8${PYSITELIB}/PyQt4/QtDesigner.so 8${PYSITELIB}/PyQt4/QtDesigner.so
9${PYSITELIB}/PyQt4/QtGui.so 9${PYSITELIB}/PyQt4/QtGui.so
10${PYSITELIB}/PyQt4/QtHelp.so 10${PYSITELIB}/PyQt4/QtHelp.so
11${PYSITELIB}/PyQt4/QtMultimedia.so 11${PYSITELIB}/PyQt4/QtMultimedia.so
12${PYSITELIB}/PyQt4/QtNetwork.so 12${PYSITELIB}/PyQt4/QtNetwork.so
13${PYSITELIB}/PyQt4/QtOpenGL.so 13${PYSITELIB}/PyQt4/QtOpenGL.so
14${PYSITELIB}/PyQt4/QtScript.so 14${PYSITELIB}/PyQt4/QtScript.so
@@ -195,26 +195,27 @@ share/sip${PYVERSSUFFIX}/QtDesigner/defa @@ -195,26 +195,27 @@ share/sip${PYVERSSUFFIX}/QtDesigner/defa
195share/sip${PYVERSSUFFIX}/QtDesigner/extension.sip 195share/sip${PYVERSSUFFIX}/QtDesigner/extension.sip
196share/sip${PYVERSSUFFIX}/QtDesigner/formbuilder.sip 196share/sip${PYVERSSUFFIX}/QtDesigner/formbuilder.sip
197share/sip${PYVERSSUFFIX}/QtDesigner/membersheet.sip 197share/sip${PYVERSSUFFIX}/QtDesigner/membersheet.sip
198share/sip${PYVERSSUFFIX}/QtDesigner/propertysheet.sip 198share/sip${PYVERSSUFFIX}/QtDesigner/propertysheet.sip
199share/sip${PYVERSSUFFIX}/QtDesigner/qextensionmanager.sip 199share/sip${PYVERSSUFFIX}/QtDesigner/qextensionmanager.sip
200share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignercontainerextension.sip 200share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignercontainerextension.sip
201share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip 201share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip
202share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignercustomwidgetplugin.sip 202share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignercustomwidgetplugin.sip
203share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignermembersheetextension.sip 203share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignermembersheetextension.sip
204share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignerpropertysheetextension.sip 204share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignerpropertysheetextension.sip
205share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignertaskmenuextension.sip 205share/sip${PYVERSSUFFIX}/QtDesigner/qpydesignertaskmenuextension.sip
206share/sip${PYVERSSUFFIX}/QtDesigner/taskmenu.sip 206share/sip${PYVERSSUFFIX}/QtDesigner/taskmenu.sip
207share/sip${PYVERSSUFFIX}/QtGui/QtGuimod.sip 207share/sip${PYVERSSUFFIX}/QtGui/QtGuimod.sip
 208share/sip${PYVERSSUFFIX}/QtGui/opengl_types.sip
208share/sip${PYVERSSUFFIX}/QtGui/qabstractbutton.sip 209share/sip${PYVERSSUFFIX}/QtGui/qabstractbutton.sip
209share/sip${PYVERSSUFFIX}/QtGui/qabstractitemdelegate.sip 210share/sip${PYVERSSUFFIX}/QtGui/qabstractitemdelegate.sip
210share/sip${PYVERSSUFFIX}/QtGui/qabstractitemview.sip 211share/sip${PYVERSSUFFIX}/QtGui/qabstractitemview.sip
211share/sip${PYVERSSUFFIX}/QtGui/qabstractprintdialog.sip 212share/sip${PYVERSSUFFIX}/QtGui/qabstractprintdialog.sip
212share/sip${PYVERSSUFFIX}/QtGui/qabstractproxymodel.sip 213share/sip${PYVERSSUFFIX}/QtGui/qabstractproxymodel.sip
213share/sip${PYVERSSUFFIX}/QtGui/qabstractscrollarea.sip 214share/sip${PYVERSSUFFIX}/QtGui/qabstractscrollarea.sip
214share/sip${PYVERSSUFFIX}/QtGui/qabstractslider.sip 215share/sip${PYVERSSUFFIX}/QtGui/qabstractslider.sip
215share/sip${PYVERSSUFFIX}/QtGui/qabstractspinbox.sip 216share/sip${PYVERSSUFFIX}/QtGui/qabstractspinbox.sip
216share/sip${PYVERSSUFFIX}/QtGui/qabstracttextdocumentlayout.sip 217share/sip${PYVERSSUFFIX}/QtGui/qabstracttextdocumentlayout.sip
217share/sip${PYVERSSUFFIX}/QtGui/qaction.sip 218share/sip${PYVERSSUFFIX}/QtGui/qaction.sip
218share/sip${PYVERSSUFFIX}/QtGui/qactiongroup.sip 219share/sip${PYVERSSUFFIX}/QtGui/qactiongroup.sip
219share/sip${PYVERSSUFFIX}/QtGui/qapplication.sip 220share/sip${PYVERSSUFFIX}/QtGui/qapplication.sip
220share/sip${PYVERSSUFFIX}/QtGui/qbitmap.sip 221share/sip${PYVERSSUFFIX}/QtGui/qbitmap.sip
@@ -450,27 +451,26 @@ share/sip${PYVERSSUFFIX}/QtNetwork/qnetw @@ -450,27 +451,26 @@ share/sip${PYVERSSUFFIX}/QtNetwork/qnetw
450share/sip${PYVERSSUFFIX}/QtNetwork/qssl.sip 451share/sip${PYVERSSUFFIX}/QtNetwork/qssl.sip
451share/sip${PYVERSSUFFIX}/QtNetwork/qsslcertificate.sip 452share/sip${PYVERSSUFFIX}/QtNetwork/qsslcertificate.sip
452share/sip${PYVERSSUFFIX}/QtNetwork/qsslcertificateextension.sip 453share/sip${PYVERSSUFFIX}/QtNetwork/qsslcertificateextension.sip
453share/sip${PYVERSSUFFIX}/QtNetwork/qsslcipher.sip 454share/sip${PYVERSSUFFIX}/QtNetwork/qsslcipher.sip
454share/sip${PYVERSSUFFIX}/QtNetwork/qsslconfiguration.sip 455share/sip${PYVERSSUFFIX}/QtNetwork/qsslconfiguration.sip
455share/sip${PYVERSSUFFIX}/QtNetwork/qsslerror.sip 456share/sip${PYVERSSUFFIX}/QtNetwork/qsslerror.sip
456share/sip${PYVERSSUFFIX}/QtNetwork/qsslkey.sip 457share/sip${PYVERSSUFFIX}/QtNetwork/qsslkey.sip
457share/sip${PYVERSSUFFIX}/QtNetwork/qsslsocket.sip 458share/sip${PYVERSSUFFIX}/QtNetwork/qsslsocket.sip
458share/sip${PYVERSSUFFIX}/QtNetwork/qtcpserver.sip 459share/sip${PYVERSSUFFIX}/QtNetwork/qtcpserver.sip
459share/sip${PYVERSSUFFIX}/QtNetwork/qtcpsocket.sip 460share/sip${PYVERSSUFFIX}/QtNetwork/qtcpsocket.sip
460share/sip${PYVERSSUFFIX}/QtNetwork/qudpsocket.sip 461share/sip${PYVERSSUFFIX}/QtNetwork/qudpsocket.sip
461share/sip${PYVERSSUFFIX}/QtNetwork/qurlinfo.sip 462share/sip${PYVERSSUFFIX}/QtNetwork/qurlinfo.sip
462share/sip${PYVERSSUFFIX}/QtOpenGL/QtOpenGLmod.sip 463share/sip${PYVERSSUFFIX}/QtOpenGL/QtOpenGLmod.sip
463share/sip${PYVERSSUFFIX}/QtOpenGL/opengl_types.sip 
464share/sip${PYVERSSUFFIX}/QtOpenGL/qgl.sip 464share/sip${PYVERSSUFFIX}/QtOpenGL/qgl.sip
465share/sip${PYVERSSUFFIX}/QtOpenGL/qglbuffer.sip 465share/sip${PYVERSSUFFIX}/QtOpenGL/qglbuffer.sip
466share/sip${PYVERSSUFFIX}/QtOpenGL/qglcolormap.sip 466share/sip${PYVERSSUFFIX}/QtOpenGL/qglcolormap.sip
467share/sip${PYVERSSUFFIX}/QtOpenGL/qglframebufferobject.sip 467share/sip${PYVERSSUFFIX}/QtOpenGL/qglframebufferobject.sip
468share/sip${PYVERSSUFFIX}/QtOpenGL/qglpixelbuffer.sip 468share/sip${PYVERSSUFFIX}/QtOpenGL/qglpixelbuffer.sip
469share/sip${PYVERSSUFFIX}/QtOpenGL/qglshaderprogram.sip 469share/sip${PYVERSSUFFIX}/QtOpenGL/qglshaderprogram.sip
470share/sip${PYVERSSUFFIX}/QtScript/QtScriptmod.sip 470share/sip${PYVERSSUFFIX}/QtScript/QtScriptmod.sip
471share/sip${PYVERSSUFFIX}/QtScript/qscriptclass.sip 471share/sip${PYVERSSUFFIX}/QtScript/qscriptclass.sip
472share/sip${PYVERSSUFFIX}/QtScript/qscriptclasspropertyiterator.sip 472share/sip${PYVERSSUFFIX}/QtScript/qscriptclasspropertyiterator.sip
473share/sip${PYVERSSUFFIX}/QtScript/qscriptcontext.sip 473share/sip${PYVERSSUFFIX}/QtScript/qscriptcontext.sip
474share/sip${PYVERSSUFFIX}/QtScript/qscriptcontextinfo.sip 474share/sip${PYVERSSUFFIX}/QtScript/qscriptcontextinfo.sip
475share/sip${PYVERSSUFFIX}/QtScript/qscriptengine.sip 475share/sip${PYVERSSUFFIX}/QtScript/qscriptengine.sip
476share/sip${PYVERSSUFFIX}/QtScript/qscriptengineagent.sip 476share/sip${PYVERSSUFFIX}/QtScript/qscriptengineagent.sip
cvs diff -r1.32 -r1.33 pkgsrc/x11/py-qt4/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-qt4/Attic/distinfo 2014/01/09 19:03:08 1.32
+++ pkgsrc/x11/py-qt4/Attic/distinfo 2014/08/21 21:33:07 1.33
@@ -1,10 +1,7 @@ @@ -1,10 +1,7 @@
1$NetBSD: distinfo,v 1.32 2014/01/09 19:03:08 jperkin Exp $ 1$NetBSD: distinfo,v 1.33 2014/08/21 21:33:07 wiz Exp $
2 2
3SHA1 (PyQt-mac-gpl-4.10.2.tar.gz) = 40362e6b9f476683e4e35b83369e30a8dfff99ad 3SHA1 (PyQt-x11-gpl-4.11.1.tar.gz) = 83a0740545d51c179a1b316b664b0f9ff5e0f5af
4RMD160 (PyQt-mac-gpl-4.10.2.tar.gz) = a2a829f41e0753dc93efaf0d9e4e76d2c54d6d2c 4RMD160 (PyQt-x11-gpl-4.11.1.tar.gz) = 37f5dc06b4d06720a9f94dcd50f67a011c2dad78
5Size (PyQt-mac-gpl-4.10.2.tar.gz) = 11277392 bytes 5Size (PyQt-x11-gpl-4.11.1.tar.gz) = 11118850 bytes
6SHA1 (PyQt-x11-gpl-4.10.2.tar.gz) = 9a90e74c73f7c3e4a91eeb6f268f323a5722d9b6 6SHA1 (patch-aa) = 218eb50a2b027384030e5ba9900631138687fac3
7RMD160 (PyQt-x11-gpl-4.10.2.tar.gz) = 530ec99325bade7c0451d3458da020e9ab981a1c 
8Size (PyQt-x11-gpl-4.10.2.tar.gz) = 11280941 bytes 
9SHA1 (patch-aa) = 726a9be11f0fa8a275daa61358557cf37a6bf531 
10SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1 7SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1
cvs diff -r1.10 -r1.11 pkgsrc/x11/py-qt4/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/py-qt4/patches/Attic/patch-aa 2013/09/05 15:29:05 1.10
+++ pkgsrc/x11/py-qt4/patches/Attic/patch-aa 2014/08/21 21:33:07 1.11
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-aa,v 1.10 2013/09/05 15:29:05 drochner Exp $ 1$NetBSD: patch-aa,v 1.11 2014/08/21 21:33:07 wiz Exp $
2 2
3--- configure.py.orig 2013-04-21 12:01:57.000000000 +0000 3--- configure.py.orig 2014-07-03 14:00:02.000000000 +0000
4+++ configure.py 4+++ configure.py
5@@ -345,7 +345,7 @@ class ConfigurePyQt4: 5@@ -346,7 +346,7 @@ class ConfigurePyQt4:
6 pyqt_modules.append("QtCore") 6 pyqt_modules.append("QtCore")
7  7
8 check_module("QtGui", "qwidget.h", "new QWidget()") 8 check_module("QtGui", "qwidget.h", "new QWidget()")
9- check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") 9- check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
10+ check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"]) 10+ check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"])
11 check_module("QtMultimedia", "QAudioDeviceInfo", 11 check_module("QtMultimedia", "QAudioDeviceInfo",
12 "new QAudioDeviceInfo()") 12 "new QAudioDeviceInfo()")
13 check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()") 13 check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
14@@ -369,8 +369,8 @@ class ConfigurePyQt4: 14@@ -372,8 +372,8 @@ class ConfigurePyQt4:
 15 check_module("QtTest", "QtTest", "QTest::qSleep(0)")
15 check_module("QtWebKit", "qwebpage.h", "new QWebPage()") 16 check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
16 check_module("QtXml", "qdom.h", "new QDomDocument()") 
17 check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()") 17 check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
18- check_module("phonon", "phonon/videowidget.h", 18- check_module("phonon", "phonon/videowidget.h",
19- "new Phonon::VideoWidget()") 19- "new Phonon::VideoWidget()")
20+# check_module("phonon", "phonon/videowidget.h", 20+# check_module("phonon", "phonon/videowidget.h",
21+# "new Phonon::VideoWidget()") 21+# "new Phonon::VideoWidget()")
22 check_module("QtAssistant", "qassistantclient.h", 22 check_module("QtAssistant", "qassistantclient.h",
23 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, 23 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
24 extra_libs=ass_libs) 24 extra_libs=ass_libs)
25@@ -2093,11 +2093,7 @@ int main(int argc, char **argv) 25@@ -2027,11 +2027,7 @@ int main(int argc, char **argv)
26  26
27 out << QLibraryInfo::licensee() << '\\n'; 27 out << QLibraryInfo::licensee() << '\\n';
28  28
29-#if defined(QT_SHARED) || defined(QT_DLL) 29-#if defined(QT_SHARED) || defined(QT_DLL)
30 out << "shared\\n"; 30 out << "shared\\n";
31-#else 31-#else
32- out << "\\n"; 32- out << "static\\n";
33-#endif 33-#endif
34  34
35 // Determine which features should be disabled. 35 // Determine which features should be disabled.
36  36