svn commit: r514705 - in head: Mk/Uses devel/py-qt5 devel/py-qt5-core devel/py-qt5-core/files devel/py-qt5-help devel/py-sip devel/qscintilla2-qt5 net/py-qt5-network
Tobias C. Berner
tcberner at FreeBSD.org
Fri Oct 18 06:57:30 UTC 2019
Author: tcberner
Date: Fri Oct 18 06:57:27 2019
New Revision: 514705
URL: https://svnweb.freebsd.org/changeset/ports/514705
Log:
PyQt: Update to 5.13.0
Updates
- PyQt to 5.13.0
- sip to 4.19.18
- qscintilla to 2.11.2
PR: 239023
Exp-run by: antoine
Modified:
head/Mk/Uses/pyqt.mk
head/devel/py-qt5-core/Makefile
head/devel/py-qt5-core/files/patch-configure.py
head/devel/py-qt5-core/pkg-plist
head/devel/py-qt5-help/pkg-plist
head/devel/py-qt5/distinfo
head/devel/py-sip/distinfo
head/devel/qscintilla2-qt5/distinfo
head/devel/qscintilla2-qt5/pkg-plist
head/net/py-qt5-network/pkg-plist
Modified: head/Mk/Uses/pyqt.mk
==============================================================================
--- head/Mk/Uses/pyqt.mk Fri Oct 18 06:56:37 2019 (r514704)
+++ head/Mk/Uses/pyqt.mk Fri Oct 18 06:57:27 2019 (r514705)
@@ -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}
Modified: head/devel/py-qt5-core/Makefile
==============================================================================
--- head/devel/py-qt5-core/Makefile Fri Oct 18 06:56:37 2019 (r514704)
+++ head/devel/py-qt5-core/Makefile Fri Oct 18 06:57:27 2019 (r514705)
@@ -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 <bsd.port.post.mk>
Modified: head/devel/py-qt5-core/files/patch-configure.py
==============================================================================
--- head/devel/py-qt5-core/files/patch-configure.py Fri Oct 18 06:56:37 2019 (r514704)
+++ head/devel/py-qt5-core/files/patch-configure.py Fri Oct 18 06:57:27 2019 (r514705)
@@ -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.
Modified: head/devel/py-qt5-core/pkg-plist
==============================================================================
--- head/devel/py-qt5-core/pkg-plist Fri Oct 18 06:56:37 2019 (r514704)
+++ head/devel/py-qt5-core/pkg-plist Fri Oct 18 06:57:27 2019 (r514705)
@@ -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
Modified: head/devel/py-qt5-help/pkg-plist
==============================================================================
--- head/devel/py-qt5-help/pkg-plist Fri Oct 18 06:56:37 2019 (r514704)
+++ head/devel/py-qt5-help/pkg-plist Fri Oct 18 06:57:27 2019 (r514705)
@@ -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
Modified: head/devel/py-qt5/distinfo
==============================================================================
--- head/devel/py-qt5/distinfo Fri Oct 18 06:56:37 2019 (r514704)
+++ head/devel/py-qt5/distinfo Fri Oct 18 06:57:27 2019 (r514705)
@@ -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
Modified: head/devel/py-sip/distinfo
==============================================================================
--- head/devel/py-sip/distinfo Fri Oct 18 06:56:37 2019 (r514704)
+++ head/devel/py-sip/distinfo Fri Oct 18 06:57:27 2019 (r514705)
@@ -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
Modified: head/devel/qscintilla2-qt5/distinfo
==============================================================================
--- head/devel/qscintilla2-qt5/distinfo Fri Oct 18 06:56:37 2019 (r514704)
+++ head/devel/qscintilla2-qt5/distinfo Fri Oct 18 06:57:27 2019 (r514705)
@@ -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
Modified: head/devel/qscintilla2-qt5/pkg-plist
==============================================================================
--- head/devel/qscintilla2-qt5/pkg-plist Fri Oct 18 06:56:37 2019 (r514704)
+++ head/devel/qscintilla2-qt5/pkg-plist Fri Oct 18 06:57:27 2019 (r514705)
@@ -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
Modified: head/net/py-qt5-network/pkg-plist
==============================================================================
--- head/net/py-qt5-network/pkg-plist Fri Oct 18 06:56:37 2019 (r514704)
+++ head/net/py-qt5-network/pkg-plist Fri Oct 18 06:57:27 2019 (r514705)
@@ -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
More information about the svn-ports-head
mailing list