On Mon May 18, 2020 at 09:25:11AM -0400, Kurt Mosiejczuk wrote:
> On Mon, May 18, 2020 at 06:42:32AM +0200, Rafael Sadowski wrote:
> > Ok to import py-qtwebengine after we have unlocked x11/qt5/qtwebengine?
> > Diff below and tarball attached.
>
> Comments below
>
> > Rafael
> >
> > diff --git a/www/py-qtwebengine/Makefile b/www/py-qtwebengine/Makefile
> > new file mode 100644
> > index 00000000000..d191af76948
> > --- /dev/null
> > +++ b/www/py-qtwebengine/Makefile
> > @@ -0,0 +1,52 @@
> > +# $OpenBSD: Makefile,v 1.22 2020/03/13 16:54:11 rsadowski Exp $
> > +
> > +COMMENT = python Qt5WebEngine bindings
> > +
> > +V= 5.13.2
> > +DISTNAME= PyQtWebEngine-${V}
> > +PKGNAME= py-qtwebengine-${V}
> > +
> > +CATEGORIES= www devel
> > +
> > +HOMEPAGE= https://www.riverbankcomputing.com/software/pyqtwebengine/intro
> > +
> > +MASTER_SITES=
> > https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${V}/
> > +
> > +# GPLv3 with exceptions for use with certain named open-source licenses
> > +PERMIT_PACKAGE= Yes
> > +
> > +LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
> > + x11/qt5/qtwebengine
> > +
> > +NO_TEST= Yes
> > +
> > +MODULES = lang/python \
> > + x11/qt5
> > +
> > +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> For a library like this, we've switched to using FLAVORS = python3 and
> FLAVOR = python3. It avoids having to look up whether or not a port is
> python3-only before deciding to put MODPY_FLAVOR at the end.
>
> > +
> > +RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
> > + devel/py-enum34 \
>
> Ending the last DEPENDS with a \ is a little weird, typo? Also, as kn
> pointed out, py-enum34 is not needed for a python3-only port.
>
> That's it for comments. I haven't build tested this, but saw those 2
> issues.
>
> --Kurt
>
Thanks kmos and kn for your feedback. I completely reworked the port.
I think the version is better. Any OKs?
- Add missing WANTLIB
- Add spaces after varname and =
- Add missing RUN nad BUILD depends
- Remove enum34 (From copy & waste)
- Add FLAVORS/FLAVOR pattern
- Add MAKE_FLAGS
- Regen PLIST
Cheers, Rafael
diff --git a/www/py-qtwebengine/Makefile b/www/py-qtwebengine/Makefile
new file mode 100644
index 00000000000..22d9d9b7d65
--- /dev/null
+++ b/www/py-qtwebengine/Makefile
@@ -0,0 +1,59 @@
+# $OpenBSD: Makefile,v 1.22 2020/03/13 16:54:11 rsadowski Exp $
+
+COMMENT = python Qt5WebEngine bindings
+
+V = 5.13.2
+DISTNAME = PyQtWebEngine-${V}
+PKGNAME = py-qtwebengine-${V}
+
+CATEGORIES = www devel
+
+HOMEPAGE = https://www.riverbankcomputing.com/software/pyqtwebengine/intro
+
+MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${V}/
+
+# GPLv3 with exceptions for use with certain named open-source licenses
+PERMIT_PACKAGE= Yes
+
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Positioning
+WANTLIB += Qt5PrintSupport Qt5Qml Qt5Quick Qt5WebChannel Qt5WebEngine
+WANTLIB += Qt5WebEngineCore Qt5WebEngineWidgets Qt5Widgets m
+
+MODULES = lang/python \
+ x11/qt5
+
+FLAVORS = python3
+FLAVOR = python3
+
+LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
+ x11/qt5/qtwebengine
+
+RUN_DEPENDS = x11/py-sip-qt5${MODPY_FLAVOR} \
+ devel/py-sip${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR}
+
+BUILD_DEPENDS = x11/py-sip-qt5${MODPY_FLAVOR} \
+ devel/py-sip${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR}
+
+CONFIGURE_STYLE = simple
+
+CONFIGURE_SCRIPT = ${MODPY_BIN} ${WRKSRC}/configure.py
+
+QTVER = qt5
+PYQTVER = PyQt5
+SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX}
+
+CONFIGURE_ARGS += --qmake=${MODQT5_QMAKE} \
+ --pyqt-sipdir=${LOCALBASE}/${SIPDIR} \
+ --sip=${LOCALBASE}/bin/sip${MODPY_BIN_SUFFIX} \
+ --verbose
+
+MAKE_FLAGS = CC="${CC}" CXX="${CXX}"
+
+MAKE_ENV = INSTALL_ROOT="${WRKINST}"
+SUBST_VARS += QTVER PYQTVER SIPDIR
+
+NO_TEST = Yes
+
+.include <bsd.port.mk>
diff --git a/www/py-qtwebengine/distinfo b/www/py-qtwebengine/distinfo
new file mode 100644
index 00000000000..235f1d233fd
--- /dev/null
+++ b/www/py-qtwebengine/distinfo
@@ -0,0 +1,2 @@
+SHA256 (PyQtWebEngine-5.13.2.tar.gz) =
QmSRG1hHx1ch2MnDCvkuWKIWvSXO7zf3q/khAFwdRak=
+SIZE (PyQtWebEngine-5.13.2.tar.gz) = 45234
diff --git a/www/py-qtwebengine/pkg/DESCR b/www/py-qtwebengine/pkg/DESCR
new file mode 100644
index 00000000000..60e08bda355
--- /dev/null
+++ b/www/py-qtwebengine/pkg/DESCR
@@ -0,0 +1 @@
+Python bindings for the Qt5 toolkit, QtWebEngine module
diff --git a/www/py-qtwebengine/pkg/PLIST b/www/py-qtwebengine/pkg/PLIST
new file mode 100644
index 00000000000..81d4e00e7b8
--- /dev/null
+++ b/www/py-qtwebengine/pkg/PLIST
@@ -0,0 +1,47 @@
+@comment $OpenBSD: PLIST,v 1.6 2020/03/13 16:54:12 rsadowski Exp $
+lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngine.pyi
+@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngine.so
+lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineCore.pyi
+@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineCore.so
+lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineWidgets.pyi
+@so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/QtWebEngineWidgets.so
+lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/INSTALLER
+lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/PyQtWebEngine-5.13.2.dist-info/RECORD
+lib/${QTVER}/qsci/
+lib/${QTVER}/qsci/api/
+lib/${QTVER}/qsci/api/python/
+lib/${QTVER}/qsci/api/python/PyQtWebEngine.api
+${SIPDIR}/QtWebEngine/
+${SIPDIR}/QtWebEngine/QtWebEnginemod.sip
+${SIPDIR}/QtWebEngine/qquickwebengineprofile.sip
+${SIPDIR}/QtWebEngine/qquickwebenginescript.sip
+${SIPDIR}/QtWebEngine/qtwebengineglobal.sip
+${SIPDIR}/QtWebEngineCore/
+${SIPDIR}/QtWebEngineCore/QtWebEngineCoremod.sip
+${SIPDIR}/QtWebEngineCore/qwebengineclientcertificatestore.sip
+${SIPDIR}/QtWebEngineCore/qwebenginecookiestore.sip
+${SIPDIR}/QtWebEngineCore/qwebenginehttprequest.sip
+${SIPDIR}/QtWebEngineCore/qwebenginenotification.sip
+${SIPDIR}/QtWebEngineCore/qwebenginequotarequest.sip
+${SIPDIR}/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlrequestinfo.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlrequestinterceptor.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlrequestjob.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlscheme.sip
+${SIPDIR}/QtWebEngineCore/qwebengineurlschemehandler.sip
+${SIPDIR}/QtWebEngineWidgets/
+${SIPDIR}/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginecertificateerror.sip
+${SIPDIR}/QtWebEngineWidgets/qwebengineclientcertificateselection.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginecontextmenudata.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginedownloaditem.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginefullscreenrequest.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginehistory.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginepage.sip
+${SIPDIR}/QtWebEngineWidgets/qwebengineprofile.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginescript.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginescriptcollection.sip
+${SIPDIR}/QtWebEngineWidgets/qwebenginesettings.sip
+${SIPDIR}/QtWebEngineWidgets/qwebengineview.sip
