pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/py-qt5 if PYPKGPREFIX is not py27, disable QtWebKi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d075f8cf3cac
branches:  trunk
changeset: 374378:d075f8cf3cac
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Mon Jan 22 04:36:08 2018 +0000

description:
if PYPKGPREFIX is not py27, disable QtWebKit and remove it as a dependency

diffstat:

 x11/py-qt5/Makefile       |  13 ++++++++++++-
 x11/py-qt5/PLIST          |   6 +-----
 x11/py-qt5/PLIST.qtwebkit |   5 +++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diffs (64 lines):

diff -r 2f0000103fac -r d075f8cf3cac x11/py-qt5/Makefile
--- a/x11/py-qt5/Makefile       Mon Jan 22 04:17:11 2018 +0000
+++ b/x11/py-qt5/Makefile       Mon Jan 22 04:36:08 2018 +0000
@@ -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+=    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 @@
 .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 -r 2f0000103fac -r d075f8cf3cac x11/py-qt5/PLIST
--- a/x11/py-qt5/PLIST  Mon Jan 22 04:17:11 2018 +0000
+++ b/x11/py-qt5/PLIST  Mon Jan 22 04:36:08 2018 +0000
@@ -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 @@
 ${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 -r 2f0000103fac -r d075f8cf3cac x11/py-qt5/PLIST.qtwebkit
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-qt5/PLIST.qtwebkit Mon Jan 22 04:36:08 2018 +0000
@@ -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



Home | Main Index | Thread Index | Old Index