pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/py-qt5 it was pointed out that python27 is a build...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6925bb72c167
branches:  trunk
changeset: 374476:6925bb72c167
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Tue Jan 23 16:42:02 2018 +0000

description:
it was pointed out that python27 is a build only dependency for qt5-qtwebkit
revert previous

diffstat:

 x11/py-qt5/Makefile       |  13 +------------
 x11/py-qt5/PLIST.qtwebkit |   5 -----
 2 files changed, 1 insertions(+), 17 deletions(-)

diffs (44 lines):

diff -r 4606801eaf49 -r 6925bb72c167 x11/py-qt5/Makefile
--- a/x11/py-qt5/Makefile       Tue Jan 23 15:31:23 2018 +0000
+++ b/x11/py-qt5/Makefile       Tue Jan 23 16:42:02 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/01/22 04:36:08 dbj Exp $
+# $NetBSD: Makefile,v 1.28 2018/01/23 16:42:02 dbj Exp $
 
 DISTNAME=      PyQt5_gpl-${PYQT_VERSION}
 PKGNAME=       ${PYPKGPREFIX}-qt5-${PYQT_VERSION}
@@ -65,15 +65,6 @@
 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}
@@ -90,9 +81,7 @@
 .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 4606801eaf49 -r 6925bb72c167 x11/py-qt5/PLIST.qtwebkit
--- a/x11/py-qt5/PLIST.qtwebkit Tue Jan 23 15:31:23 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-@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