diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index 9ab71a136eb5..96b9aefc0156 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -64,9 +64,9 @@ MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \ SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ GENTOO -SIP_VERSION= 4.19.17 -QSCI2_VERSION= 2.11.1 -PYQT5_VERSION= 5.12.2 +SIP_VERSION= 4.19.18 +QSCI2_VERSION= 2.11.2 +PYQT5_VERSION= 5.13.0 SIP_DISTNAME= sip-${SIP_VERSION} PYQT5_DISTNAME= PyQt5_gpl-${PYQT5_VERSION} diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile index 650d5174312c..4f3c5e92988a 100644 --- a/devel/py-qt5-core/Makefile +++ b/devel/py-qt5-core/Makefile @@ -52,5 +52,8 @@ post-install: ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 + # This Qt.so masks the Qt.py which is supposed to import + # all of the Qt submodules. + ${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/Qt.so .include diff --git a/devel/py-qt5-core/files/patch-configure.py b/devel/py-qt5-core/files/patch-configure.py index 699ae4eb13a7..e42c1216987b 100644 --- a/devel/py-qt5-core/files/patch-configure.py +++ b/devel/py-qt5-core/files/patch-configure.py @@ -12,9 +12,9 @@ QtWebEngineWidgets. Also causes .pyi files to be installed regardless of the Python version to simplify plist handling. ---- configure.py.orig 2019-03-19 14:42:34 UTC +--- configure.py.orig 2019-07-04 16:44:01 UTC +++ configure.py -@@ -521,7 +521,7 @@ class TargetConfiguration: +@@ -528,7 +528,7 @@ class TargetConfiguration: self.no_pydbus = False self.no_qml_plugin = False self.no_tools = False @@ -32,7 +32,7 @@ simplify plist handling. self.prot_is_public = True self.vend_inc_dir = self.py_venv_inc_dir -@@ -1492,8 +1492,9 @@ def generate_makefiles(target_config, verbose, parts, +@@ -1494,8 +1494,9 @@ def generate_makefiles(target_config, verbose, parts, # Add the internal modules if they are required. if not target_config.no_tools: @@ -44,14 +44,18 @@ simplify plist handling. for mname in pyqt_modules: metadata = MODULE_METADATA[mname] -@@ -1535,22 +1536,20 @@ def generate_makefiles(target_config, verbose, parts, +@@ -1539,7 +1540,8 @@ def generate_makefiles(target_config, verbose, parts, - f.close() - -- generate_sip_module_code(target_config, verbose, parts, tracing, 'Qt', -- fatal_warnings, sip_flags, False) + generate_sip_module_code(target_config, verbose, parts, tracing, 'Qt', + fatal_warnings, sip_flags, False) - subdirs.append('Qt') -- ++ if "QtCore" in target_config.pyqt_modules: ++ subdirs.append('Qt') + + # Generate the top-level __init__.py. + inf = open(source_path('__init__.py')) +@@ -1583,16 +1585,18 @@ del find_qt + # Generate any executable wrappers. wrappers = [] if not target_config.no_tools: - # Generate the pylupdate5 and pyrcc5 wrappers. @@ -78,7 +82,7 @@ simplify plist handling. # Generate the Qt Designer plugin. if not target_config.no_designer_plugin and 'QtDesigner' in target_config.pyqt_modules: -@@ -1566,23 +1565,6 @@ def generate_makefiles(target_config, verbose, parts, +@@ -1608,23 +1612,6 @@ del find_qt source_path('examples', 'quick', 'tutorials', 'extending', 'chapter6-plugins')) @@ -102,7 +106,7 @@ simplify plist handling. # Generate the Python dbus module. if target_config.pydbus_module_dir != '': mname = 'dbus' -@@ -1613,27 +1595,31 @@ def generate_makefiles(target_config, verbose, parts, +@@ -1655,27 +1642,31 @@ del find_qt all_installs.append( root_dir + '/' + module_file_name(target_config, mname)) @@ -114,12 +118,13 @@ simplify plist handling. SUBDIRS = %s +''' % (' '.join(subdirs))) +-init_py.files = __init__.py + if "QtCore" in target_config.pyqt_modules: + out_f.write(''' - init_py.files = %s ++init_py.files = %s init_py.path = %s INSTALLS += init_py --''' % (' '.join(subdirs), source_path('__init__.py'), root_dir)) +-''' % (' '.join(subdirs), root_dir)) +''' % (source_path('__init__.py'), root_dir)) - all_installs.append(root_dir + '/__init__.py') @@ -140,7 +145,7 @@ simplify plist handling. # Install the tool main scripts and wrappers. if wrappers: -@@ -1662,6 +1648,8 @@ INSTALLS += tools +@@ -1704,6 +1695,8 @@ INSTALLS += tools # Install the .sip files. if target_config.pyqt_sip_dir: for mname, metadata in MODULE_METADATA.items(): @@ -149,7 +154,7 @@ simplify plist handling. if metadata.public and mname != 'Qt': sip_files = matching_files(source_path('sip', mname, '*.sip')) -@@ -1681,7 +1669,7 @@ INSTALLS += sip%s +@@ -1723,7 +1716,7 @@ INSTALLS += sip%s all_installs.append(mdir) # Install the stub files. @@ -158,7 +163,7 @@ simplify plist handling. pyi_names = [mname + '.pyi' for mname in target_config.pyqt_modules if mname[0] != '_'] -@@ -1699,14 +1687,15 @@ INSTALLS += pep484_stubs +@@ -1741,14 +1734,15 @@ INSTALLS += pep484_stubs # Install the QScintilla .api file. if target_config.qsci_api: api_dir = target_config.qsci_api_dir + '/api/python' @@ -177,7 +182,7 @@ simplify plist handling. if distinfo: # The command to run to generate the .dist-info directory. -@@ -1970,7 +1959,7 @@ def inform_user(target_config, sip_version): +@@ -2012,7 +2006,7 @@ def inform_user(target_config, sip_version): os.path.join( target_config.qsci_api_dir, 'api', 'python')) @@ -186,7 +191,7 @@ simplify plist handling. inform("The PyQt5 PEP 484 stub files will be installed in %s." % target_config.pyqt_stubs_dir) -@@ -2546,7 +2535,7 @@ def generate_sip_module_code(target_config, verbose, p +@@ -2589,7 +2583,7 @@ def generate_sip_module_code(target_config, verbose, p argv.append('-a') argv.append(mname + '.api') @@ -195,7 +200,7 @@ simplify plist handling. argv.append('-y') argv.append(mname + '.pyi') -@@ -2719,7 +2708,7 @@ target.files = $$PY_MODULE +@@ -2762,7 +2756,7 @@ target.files = $$PY_MODULE pro_lines.append('INSTALLS += target') # This optimisation could apply to other platforms. diff --git a/devel/py-qt5-core/pkg-plist b/devel/py-qt5-core/pkg-plist index e61367bf5147..b80678520f5b 100644 --- a/devel/py-qt5-core/pkg-plist +++ b/devel/py-qt5-core/pkg-plist @@ -118,6 +118,7 @@ bin/pyuic5 %%PYQT_SIPDIR%%/QtCore/qcollator.sip %%PYQT_SIPDIR%%/QtCore/qcommandlineoption.sip %%PYQT_SIPDIR%%/QtCore/qcommandlineparser.sip +%%PYQT_SIPDIR%%/QtCore/qconcatenatetablesproxymodel.sip %%PYQT_SIPDIR%%/QtCore/qcoreapplication.sip %%PYQT_SIPDIR%%/QtCore/qcoreevent.sip %%PYQT_SIPDIR%%/QtCore/qcryptographichash.sip @@ -217,6 +218,7 @@ bin/pyuic5 %%PYQT_SIPDIR%%/QtCore/qtimer.sip %%PYQT_SIPDIR%%/QtCore/qtimezone.sip %%PYQT_SIPDIR%%/QtCore/qtranslator.sip +%%PYQT_SIPDIR%%/QtCore/qtransposeproxymodel.sip %%PYQT_SIPDIR%%/QtCore/qurl.sip %%PYQT_SIPDIR%%/QtCore/qurlquery.sip %%PYQT_SIPDIR%%/QtCore/quuid.sip diff --git a/devel/py-qt5-help/pkg-plist b/devel/py-qt5-help/pkg-plist index a14632918055..57bd529301b3 100644 --- a/devel/py-qt5-help/pkg-plist +++ b/devel/py-qt5-help/pkg-plist @@ -1,9 +1,12 @@ %%PYTHON_SITELIBDIR%%/PyQt5/QtHelp.so %%PYTHON_SITELIBDIR%%/PyQt5/QtHelp.pyi %%PYQT_SIPDIR%%/QtHelp/QtHelpmod.sip +%%PYQT_SIPDIR%%/QtHelp/qcompressedhelpinfo.sip %%PYQT_SIPDIR%%/QtHelp/qhelpcontentwidget.sip %%PYQT_SIPDIR%%/QtHelp/qhelpengine.sip %%PYQT_SIPDIR%%/QtHelp/qhelpenginecore.sip +%%PYQT_SIPDIR%%/QtHelp/qhelpfilterdata.sip +%%PYQT_SIPDIR%%/QtHelp/qhelpfilterengine.sip %%PYQT_SIPDIR%%/QtHelp/qhelpindexwidget.sip %%PYQT_SIPDIR%%/QtHelp/qhelpsearchengine.sip %%PYQT_SIPDIR%%/QtHelp/qhelpsearchquerywidget.sip diff --git a/devel/py-qt5/distinfo b/devel/py-qt5/distinfo index e251fc69939b..a8b13f7a350f 100644 --- a/devel/py-qt5/distinfo +++ b/devel/py-qt5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557776717 -SHA256 (PyQt5_gpl-5.12.2.tar.gz) = c565829e77dc9c281aa1a0cdf2eddaead4e0f844cbaf7a4408441967f03f5f0f -SIZE (PyQt5_gpl-5.12.2.tar.gz) = 3147205 +TIMESTAMP = 1562430455 +SHA256 (PyQt5_gpl-5.13.0.tar.gz) = 0cdbffe5135926527b61cc3692dd301cd0328dd87eeaf1313e610787c46faff9 +SIZE (PyQt5_gpl-5.13.0.tar.gz) = 3152704 diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo index 6fa4b1ff773e..f916c5c35e21 100644 --- a/devel/py-sip/distinfo +++ b/devel/py-sip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557776829 -SHA256 (sip-4.19.17.tar.gz) = 12bcd8f4d5feefc105bc075d12c5090ee783f7380728563c91b8b95d0ec45df3 -SIZE (sip-4.19.17.tar.gz) = 1056156 +TIMESTAMP = 1562430360 +SHA256 (sip-4.19.18.tar.gz) = c0bd863800ed9b15dcad477c4017cdb73fa805c25908b0240564add74d697e1e +SIZE (sip-4.19.18.tar.gz) = 1056840 diff --git a/devel/qscintilla2-qt5/distinfo b/devel/qscintilla2-qt5/distinfo index 722d7830d4e0..493da2b7e315 100644 --- a/devel/qscintilla2-qt5/distinfo +++ b/devel/qscintilla2-qt5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553895280 -SHA256 (QScintilla_gpl-2.11.1.tar.gz) = dae54d19e43dba5a3f98ac084fc0bcfa6fb713fa851f1783a01404397fd722f5 -SIZE (QScintilla_gpl-2.11.1.tar.gz) = 2932060 +TIMESTAMP = 1562430390 +SHA256 (QScintilla_gpl-2.11.2.tar.gz) = 029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1 +SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600 diff --git a/devel/qscintilla2-qt5/pkg-plist b/devel/qscintilla2-qt5/pkg-plist index 06fe08bb5d90..340164525701 100644 --- a/devel/qscintilla2-qt5/pkg-plist +++ b/devel/qscintilla2-qt5/pkg-plist @@ -67,6 +67,7 @@ %%QT_DATADIR%%/qsci/api/python/Python-3.5.api %%QT_DATADIR%%/qsci/api/python/Python-3.6.api %%QT_DATADIR%%/qsci/api/python/Python-3.7.api +%%QT_DATADIR%%/qsci/api/python/Python-3.8.api %%NLS%%%%QT_L10NDIR%%/qscintilla_cs.qm %%NLS%%%%QT_L10NDIR%%/qscintilla_de.qm %%NLS%%%%QT_L10NDIR%%/qscintilla_es.qm diff --git a/misc/qt5-doc/Makefile b/misc/qt5-doc/Makefile index 22a3328187d0..c256d0bc1bb5 100644 --- a/misc/qt5-doc/Makefile +++ b/misc/qt5-doc/Makefile @@ -8,6 +8,13 @@ # If you need up-to-date Qt Documentation, for now, use the the online one :) QT5_VERSION= 5.12.2 +# Lock the port at 5.12.2 due to distfile changes: At the moment it seems like +# the documentation is no longer availble as a single tarball. So while we try +# to figure out whether to create a per-module -doc port or some other nastiness +# hold this port back at the last single-file version available. +# If you need up-to-date Qt Documentation, for now, use the the online one :) +QT5_VERSION= 5.12.2 + PORTNAME= doc DISTVERSION= ${QT5_VERSION} CATEGORIES= misc diff --git a/net/py-qt5-network/pkg-plist b/net/py-qt5-network/pkg-plist index cfebd5ee2e9a..47ab93fea5b3 100644 --- a/net/py-qt5-network/pkg-plist +++ b/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/qocspresponse.sip %%PYQT_SIPDIR%%/QtNetwork/qpassworddigestor.sip %%PYQT_SIPDIR%%/QtNetwork/qpynetwork_qhash.sip %%PYQT_SIPDIR%%/QtNetwork/qpynetwork_qmap.sip