diff options
| author | dbj <dbj@pkgsrc.org> | 2018-01-22 04:36:08 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2018-01-22 04:36:08 +0000 |
| commit | 7ac9981f93dea5414cc92f41c16125353027caa9 (patch) | |
| tree | fbed3a8482f341f0b6fd37d169ac5fbe88a4ad7b /x11 | |
| parent | 5ef1a99d349c436f2f09ced2392d385b13ffb563 (diff) | |
| download | pkgsrc-7ac9981f93dea5414cc92f41c16125353027caa9.tar.gz | |
if PYPKGPREFIX is not py27, disable QtWebKit and remove it as a dependency
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/py-qt5/Makefile | 13 | ||||
| -rw-r--r-- | x11/py-qt5/PLIST | 6 | ||||
| -rw-r--r-- | x11/py-qt5/PLIST.qtwebkit | 5 |
3 files changed, 18 insertions, 6 deletions
diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile index c704b0d51fc..a8b9188a34b 100644 --- a/x11/py-qt5/Makefile +++ b/x11/py-qt5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2018/01/21 23:32:45 markd Exp $ +# $NetBSD: Makefile,v 1.27 2018/01/22 04:36:08 dbj Exp $ DISTNAME= PyQt5_gpl-${PYQT_VERSION} PKGNAME= ${PYPKGPREFIX}-qt5-${PYQT_VERSION} @@ -65,6 +65,15 @@ SUBST_FILES.x11lib+= configure.py SUBST_FILES.x11lib+= designer/designer.pro-in SUBST_FILES.x11lib+= qmlscene/qmlscene.pro-in +.include "../../lang/python/pyversion.mk" + +.if "${PYPKGPREFIX}" == "py27" +PLIST_SRC+= PLIST.qtwebkit +.else +CONFIGURE_ARGS+= --disable QtWebKit +CONFIGURE_ARGS+= --disable QtWebKitWidgets +.endif + do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${PYTHONBIN} configure.py ${CONFIGURE_ARGS} @@ -81,7 +90,9 @@ BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.19.4 .include "../../x11/qt5-qtsensors/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" .include "../../x11/qt5-qttools/buildlink3.mk" +.if "${PYPKGPREFIX}" == "py27" .include "../../x11/qt5-qtwebkit/buildlink3.mk" +.endif .include "../../x11/qt5-qtwebsockets/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-qt5/PLIST b/x11/py-qt5/PLIST index b6e1c05e0d4..d10d9de722d 100644 --- a/x11/py-qt5/PLIST +++ b/x11/py-qt5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2018/01/21 23:32:45 markd Exp $ +@comment $NetBSD: PLIST,v 1.6 2018/01/22 04:36:08 dbj Exp $ bin/pylupdate5 bin/pyrcc5 bin/pyuic5 @@ -43,10 +43,6 @@ ${PLIST.py3x}${PYSITELIB}/PyQt5/QtTest.pyi ${PYSITELIB}/PyQt5/QtTest.so ${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebChannel.pyi ${PYSITELIB}/PyQt5/QtWebChannel.so -${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKit.pyi -${PYSITELIB}/PyQt5/QtWebKit.so -${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKitWidgets.pyi -${PYSITELIB}/PyQt5/QtWebKitWidgets.so ${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebSockets.pyi ${PYSITELIB}/PyQt5/QtWebSockets.so ${PLIST.py3x}${PYSITELIB}/PyQt5/QtWidgets.pyi diff --git a/x11/py-qt5/PLIST.qtwebkit b/x11/py-qt5/PLIST.qtwebkit new file mode 100644 index 00000000000..25a9d23a06b --- /dev/null +++ b/x11/py-qt5/PLIST.qtwebkit @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST.qtwebkit,v 1.1 2018/01/22 04:36:08 dbj Exp $ +${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKit.pyi +${PYSITELIB}/PyQt5/QtWebKit.so +${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKitWidgets.pyi +${PYSITELIB}/PyQt5/QtWebKitWidgets.so |