Page MenuHomeFreeBSD
Files F142153547

D12964.diff
No OneTemporary
Actions

D12964.diff
View Options

Index: head/Mk/Uses/pyqt.mk
===================================================================
--- head/Mk/Uses/pyqt.mk
+++ head/Mk/Uses/pyqt.mk
@@ -75,6 +75,7 @@
PYQT4_LICENSE= GPLv3
PYQT5_LICENSE= GPLv3
+# Keep these synchronized with OPTIONS_DEFINE in devel/py-qt4 and devel/py-qt5
# PyQt components split up into pyqt4/pyqt5/...
_USE_PYQT_ALL= core dbus dbussupport demo designer designerplugin \
gui multimedia network opengl qscintilla2 \
@@ -84,7 +85,7 @@
help phonon script scripttools
# List of components only in pyqt5
_USE_PYQT5_ONLY= multimediawidgets printsupport qml serialport \
- webkitwidgets widgets
+ webchannel webengine webkitwidgets widgets
# Unversioned variables for the rest of the file
PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION}
@@ -118,6 +119,8 @@
py-sql_PATH= ${PYQT_PY_RELNAME}-sql>=${PYQT_VERSION}
py-svg_PATH= ${PYQT_PY_RELNAME}-svg>=${PYQT_VERSION}
py-test_PATH= ${PYQT_PY_RELNAME}-test>=${PYQT_VERSION}
+py-webchannel_PATH= ${PYQT_PY_RELNAME}-webchannel>=${PYQT_VERSION}
+py-webengine_PATH= ${PYQT_PY_RELNAME}-webengine>=${PYQT_VERSION}
py-webkit_PATH= ${PYQT_PY_RELNAME}-webkit>=${PYQT_VERSION}
py-xml_PATH= ${PYQT_PY_RELNAME}-xml>=${PYQT_VERSION}
py-xmlpatterns_PATH= ${PYQT_PY_RELNAME}-xmlpatterns>=${PYQT_VERSION}
@@ -152,6 +155,8 @@
py-sql_PORT= databases/${PYQT_RELNAME}-sql
py-svg_PORT= graphics/${PYQT_RELNAME}-svg
py-test_PORT= devel/${PYQT_RELNAME}-test
+py-webchannel_PORT= www/${PYQT_RELNAME}-webchannel
+py-webengine_PORT= www/${PYQT_RELNAME}-webengine
py-webkit_PORT= www/${PYQT_RELNAME}-webkit
py-xml_PORT= textproc/${PYQT_RELNAME}-xml
py-xmlpatterns_PORT= textproc/${PYQT_RELNAME}-xmlpatterns
@@ -184,6 +189,8 @@
py-sql_DESC= Python bindings for QtSql module
py-svg_DESC= Python bindings for QtSvg module
py-test_DESC= Python bindings for QtTest module
+py-webchannel_DESC= Python bindings for QtWebChannel module
+py-webengine_DESC= Python bindings for QtWebEngine module
py-webkit_DESC= Python bindings for QtWebKit module
py-xml_DESC= Python bindings for QtXml module
py-xmlpatterns_DESC= Python bindings for QtXmlPatterns module
Index: head/devel/py-qt4/Makefile
===================================================================
--- head/devel/py-qt4/Makefile
+++ head/devel/py-qt4/Makefile
@@ -12,6 +12,7 @@
USES= metaport python pyqt:4
USE_PYTHON= flavors
+# Keep these synchronized with _USE_PYQT_ALL / _USE_PYQT4_ONLY in Mk/Use/pyqt.mk
OPTIONS_DEFINE= assistant core dbus dbussupport declarative \
demo designer designerplugin doc gui help \
multimedia network opengl phonon qscintilla2 \
Index: head/devel/py-qt5-core/files/patch-configure.py
===================================================================
--- head/devel/py-qt5-core/files/patch-configure.py
+++ head/devel/py-qt5-core/files/patch-configure.py
@@ -7,8 +7,20 @@
Also fixes a bug where dbus support drops multiple -I flags produced
by pkg-config --cflags dbus-1 .
+Also fixes the build of www/py-qt5-webengine@py36 by adding printsupport to
+QtWebEngineWidgets.
+
--- configure.py.orig 2017-11-23 14:44:03 UTC
+++ configure.py
+@@ -98,7 +98,7 @@ MODULE_METADATA = {
+ 'QtWebEngineCore': ModuleMetadata(qmake_QT=['webenginecore', '-gui']),
+ 'QtWebEngineWidgets': ModuleMetadata(
+ qmake_QT=['webenginewidgets', 'webchannel',
+- 'network', 'widgets'],
++ 'network', 'printsupport', 'widgets'],
+ cpp11=True),
+ 'QtWebKit': ModuleMetadata(qmake_QT=['webkit', 'network']),
+ 'QtWebKitWidgets': ModuleMetadata(
@@ -503,7 +503,7 @@ class TargetConfiguration:
self.no_pydbus = False
self.no_qml_plugin = False
@@ -27,7 +39,7 @@
self.prot_is_public = True
self.vend_inc_dir = self.py_venv_inc_dir
-@@ -1450,8 +1450,9 @@ def generate_makefiles(target_config, verbose, parts,
+@@ -1450,8 +1450,9 @@ def generate_makefiles(target_config, ve
# Add the internal modules if they are required.
if not target_config.no_tools:
@@ -39,7 +51,7 @@
for mname in pyqt_modules:
metadata = MODULE_METADATA[mname]
-@@ -1493,20 +1494,17 @@ def generate_makefiles(target_config, verbose, parts,
+@@ -1493,20 +1494,17 @@ def generate_makefiles(target_config, ve
f.close()
@@ -69,7 +81,7 @@
generate_tool_wrapper(target_config, 'pyuic5',
'PyQt5.uic.pyuic')))
-@@ -1524,23 +1522,6 @@ def generate_makefiles(target_config, verbose, parts,
+@@ -1524,23 +1522,6 @@ def generate_makefiles(target_config, ve
source_path('examples', 'quick', 'tutorials', 'extending',
'chapter6-plugins'))
@@ -93,7 +105,7 @@
# Generate the Python dbus module.
if target_config.pydbus_module_dir != '':
mname = 'dbus'
-@@ -1568,14 +1549,18 @@ def generate_makefiles(target_config, verbose, parts,
+@@ -1568,14 +1549,18 @@ def generate_makefiles(target_config, ve
out_f.write('''TEMPLATE = subdirs
CONFIG += ordered nostrip
SUBDIRS = %s
Index: head/devel/py-qt5/Makefile
===================================================================
--- head/devel/py-qt5/Makefile
+++ head/devel/py-qt5/Makefile
@@ -2,6 +2,7 @@
PORTNAME= qt5
PORTVERSION= ${PYQT5_VERSION}
+PORTREVISION= 1
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -11,11 +12,12 @@
USES= metaport python pyqt:5
USE_PYTHON= flavors
+# Keep these synchronized with _USE_PYQT_ALL / _USE_PYQT5_ONLY in Mk/Use/pyqt.mk
OPTIONS_DEFINE= core dbus dbussupport demo designer \
designerplugin gui multimedia multimediawidgets \
network opengl printsupport qml qscintilla2 sql \
- serialport svg test webkit webkitwidgets \
- widgets xml xmlpatterns
+ serialport svg test webchannel webengine webkit \
+ webkitwidgets widgets xml xmlpatterns
OPTIONS_DEFAULT=${OPTIONS_DEFINE}
.for opt in ${OPTIONS_DEFINE}
Index: head/www/Makefile
===================================================================
--- head/www/Makefile
+++ head/www/Makefile
@@ -1830,6 +1830,8 @@
SUBDIR += py-qp
SUBDIR += py-qpy
SUBDIR += py-qt4-webkit
+ SUBDIR += py-qt5-webchannel
+ SUBDIR += py-qt5-webengine
SUBDIR += py-qt5-webkit
SUBDIR += py-qt5-webkitwidgets
SUBDIR += py-rackspace-monitoring
Index: head/www/py-qt5-webchannel/Makefile
===================================================================
--- head/www/py-qt5-webchannel/Makefile
+++ head/www/py-qt5-webchannel/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+PORTNAME= webchannel
+CATEGORIES= www devel python
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Python bindings for the Qt5 toolkit, QtWebChannel module
+
+# LICENSE set in Mk/Uses/pyqt.mk
+
+USES= python pyqt:5
+USE_PYQT= sip_build core_run gui_run network_run qml_run widgets_run
+USE_PYTHON= flavors
+USE_QT5= core qmake_build gui network qml webchannel widgets
+
+CONFIGURE_ARGS= --enable QtWebChannel \
+ --no-stubs
+PYQT_DIST= yes
+
+OPTIONS_DEFINE= API DEBUG
+OPTIONS_DEFAULT= API
+OPTIONS_SUB= yes
+
+API_DESC= Install QtWebChannel API for QScintilla2
+API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
+API_CONFIGURE_OFF= --no-qsci-api
+API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+DEBUG_CONFIGURE_ON= --debug --trace
+
+post-install-DEBUG-off:
+ ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/PyQt5/QtWebChannel.so
+
+.include <bsd.port.mk>
Index: head/www/py-qt5-webchannel/pkg-descr
===================================================================
--- head/www/py-qt5-webchannel/pkg-descr
+++ head/www/py-qt5-webchannel/pkg-descr
@@ -0,0 +1,4 @@
+PyQt5 is a set of Python bindings for Digia's Qt5 application framework.
+This package provides the QtChannel module.
+
+WWW: http://www.riverbankcomputing.co.uk/software/pyqt/
Index: head/www/py-qt5-webchannel/pkg-plist
===================================================================
--- head/www/py-qt5-webchannel/pkg-plist
+++ head/www/py-qt5-webchannel/pkg-plist
@@ -0,0 +1,5 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/QtWebChannel.so
+%%PYQT_SIPDIR%%/QtWebChannel/QtWebChannelmod.sip
+%%PYQT_SIPDIR%%/QtWebChannel/qwebchannel.sip
+%%PYQT_SIPDIR%%/QtWebChannel/qwebchannelabstracttransport.sip
+%%API%%%%QT_DATADIR%%/qsci/api/python/QtWebChannel.api
Index: head/www/py-qt5-webengine/Makefile
===================================================================
--- head/www/py-qt5-webengine/Makefile
+++ head/www/py-qt5-webengine/Makefile
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+PORTNAME= webengine
+CATEGORIES= www devel python
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Python bindings for the Qt5 toolkit, QtWebEngine module
+
+# LICENSE set in Mk/Uses/pyqt.mk
+
+USES= python pyqt:5
+USE_GL= gl
+USE_PYQT= sip_build core_run gui_run network_run webchannel_run
+USE_PYTHON= flavors
+USE_QT5= core gui location network printsupport qml quick webchannel \
+ webengine widgets qmake_build
+
+CONFIGURE_ARGS= --enable QtWebEngine \
+ --enable QtWebEngineCore \
+ --enable QtWebEngineWidgets \
+ --no-stubs
+PYQT_DIST= yes
+
+OPTIONS_DEFINE= API DEBUG
+OPTIONS_DEFAULT= API
+OPTIONS_SUB= yes
+
+API_DESC= Install QtWebEngine API for QScintilla2
+API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR}
+API_CONFIGURE_OFF= --no-qsci-api
+API_LIB_DEPENDS= libqscintilla2-qt5.so:devel/qscintilla2-qt5
+DEBUG_CONFIGURE_ON= --debug --trace
+
+post-install-DEBUG-off:
+ ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/PyQt5/QtWebEngine*.so
+
+.include <bsd.port.mk>
Index: head/www/py-qt5-webengine/pkg-descr
===================================================================
--- head/www/py-qt5-webengine/pkg-descr
+++ head/www/py-qt5-webengine/pkg-descr
@@ -0,0 +1,4 @@
+PyQt5 is a set of Python bindings for Digia's Qt5 application framework.
+This package provides the QtWebKit module.
+
+WWW: http://www.riverbankcomputing.co.uk/software/pyqt/
Index: head/www/py-qt5-webengine/pkg-plist
===================================================================
--- head/www/py-qt5-webengine/pkg-plist
+++ head/www/py-qt5-webengine/pkg-plist
@@ -0,0 +1,29 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/QtWebEngine.so
+%%PYTHON_SITELIBDIR%%/PyQt5/QtWebEngineCore.so
+%%PYTHON_SITELIBDIR%%/PyQt5/QtWebEngineWidgets.so
+%%PYQT_SIPDIR%%/QtWebEngine/QtWebEnginemod.sip
+%%PYQT_SIPDIR%%/QtWebEngine/qquickwebengineprofile.sip
+%%PYQT_SIPDIR%%/QtWebEngine/qquickwebenginescript.sip
+%%PYQT_SIPDIR%%/QtWebEngine/qtwebengineglobal.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/QtWebEngineCoremod.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecookiestore.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginehttprequest.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlrequestinfo.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlrequestinterceptor.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlrequestjob.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlschemehandler.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginecertificateerror.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginecontextmenudata.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginedownloaditem.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginefullscreenrequest.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginehistory.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginepage.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebengineprofile.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginescript.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginescriptcollection.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginesettings.sip
+%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebengineview.sip
+%%API%%%%QT_DATADIR%%/qsci/api/python/QtWebEngine.api
+%%API%%%%QT_DATADIR%%/qsci/api/python/QtWebEngineCore.api
+%%API%%%%QT_DATADIR%%/qsci/api/python/QtWebEngineWidgets.api

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 17, 1:12 PM (20 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27692895
Default Alt Text
D12964.diff (11 KB)

Event Timeline