diff --git Mk/Uses/pyqt.mk Mk/Uses/pyqt.mk index 2e0787ac2227..af3e61af08a7 100644 --- Mk/Uses/pyqt.mk +++ Mk/Uses/pyqt.mk @@ -52,16 +52,21 @@ PYQT_MAINTAINER= kde@FreeBSD.org MASTER_SITE_RIVERBANK= http://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/ -MASTER_SITES_SIP= SF/pyqt/sip/sip-${PORTVERSION} \ +# https://www.riverbankcomputing.com/static/Downloads/sip/4.19.15/sip-4.19.15.tar.gz +MASTER_SITES_SIP= RIVERBANK/sip/${PORTVERSION} \ + SF/pyqt/sip/sip-${PORTVERSION} \ GENTOO -MASTER_SITES_PYQT5= SF/pyqt/PyQt5/PyQt-${PORTVERSION} \ +MASTER_SITES_PYQT5= RIVERBANK/PyQt5/${PORTVERSION} \ + SF/pyqt/PyQt5/PyQt-${PORTVERSION} \ GENTOO -MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ +#https://www.riverbankcomputing.com/static/Downloads/QScintilla/QScintilla_gpl-2.11.tar.gz +MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \ + SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ GENTOO -SIP_VERSION= 4.19.13 -QSCI2_VERSION= 2.10.8 -PYQT5_VERSION= 5.11.3 +SIP_VERSION= 4.19.15 +QSCI2_VERSION= 2.11.1 +PYQT5_VERSION= 5.12.1 SIP_DISTNAME= sip-${SIP_VERSION} PYQT5_DISTNAME= PyQt5_gpl-${PYQT5_VERSION} @@ -221,7 +226,10 @@ PLIST_SUB+= PYQT_APIDIR=${_APIDIR_REL} \ PYQT_EXAMPLEDIR=${_EXAMPLEDIR_REL} \ PYQT_SIPDIR=${_SIPDIR_REL} \ PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \ - PYQT_QMLDIR=${_QMLDIR_REL} + PYQT_QMLDIR=${_QMLDIR_REL} \ + PYQT_SIPVERSION=${SIP_VERSION} \ + PYQT_QSCIVERSION=${QSCI2_VERSION} \ + PYQT_PYQTVERSION=${PYQT_VERSION} .if defined(PYQT_DIST) PORTVERSION= ${PYQT_VERSION} diff --git comms/py-qt5-serialport/Makefile comms/py-qt5-serialport/Makefile index 46927499ed8c..823c80b955a4 100644 --- comms/py-qt5-serialport/Makefile +++ comms/py-qt5-serialport/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= serialport -PORTREVISION= 1 CATEGORIES= comms devel python MAINTAINER= kde@FreeBSD.org diff --git databases/py-qt5-sql/Makefile databases/py-qt5-sql/Makefile index aa04af88ed30..c59af1d7a528 100644 --- databases/py-qt5-sql/Makefile +++ databases/py-qt5-sql/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= sql -PORTREVISION= 1 CATEGORIES= databases devel python MAINTAINER= kde@FreeBSD.org diff --git devel/py-qt5-core/Makefile devel/py-qt5-core/Makefile index 9d4ddf1e0660..650d5174312c 100644 --- devel/py-qt5-core/Makefile +++ devel/py-qt5-core/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= core -PORTREVISION= 2 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git devel/py-qt5-core/files/patch-configure.py devel/py-qt5-core/files/patch-configure.py index 39d4e023008f..699ae4eb13a7 100644 --- devel/py-qt5-core/files/patch-configure.py +++ devel/py-qt5-core/files/patch-configure.py @@ -12,18 +12,9 @@ QtWebEngineWidgets. Also causes .pyi files to be installed regardless of the Python version to simplify plist handling. ---- configure.py.orig 2018-10-01 13:38:10 UTC +--- configure.py.orig 2019-03-19 14:42:34 UTC +++ configure.py -@@ -102,7 +102,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( -@@ -527,7 +527,7 @@ class TargetConfiguration: +@@ -521,7 +521,7 @@ class TargetConfiguration: self.no_pydbus = False self.no_qml_plugin = False self.no_tools = False @@ -32,7 +23,7 @@ simplify plist handling. self.qmake = self._find_exe('qmake') self.qmake_spec = '' self.qmake_spec_default = '' -@@ -805,7 +805,7 @@ class TargetConfiguration: +@@ -799,7 +799,7 @@ class TargetConfiguration: """ # The platform may have changed so update the default. @@ -41,7 +32,7 @@ simplify plist handling. self.prot_is_public = True self.vend_inc_dir = self.py_venv_inc_dir -@@ -1506,8 +1506,9 @@ def generate_makefiles(target_config, verbose, parts, +@@ -1492,8 +1492,9 @@ def generate_makefiles(target_config, verbose, parts, # Add the internal modules if they are required. if not target_config.no_tools: @@ -53,7 +44,7 @@ simplify plist handling. for mname in pyqt_modules: metadata = MODULE_METADATA[mname] -@@ -1549,22 +1550,20 @@ def generate_makefiles(target_config, verbose, parts, +@@ -1535,22 +1536,20 @@ def generate_makefiles(target_config, verbose, parts, f.close() @@ -87,7 +78,7 @@ simplify plist handling. # Generate the Qt Designer plugin. if not target_config.no_designer_plugin and 'QtDesigner' in target_config.pyqt_modules: -@@ -1580,23 +1579,6 @@ def generate_makefiles(target_config, verbose, parts, +@@ -1566,23 +1565,6 @@ def generate_makefiles(target_config, verbose, parts, source_path('examples', 'quick', 'tutorials', 'extending', 'chapter6-plugins')) @@ -111,7 +102,7 @@ simplify plist handling. # Generate the Python dbus module. if target_config.pydbus_module_dir != '': mname = 'dbus' -@@ -1627,27 +1609,31 @@ def generate_makefiles(target_config, verbose, parts, +@@ -1613,27 +1595,31 @@ def generate_makefiles(target_config, verbose, parts, all_installs.append( root_dir + '/' + module_file_name(target_config, mname)) @@ -149,7 +140,7 @@ simplify plist handling. # Install the tool main scripts and wrappers. if wrappers: -@@ -1676,6 +1662,8 @@ INSTALLS += tools +@@ -1662,6 +1648,8 @@ INSTALLS += tools # Install the .sip files. if target_config.pyqt_sip_dir: for mname, metadata in MODULE_METADATA.items(): @@ -158,7 +149,7 @@ simplify plist handling. if metadata.public and mname != 'Qt': sip_files = matching_files(source_path('sip', mname, '*.sip')) -@@ -1695,7 +1683,7 @@ INSTALLS += sip%s +@@ -1681,7 +1669,7 @@ INSTALLS += sip%s all_installs.append(mdir) # Install the stub files. @@ -167,7 +158,7 @@ simplify plist handling. pyi_names = [mname + '.pyi' for mname in target_config.pyqt_modules if mname[0] != '_'] -@@ -1713,14 +1701,15 @@ INSTALLS += pep484_stubs +@@ -1699,14 +1687,15 @@ INSTALLS += pep484_stubs # Install the QScintilla .api file. if target_config.qsci_api: api_dir = target_config.qsci_api_dir + '/api/python' @@ -186,7 +177,7 @@ simplify plist handling. if distinfo: # The command to run to generate the .dist-info directory. -@@ -1984,7 +1973,7 @@ def inform_user(target_config, sip_version): +@@ -1970,7 +1959,7 @@ def inform_user(target_config, sip_version): os.path.join( target_config.qsci_api_dir, 'api', 'python')) @@ -195,7 +186,7 @@ simplify plist handling. inform("The PyQt5 PEP 484 stub files will be installed in %s." % target_config.pyqt_stubs_dir) -@@ -2553,7 +2542,7 @@ def generate_sip_module_code(target_config, verbose, p +@@ -2546,7 +2535,7 @@ def generate_sip_module_code(target_config, verbose, p argv.append('-a') argv.append(mname + '.api') @@ -204,7 +195,7 @@ simplify plist handling. argv.append('-y') argv.append(mname + '.pyi') -@@ -2726,7 +2715,7 @@ target.files = $$PY_MODULE +@@ -2719,7 +2708,7 @@ target.files = $$PY_MODULE pro_lines.append('INSTALLS += target') # This optimisation could apply to other platforms. diff --git devel/py-qt5-core/pkg-plist devel/py-qt5-core/pkg-plist index cb95b9291105..e61367bf5147 100644 --- devel/py-qt5-core/pkg-plist +++ devel/py-qt5-core/pkg-plist @@ -112,6 +112,8 @@ bin/pyuic5 %%PYQT_SIPDIR%%/QtCore/qbuffer.sip %%PYQT_SIPDIR%%/QtCore/qbytearray.sip %%PYQT_SIPDIR%%/QtCore/qbytearraymatcher.sip +%%PYQT_SIPDIR%%/QtCore/qcborcommon.sip +%%PYQT_SIPDIR%%/QtCore/qcborstream.sip %%PYQT_SIPDIR%%/QtCore/qchar.sip %%PYQT_SIPDIR%%/QtCore/qcollator.sip %%PYQT_SIPDIR%%/QtCore/qcommandlineoption.sip @@ -149,6 +151,7 @@ bin/pyuic5 %%PYQT_SIPDIR%%/QtCore/qlocale.sip %%PYQT_SIPDIR%%/QtCore/qlockfile.sip %%PYQT_SIPDIR%%/QtCore/qlogging.sip +%%PYQT_SIPDIR%%/QtCore/qloggingcategory.sip %%PYQT_SIPDIR%%/QtCore/qmargins.sip %%PYQT_SIPDIR%%/QtCore/qmessageauthenticationcode.sip %%PYQT_SIPDIR%%/QtCore/qmetaobject.sip diff --git devel/py-qt5-dbus/Makefile devel/py-qt5-dbus/Makefile index 630fd9a8d4d3..7ef2aaaea67d 100644 --- devel/py-qt5-dbus/Makefile +++ devel/py-qt5-dbus/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= dbus -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git devel/py-qt5-dbussupport/Makefile devel/py-qt5-dbussupport/Makefile index b695930bdf03..5753f09adf9f 100644 --- devel/py-qt5-dbussupport/Makefile +++ devel/py-qt5-dbussupport/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= dbussupport -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git devel/py-qt5-designer/Makefile devel/py-qt5-designer/Makefile index 3a83b20f628c..7d0a3a470af1 100644 --- devel/py-qt5-designer/Makefile +++ devel/py-qt5-designer/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= designer -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git devel/py-qt5-designerplugin/Makefile devel/py-qt5-designerplugin/Makefile index 6bdd1c7666a3..60605e2ccc4d 100644 --- devel/py-qt5-designerplugin/Makefile +++ devel/py-qt5-designerplugin/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= designerplugin -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git devel/py-qt5-help/Makefile devel/py-qt5-help/Makefile index c806a8a4eead..3cebfffa45aa 100644 --- devel/py-qt5-help/Makefile +++ devel/py-qt5-help/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= help -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git devel/py-qt5-qscintilla2/Makefile devel/py-qt5-qscintilla2/Makefile index eef657b6b9ed..29acc66e718c 100644 --- devel/py-qt5-qscintilla2/Makefile +++ devel/py-qt5-qscintilla2/Makefile @@ -2,7 +2,6 @@ PORTNAME= qscintilla2 PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_QSCI2} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt5- diff --git devel/py-qt5-qscintilla2/pkg-plist devel/py-qt5-qscintilla2/pkg-plist index 70781d6150bb..ec8424743d38 100644 --- devel/py-qt5-qscintilla2/pkg-plist +++ devel/py-qt5-qscintilla2/pkg-plist @@ -1,6 +1,6 @@ -%%PYTHON_SITELIBDIR%%/QScintilla-2.10.8.dist-info/INSTALLER -%%PYTHON_SITELIBDIR%%/QScintilla-2.10.8.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/QScintilla-2.10.8.dist-info/RECORD +%%PYTHON_SITELIBDIR%%/QScintilla-%%PYQT_QSCIVERSION%%.dist-info/INSTALLER +%%PYTHON_SITELIBDIR%%/QScintilla-%%PYQT_QSCIVERSION%%.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/QScintilla-%%PYQT_QSCIVERSION%%.dist-info/RECORD %%PYTHON_SITELIBDIR%%/PyQt5/Qsci.pyi %%PYTHON_SITELIBDIR%%/PyQt5/Qsci.so %%PYQT_SIPDIR%%/Qsci/qsciabstractapis.sip diff --git devel/py-qt5-test/Makefile devel/py-qt5-test/Makefile index 5b5a4b77cc9b..a70208148942 100644 --- devel/py-qt5-test/Makefile +++ devel/py-qt5-test/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= test -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git devel/py-qt5/Makefile devel/py-qt5/Makefile index ed8d011f7fd7..c1827fd7f39f 100644 --- devel/py-qt5/Makefile +++ devel/py-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= qt5 PORTVERSION= ${PYQT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git devel/py-qt5/distinfo devel/py-qt5/distinfo index 6cc08fd63364..dd817651b90f 100644 --- devel/py-qt5/distinfo +++ devel/py-qt5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539599822 -SHA256 (PyQt5_gpl-5.11.3.tar.gz) = c9b57d15601d436faf35dacf8e0acefa220194829a653e771e80b189b3261073 -SIZE (PyQt5_gpl-5.11.3.tar.gz) = 3121036 +TIMESTAMP = 1553895330 +SHA256 (PyQt5_gpl-5.12.1.tar.gz) = 3718ce847d824090fd5f95ff3f13847ee75c2507368d4cbaeb48338f506e59bf +SIZE (PyQt5_gpl-5.12.1.tar.gz) = 3147086 diff --git devel/py-sip/Makefile devel/py-sip/Makefile index e2ee08f37188..7293d00e53f6 100644 --- devel/py-sip/Makefile +++ devel/py-sip/Makefile @@ -3,7 +3,6 @@ PORTNAME= sip PORTVERSION= ${SIP_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_SIP} diff --git devel/py-sip/distinfo devel/py-sip/distinfo index 187b96cd15c5..204c89a5e3f0 100644 --- devel/py-sip/distinfo +++ devel/py-sip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539599371 -SHA256 (sip-4.19.13.tar.gz) = e353a7056599bf5fbd5d3ff9842a6ab2ea3cf4e0304a0f925ec5862907c0d15e -SIZE (sip-4.19.13.tar.gz) = 1038815 +TIMESTAMP = 1553895186 +SHA256 (sip-4.19.15.tar.gz) = 2b5c0b2c0266b467b365c21376d50dde61a3236722ab87ff1e8dacec283eb610 +SIZE (sip-4.19.15.tar.gz) = 1053921 diff --git devel/py-sip/pkg-plist devel/py-sip/pkg-plist index 212dec731a98..32845101fe3b 100644 --- devel/py-sip/pkg-plist +++ devel/py-sip/pkg-plist @@ -2,12 +2,12 @@ bin/sip %%PYTHON_INCLUDEDIR%%/sip.h %%PYTHON_SITELIBDIR%%/PyQt5/sip.pyi %%PYTHON_SITELIBDIR%%/PyQt5/sip.so -%%PYTHON_SITELIBDIR%%/PyQt5_sip-4.19.13.dist-info/INSTALLER -%%PYTHON_SITELIBDIR%%/PyQt5_sip-4.19.13.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/PyQt5_sip-4.19.13.dist-info/RECORD -%%PYTHON_SITELIBDIR%%/sip-4.19.13.dist-info/INSTALLER -%%PYTHON_SITELIBDIR%%/sip-4.19.13.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/sip-4.19.13.dist-info/RECORD +%%PYTHON_SITELIBDIR%%/PyQt5_sip-%%PYQT_SIPVERSION%%.dist-info/INSTALLER +%%PYTHON_SITELIBDIR%%/PyQt5_sip-%%PYQT_SIPVERSION%%.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/PyQt5_sip-%%PYQT_SIPVERSION%%.dist-info/RECORD +%%PYTHON_SITELIBDIR%%/sip-%%PYQT_SIPVERSION%%.dist-info/INSTALLER +%%PYTHON_SITELIBDIR%%/sip-%%PYQT_SIPVERSION%%.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/sip-%%PYQT_SIPVERSION%%.dist-info/RECORD %%PYTHON_SITELIBDIR%%/sip.pyi %%PYTHON_SITELIBDIR%%/sip.so %%PYTHON_SITELIBDIR%%/sipconfig.py diff --git devel/qscintilla2-designerplugin-qt5/Makefile devel/qscintilla2-designerplugin-qt5/Makefile index 00b1fce3cfb8..92aa48024f2f 100644 --- devel/qscintilla2-designerplugin-qt5/Makefile +++ devel/qscintilla2-designerplugin-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= designerplugin-qt5 PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITES_QSCI2} PKGNAMEPREFIX= qscintilla2- diff --git devel/qscintilla2-qt5/Makefile devel/qscintilla2-qt5/Makefile index e3ea7119b87c..a367e05009ff 100644 --- devel/qscintilla2-qt5/Makefile +++ devel/qscintilla2-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= qscintilla2-qt5 PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITES_QSCI2} DISTNAME= ${QSCI2_DISTNAME} diff --git devel/qscintilla2-qt5/distinfo devel/qscintilla2-qt5/distinfo index 91fa2f267ee4..722d7830d4e0 100644 --- devel/qscintilla2-qt5/distinfo +++ devel/qscintilla2-qt5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543102039 -SHA256 (QScintilla_gpl-2.10.8.tar.gz) = 46cd5b4e609ca5e13130ba8cc7028d44fd1dc5b037f97c492899006ed0c992eb -SIZE (QScintilla_gpl-2.10.8.tar.gz) = 2736054 +TIMESTAMP = 1553895280 +SHA256 (QScintilla_gpl-2.11.1.tar.gz) = dae54d19e43dba5a3f98ac084fc0bcfa6fb713fa851f1783a01404397fd722f5 +SIZE (QScintilla_gpl-2.11.1.tar.gz) = 2932060 diff --git devel/qscintilla2-qt5/pkg-plist devel/qscintilla2-qt5/pkg-plist index 7b2806dd1da1..06fe08bb5d90 100644 --- devel/qscintilla2-qt5/pkg-plist +++ devel/qscintilla2-qt5/pkg-plist @@ -52,9 +52,9 @@ %%QT_INCDIR%%/Qsci/qscistyle.h %%QT_INCDIR%%/Qsci/qscistyledtext.h %%QT_LIBDIR%%/libqscintilla2_qt5.so -%%QT_LIBDIR%%/libqscintilla2_qt5.so.13 -%%QT_LIBDIR%%/libqscintilla2_qt5.so.13.2 -%%QT_LIBDIR%%/libqscintilla2_qt5.so.13.2.1 +%%QT_LIBDIR%%/libqscintilla2_qt5.so.15 +%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.0 +%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.0.0 %%QT_MKSPECDIR%%/features/qscintilla2.prf %%QT_DATADIR%%/qsci/api/python/Python-2.4.api %%QT_DATADIR%%/qsci/api/python/Python-2.5.api diff --git graphics/py-qt5-svg/Makefile graphics/py-qt5-svg/Makefile index 4f00e3630692..2f0c00c6e011 100644 --- graphics/py-qt5-svg/Makefile +++ graphics/py-qt5-svg/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= svg -PORTREVISION= 1 CATEGORIES= graphics devel python MAINTAINER= kde@FreeBSD.org diff --git lang/py-qt5-qml/Makefile lang/py-qt5-qml/Makefile index 7cbd4177c520..e7436a7a4b40 100644 --- lang/py-qt5-qml/Makefile +++ lang/py-qt5-qml/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= qml -PORTREVISION= 1 CATEGORIES= lang devel python MAINTAINER= kde@FreeBSD.org diff --git misc/py-qt5-demo/Makefile misc/py-qt5-demo/Makefile index 3f4d15d1db9d..73acb30c2753 100644 --- misc/py-qt5-demo/Makefile +++ misc/py-qt5-demo/Makefile @@ -2,7 +2,6 @@ PORTNAME= demo PORTVERSION= ${PYQT5_VERSION} -PORTREVISION= 1 CATEGORIES= misc devel python MASTER_SITES= ${MASTER_SITES_PYQT5} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt5- diff --git misc/py-qt5-demo/pkg-plist misc/py-qt5-demo/pkg-plist index 138e1bd69385..28a1a3698f5f 100644 --- misc/py-qt5-demo/pkg-plist +++ misc/py-qt5-demo/pkg-plist @@ -899,6 +899,24 @@ %%PYQT_EXAMPLEDIR%%/quick/tutorials/extending/chapter6-plugins/Charts/pieslice.pyo %%PYQT_EXAMPLEDIR%%/quick/tutorials/extending/chapter6-plugins/Charts/qmldir %%PYQT_EXAMPLEDIR%%/quick/tutorials/extending/chapter6-plugins/app.qml +%%PYQT_EXAMPLEDIR%%/remoteobjects/modelview/modelviewclient.py +%%PYQT_EXAMPLEDIR%%/remoteobjects/modelview/modelviewclient.pyc +%%PYQT_EXAMPLEDIR%%/remoteobjects/modelview/modelviewclient.pyo +%%PYQT_EXAMPLEDIR%%/remoteobjects/modelview/modelviewserver.py +%%PYQT_EXAMPLEDIR%%/remoteobjects/modelview/modelviewserver.pyc +%%PYQT_EXAMPLEDIR%%/remoteobjects/modelview/modelviewserver.pyo +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicclient.py +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicclient.pyc +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicclient.pyo +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicserver.py +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicserver.pyc +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicserver.pyo +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnecteddynamicclient.py +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnecteddynamicclient.pyc +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnecteddynamicclient.pyo +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnecteddynamicserver.py +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnecteddynamicserver.pyc +%%PYQT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnecteddynamicserver.pyo %%PYQT_EXAMPLEDIR%%/richtext/README %%PYQT_EXAMPLEDIR%%/richtext/calendar.py %%PYQT_EXAMPLEDIR%%/richtext/calendar.pyc diff --git multimedia/py-qt5-multimedia/Makefile multimedia/py-qt5-multimedia/Makefile index ce0756935c4c..19b9b986ca80 100644 --- multimedia/py-qt5-multimedia/Makefile +++ multimedia/py-qt5-multimedia/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= multimedia -PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org diff --git multimedia/py-qt5-multimediawidgets/Makefile multimedia/py-qt5-multimediawidgets/Makefile index 4d590e92318d..c838458e3868 100644 --- multimedia/py-qt5-multimediawidgets/Makefile +++ multimedia/py-qt5-multimediawidgets/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= multimediawidgets -PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org diff --git net/py-qt5-network/Makefile net/py-qt5-network/Makefile index be84fa5a3986..c27892e17b53 100644 --- net/py-qt5-network/Makefile +++ net/py-qt5-network/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= network -PORTREVISION= 1 CATEGORIES= net devel python MAINTAINER= kde@FreeBSD.org diff --git net/py-qt5-network/pkg-plist net/py-qt5-network/pkg-plist index 8571a08d4de1..cfebd5ee2e9a 100644 --- net/py-qt5-network/pkg-plist +++ net/py-qt5-network/pkg-plist @@ -23,6 +23,7 @@ %%PYQT_SIPDIR%%/QtNetwork/qnetworkreply.sip %%PYQT_SIPDIR%%/QtNetwork/qnetworkrequest.sip %%PYQT_SIPDIR%%/QtNetwork/qnetworksession.sip +%%PYQT_SIPDIR%%/QtNetwork/qpassworddigestor.sip %%PYQT_SIPDIR%%/QtNetwork/qpynetwork_qhash.sip %%PYQT_SIPDIR%%/QtNetwork/qpynetwork_qmap.sip %%PYQT_SIPDIR%%/QtNetwork/qssl.sip diff --git print/py-qt5-printsupport/Makefile print/py-qt5-printsupport/Makefile index d863e1e242c7..44a475b1e3f0 100644 --- print/py-qt5-printsupport/Makefile +++ print/py-qt5-printsupport/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= printsupport -PORTREVISION= 1 CATEGORIES= print python MAINTAINER= kde@FreeBSD.org diff --git textproc/py-qt5-xml/Makefile textproc/py-qt5-xml/Makefile index b5c12a2d8b24..8c1dcd8f76b0 100644 --- textproc/py-qt5-xml/Makefile +++ textproc/py-qt5-xml/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= xml -PORTREVISION= 1 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org diff --git textproc/py-qt5-xmlpatterns/Makefile textproc/py-qt5-xmlpatterns/Makefile index 7e18656359c1..a05c67e6c693 100644 --- textproc/py-qt5-xmlpatterns/Makefile +++ textproc/py-qt5-xmlpatterns/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= xmlpatterns -PORTREVISION= 1 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org diff --git www/py-qt5-webchannel/Makefile www/py-qt5-webchannel/Makefile index c45abea51dac..713969849a8e 100644 --- www/py-qt5-webchannel/Makefile +++ www/py-qt5-webchannel/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= webchannel -PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org diff --git www/py-qt5-webengine/Makefile www/py-qt5-webengine/Makefile index 262ad4720ed3..7fc6a3b31e92 100644 --- www/py-qt5-webengine/Makefile +++ www/py-qt5-webengine/Makefile @@ -1,36 +1,40 @@ # $FreeBSD$ PORTNAME= webengine -PORTREVISION= 2 +DISTVERSION= 5.12.1 CATEGORIES= www devel python +MASTER_SITES= RIVERBANK/PyQtWebEngine/${DISTVERSION} +PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- +DISTNAME= PyQtWebEngine_gpl-${DISTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt5 toolkit, QtWebEngine module -# LICENSE set in Mk/Uses/pyqt.mk +LICENSE= GPLv3 BUILD_DEPENDS= ${PY_ENUM34} RUN_DEPENDS= ${PY_ENUM34} USES= python pyqt:5 qt:5 USE_GL= gl -USE_PYQT= sip_build core_run gui_run network_run webchannel_run +USE_PYQT= sip_build core gui network printsupport webchannel USE_PYTHON= concurrent flavors py3kplist USE_QT= core declarative gui location network printsupport webchannel \ webengine widgets qmake_build -CONFIGURE_ARGS= --enable QtWebEngine \ - --enable QtWebEngineCore \ - --enable QtWebEngineWidgets \ - --no-stubs -PYQT_DIST= yes +CONFIGURE_ARGS= -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ + -q ${QMAKE} \ + --sip ${SIP} \ + --pyqt-sipdir ${PYQT_SIPDIR} \ + --verbose +DESTDIRNAME= INSTALL_ROOT 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=${PYQT_APIDIR} +API_CONFIGURE_ON= --apidir=${PYQT_APIDIR} API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 DEBUG_CONFIGURE_ON= --debug --trace @@ -38,4 +42,8 @@ DEBUG_CONFIGURE_ON= --debug --trace post-install-DEBUG-off: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/PyQt5/QtWebEngine*.so +do-configure: + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} + .include diff --git www/py-qt5-webengine/distinfo www/py-qt5-webengine/distinfo new file mode 100644 index 000000000000..0ac62a0cf426 --- /dev/null +++ www/py-qt5-webengine/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1553936960 +SHA256 (PyQtWebEngine_gpl-5.12.1.tar.gz) = 860704672ea1b616e1347be1f347bc1c749e64ed378370863fe209e84e9bd473 +SIZE (PyQtWebEngine_gpl-5.12.1.tar.gz) = 42474 diff --git www/py-qt5-webengine/pkg-plist www/py-qt5-webengine/pkg-plist index 3bd9817e24cf..4d64ef7e6729 100644 --- www/py-qt5-webengine/pkg-plist +++ www/py-qt5-webengine/pkg-plist @@ -1,9 +1,13 @@ +%%PYTHON_SITELIBDIR%%/PyQt5/QtWebEngine.pyi %%PYTHON_SITELIBDIR%%/PyQt5/QtWebEngine.so +%%PYTHON_SITELIBDIR%%/PyQt5/QtWebEngineCore.pyi %%PYTHON_SITELIBDIR%%/PyQt5/QtWebEngineCore.so +%%PYTHON_SITELIBDIR%%/PyQt5/QtWebEngineWidgets.pyi %%PYTHON_SITELIBDIR%%/PyQt5/QtWebEngineWidgets.so -%%API%%%%PYQT_APIDIR%%/api/python/QtWebEngine.api -%%API%%%%PYQT_APIDIR%%/api/python/QtWebEngineCore.api -%%API%%%%PYQT_APIDIR%%/api/python/QtWebEngineWidgets.api +%%PYTHON_SITELIBDIR%%/PyQtWebEngine-%%PYQT_PYQTVERSION%%.dist-info/INSTALLER +%%PYTHON_SITELIBDIR%%/PyQtWebEngine-%%PYQT_PYQTVERSION%%.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/PyQtWebEngine-%%PYQT_PYQTVERSION%%.dist-info/RECORD +%%API%%%%PYQT_APIDIR%%/api/python/PyQtWebEngine.api %%PYQT_SIPDIR%%/QtWebEngine/QtWebEnginemod.sip %%PYQT_SIPDIR%%/QtWebEngine/qquickwebengineprofile.sip %%PYQT_SIPDIR%%/QtWebEngine/qquickwebenginescript.sip @@ -16,9 +20,11 @@ %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlrequestinfo.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlrequestinterceptor.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlrequestjob.sip +%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlscheme.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlschemehandler.sip %%PYQT_SIPDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip %%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginecertificateerror.sip +%%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebengineclientcertificateselection.sip %%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginecontextmenudata.sip %%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginedownloaditem.sip %%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebenginefullscreenrequest.sip diff --git www/py-qt5-webkit/Makefile www/py-qt5-webkit/Makefile index 9328d00379e6..841db25d2def 100644 --- www/py-qt5-webkit/Makefile +++ www/py-qt5-webkit/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= webkit -PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org diff --git www/py-qt5-webkitwidgets/Makefile www/py-qt5-webkitwidgets/Makefile index f68565296924..d252ce56c9f0 100644 --- www/py-qt5-webkitwidgets/Makefile +++ www/py-qt5-webkitwidgets/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= webkitwidgets -PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org diff --git x11-toolkits/py-qt5-gui/Makefile x11-toolkits/py-qt5-gui/Makefile index 38f3d4e166c5..c816a98daf50 100644 --- x11-toolkits/py-qt5-gui/Makefile +++ x11-toolkits/py-qt5-gui/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= gui -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org diff --git x11-toolkits/py-qt5-quick/Makefile x11-toolkits/py-qt5-quick/Makefile index 7354183bde40..dd5fbfb7f9a6 100644 --- x11-toolkits/py-qt5-quick/Makefile +++ x11-toolkits/py-qt5-quick/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= quick -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org diff --git x11-toolkits/py-qt5-quickwidgets/Makefile x11-toolkits/py-qt5-quickwidgets/Makefile index b1de69a740bf..5e6024c4d7d0 100644 --- x11-toolkits/py-qt5-quickwidgets/Makefile +++ x11-toolkits/py-qt5-quickwidgets/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= quickwidgets -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org diff --git x11-toolkits/py-qt5-widgets/Makefile x11-toolkits/py-qt5-widgets/Makefile index e225c9eccf9a..a0a34db501f2 100644 --- x11-toolkits/py-qt5-widgets/Makefile +++ x11-toolkits/py-qt5-widgets/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= widgets -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org diff --git x11/py-qt5-opengl/Makefile x11/py-qt5-opengl/Makefile index de02b555eeb0..7831cd320e0b 100644 --- x11/py-qt5-opengl/Makefile +++ x11/py-qt5-opengl/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= opengl -PORTREVISION= 1 CATEGORIES= x11 devel python MAINTAINER= kde@FreeBSD.org