Mon Nov 23 15:18:19 2015 UTC ()
Changes 4.11.4:
- Added support for Qt v4.8.7.
- Added QWIDGETSIZE_MAX to QtGui.
- Added some missing QEvent.Type enum values.
- Added the --license-dir command line option to configure-ng.py.
- Added the --no-python-dbus command line option to configure-ng.py.
- Bug fixes.


(adam)
diff -r1.76 -r1.77 pkgsrc/x11/py-qt4/Makefile
diff -r1.1.1.1 -r0 pkgsrc/x11/py-qt4/PLIST.X11
diff -r1.24 -r1.25 pkgsrc/x11/py-qt4/PLIST.common
diff -r1.35 -r1.36 pkgsrc/x11/py-qt4/distinfo
cvs diff -r1.76 -r1.77 pkgsrc/x11/py-qt4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-qt4/Attic/Makefile 2015/04/25 14:25:15 1.76
+++ pkgsrc/x11/py-qt4/Attic/Makefile 2015/11/23 15:18:19 1.77
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.76 2015/04/25 14:25:15 tnn Exp $ 1# $NetBSD: Makefile,v 1.77 2015/11/23 15:18:19 adam Exp $
2 2
3PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION} 3PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION}
4PKGREVISION= 1 4PYQT_VERSION= 4.11.4
5PYQT_VERSION= 4.11.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
 12LICENSE= gnu-gpl-v3
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17 17
18CONFIGURE_ARGS+= -b ${PREFIX}/bin 18CONFIGURE_ARGS+= -b ${PREFIX}/bin
19CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB} 19CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB}
20CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX} 20CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX}
21CONFIGURE_ARGS+= -q ${QTDIR}/bin/qmake 21CONFIGURE_ARGS+= -q ${QTDIR}/bin/qmake
22CONFIGURE_ARGS+= --confirm-license 22CONFIGURE_ARGS+= --confirm-license
23CONFIGURE_ARGS+= --qsci-api 23CONFIGURE_ARGS+= --qsci-api
24 24
25INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 25INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
@@ -43,29 +43,32 @@ BUILDLINK_TRANSFORM+= rm:-Wl,-rpath,${WR @@ -43,29 +43,32 @@ BUILDLINK_TRANSFORM+= rm:-Wl,-rpath,${WR
43SUBST_CLASSES+= PIC 43SUBST_CLASSES+= PIC
44SUBST_STAGE.PIC= post-configure 44SUBST_STAGE.PIC= post-configure
45SUBST_FILES.PIC= qpy/QtCore/Makefile qpy/QtGui/Makefile 45SUBST_FILES.PIC= qpy/QtCore/Makefile qpy/QtGui/Makefile
46SUBST_SED.PIC= -e "s/CXXFLAGS =/CXXFLAGS = -fPIC/" 46SUBST_SED.PIC= -e "s/CXXFLAGS =/CXXFLAGS = -fPIC/"
47SUBST_MESSAGE.PIC= Adding -fPIC to CXXFLAGS. 47SUBST_MESSAGE.PIC= Adding -fPIC to CXXFLAGS.
48 48
49#SUBST_CLASSES+= pyversfx 49#SUBST_CLASSES+= pyversfx
50#SUBST_STAGE.pyversfx= pre-configure 50#SUBST_STAGE.pyversfx= pre-configure
51#SUBST_FILES.pyversfx= pyuic4/pyuic.sbf pylupdate4/pylupdate.sbf 51#SUBST_FILES.pyversfx= pyuic4/pyuic.sbf pylupdate4/pylupdate.sbf
52#SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g" 52#SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
53 53
54.include "../../mk/bsd.prefs.mk" 54.include "../../mk/bsd.prefs.mk"
55 55
56PLIST_SRC= ${PKGDIR}/PLIST.common 56.if ${OPSYS} == "Darwin"
 57DISTNAME= PyQt-mac-gpl-${PYQT_VERSION}
 58.else
57DISTNAME= PyQt-x11-gpl-${PYQT_VERSION} 59DISTNAME= PyQt-x11-gpl-${PYQT_VERSION}
58PLIST_SRC+= ${PKGDIR}/PLIST.X11 60.endif
 61
59.include "../../lang/python/extension.mk" 62.include "../../lang/python/extension.mk"
60 63
61CONFIGURE_ARGS+= --verbose 64CONFIGURE_ARGS+= --verbose
62do-configure: 65do-configure:
63 (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ 66 (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
64 ${PYTHONBIN} configure.py ${CONFIGURE_ARGS}) 67 ${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
65 68
66.include "../../x11/py-sip/buildlink3.mk" 69.include "../../x11/py-sip/buildlink3.mk"
67.include "../../sysutils/dbus/buildlink3.mk" 70.include "../../sysutils/dbus/buildlink3.mk"
68.include "../../sysutils/py-dbus/buildlink3.mk" 71.include "../../sysutils/py-dbus/buildlink3.mk"
69# needs the QtXmlPatterns fix 72# needs the QtXmlPatterns fix
70BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb3 73BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb3
71.include "../../x11/qt4-libs/buildlink3.mk" 74.include "../../x11/qt4-libs/buildlink3.mk"
File Deleted: pkgsrc/x11/py-qt4/Attic/PLIST.X11
cvs diff -r1.24 -r1.25 pkgsrc/x11/py-qt4/Attic/PLIST.common (expand / switch to unified diff)

--- pkgsrc/x11/py-qt4/Attic/PLIST.common 2014/08/21 21:33:07 1.24
+++ pkgsrc/x11/py-qt4/Attic/PLIST.common 2015/11/23 15:18:19 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.common,v 1.24 2014/08/21 21:33:07 wiz Exp $ 1@comment $NetBSD: PLIST.common,v 1.25 2015/11/23 15:18:19 adam 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
@@ -397,26 +397,28 @@ share/sip${PYVERSSUFFIX}/QtGui/qtreewidg @@ -397,26 +397,28 @@ share/sip${PYVERSSUFFIX}/QtGui/qtreewidg
397share/sip${PYVERSSUFFIX}/QtGui/qundogroup.sip 397share/sip${PYVERSSUFFIX}/QtGui/qundogroup.sip
398share/sip${PYVERSSUFFIX}/QtGui/qundostack.sip 398share/sip${PYVERSSUFFIX}/QtGui/qundostack.sip
399share/sip${PYVERSSUFFIX}/QtGui/qundoview.sip 399share/sip${PYVERSSUFFIX}/QtGui/qundoview.sip
400share/sip${PYVERSSUFFIX}/QtGui/qvalidator.sip 400share/sip${PYVERSSUFFIX}/QtGui/qvalidator.sip
401share/sip${PYVERSSUFFIX}/QtGui/qvector2d.sip 401share/sip${PYVERSSUFFIX}/QtGui/qvector2d.sip
402share/sip${PYVERSSUFFIX}/QtGui/qvector3d.sip 402share/sip${PYVERSSUFFIX}/QtGui/qvector3d.sip
403share/sip${PYVERSSUFFIX}/QtGui/qvector4d.sip 403share/sip${PYVERSSUFFIX}/QtGui/qvector4d.sip
404share/sip${PYVERSSUFFIX}/QtGui/qwhatsthis.sip 404share/sip${PYVERSSUFFIX}/QtGui/qwhatsthis.sip
405share/sip${PYVERSSUFFIX}/QtGui/qwidget.sip 405share/sip${PYVERSSUFFIX}/QtGui/qwidget.sip
406share/sip${PYVERSSUFFIX}/QtGui/qwidgetaction.sip 406share/sip${PYVERSSUFFIX}/QtGui/qwidgetaction.sip
407share/sip${PYVERSSUFFIX}/QtGui/qwindowdefs.sip 407share/sip${PYVERSSUFFIX}/QtGui/qwindowdefs.sip
408share/sip${PYVERSSUFFIX}/QtGui/qwizard.sip 408share/sip${PYVERSSUFFIX}/QtGui/qwizard.sip
409share/sip${PYVERSSUFFIX}/QtGui/qworkspace.sip 409share/sip${PYVERSSUFFIX}/QtGui/qworkspace.sip
 410share/sip${PYVERSSUFFIX}/QtGui/qx11embed_x11.sip
 411share/sip${PYVERSSUFFIX}/QtGui/qx11info_x11.sip
410share/sip${PYVERSSUFFIX}/QtHelp/QtHelpmod.sip 412share/sip${PYVERSSUFFIX}/QtHelp/QtHelpmod.sip
411share/sip${PYVERSSUFFIX}/QtHelp/qhelpcontentwidget.sip 413share/sip${PYVERSSUFFIX}/QtHelp/qhelpcontentwidget.sip
412share/sip${PYVERSSUFFIX}/QtHelp/qhelpengine.sip 414share/sip${PYVERSSUFFIX}/QtHelp/qhelpengine.sip
413share/sip${PYVERSSUFFIX}/QtHelp/qhelpenginecore.sip 415share/sip${PYVERSSUFFIX}/QtHelp/qhelpenginecore.sip
414share/sip${PYVERSSUFFIX}/QtHelp/qhelpindexwidget.sip 416share/sip${PYVERSSUFFIX}/QtHelp/qhelpindexwidget.sip
415share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchengine.sip 417share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchengine.sip
416share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchquerywidget.sip 418share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchquerywidget.sip
417share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchresultwidget.sip 419share/sip${PYVERSSUFFIX}/QtHelp/qhelpsearchresultwidget.sip
418share/sip${PYVERSSUFFIX}/QtMultimedia/QtMultimediamod.sip 420share/sip${PYVERSSUFFIX}/QtMultimedia/QtMultimediamod.sip
419share/sip${PYVERSSUFFIX}/QtMultimedia/qabstractvideobuffer.sip 421share/sip${PYVERSSUFFIX}/QtMultimedia/qabstractvideobuffer.sip
420share/sip${PYVERSSUFFIX}/QtMultimedia/qabstractvideosurface.sip 422share/sip${PYVERSSUFFIX}/QtMultimedia/qabstractvideosurface.sip
421share/sip${PYVERSSUFFIX}/QtMultimedia/qaudio.sip 423share/sip${PYVERSSUFFIX}/QtMultimedia/qaudio.sip
422share/sip${PYVERSSUFFIX}/QtMultimedia/qaudiodeviceinfo.sip 424share/sip${PYVERSSUFFIX}/QtMultimedia/qaudiodeviceinfo.sip
cvs diff -r1.35 -r1.36 pkgsrc/x11/py-qt4/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-qt4/Attic/distinfo 2015/01/27 06:10:15 1.35
+++ pkgsrc/x11/py-qt4/Attic/distinfo 2015/11/23 15:18:19 1.36
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: distinfo,v 1.35 2015/01/27 06:10:15 dbj Exp $ 1$NetBSD: distinfo,v 1.36 2015/11/23 15:18:19 adam Exp $
2 2
3SHA1 (PyQt-mac-gpl-4.11.1.tar.gz) = 9d7478758957c60ac5007144a0dc7f157f4a5836 3SHA1 (PyQt-mac-gpl-4.11.4.tar.gz) = c319f273e40afe68a2e65ff2b9c01e0d43e980f7
4RMD160 (PyQt-mac-gpl-4.11.1.tar.gz) = cba54dcbb6a41d5ccb45d9b38e7e2647696772f9 4RMD160 (PyQt-mac-gpl-4.11.4.tar.gz) = 55ab22e65a2681b7af3680db9462967578a907f0
5Size (PyQt-mac-gpl-4.11.1.tar.gz) = 11117079 bytes 5SHA512 (PyQt-mac-gpl-4.11.4.tar.gz) = 9aa8b860dc72eea5ccee33cc62d6935ac2dac21cfff8b1ed18c584d075f58a717fa2880284b0b27615f63bfafd1a50a0f7f40c1a1f43dd513aeb0da7e8cae900
6SHA1 (PyQt-x11-gpl-4.11.1.tar.gz) = 83a0740545d51c179a1b316b664b0f9ff5e0f5af 6Size (PyQt-mac-gpl-4.11.4.tar.gz) = 11312655 bytes
7RMD160 (PyQt-x11-gpl-4.11.1.tar.gz) = 37f5dc06b4d06720a9f94dcd50f67a011c2dad78 7SHA1 (PyQt-x11-gpl-4.11.4.tar.gz) = 5c489e655279f85d47c8a275d97a12dfa0c8fd87
8Size (PyQt-x11-gpl-4.11.1.tar.gz) = 11118850 bytes 8RMD160 (PyQt-x11-gpl-4.11.4.tar.gz) = d3ade67c4433852474c86220ea8611eb7f7cd0b1
 9SHA512 (PyQt-x11-gpl-4.11.4.tar.gz) = 58d0c5e30b0480c1b6ce1a3cc3ef0a1841bb15631830fb937d1f17f5d3d8cbe66a5e2adcfb2c3990fae38db66dd430668bd25413e254e72064a38c48f689f170
 10Size (PyQt-x11-gpl-4.11.4.tar.gz) = 11317088 bytes
9SHA1 (patch-configure.py) = 516da08fad535a7b743b400e9e613689982d057d 11SHA1 (patch-configure.py) = 516da08fad535a7b743b400e9e613689982d057d
10SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1 12SHA1 (patch-sip_QtCore_qlist.sip) = 4fb548d4ee755cbc955ec32a6b1702a71a9815f1