svn commit: r498035 - in head: Mk/Uses comms/py-qt5-serialport databases/py-qt5-sql devel/py-qt5 devel/py-qt5-core devel/py-qt5-core/files devel/py-qt5-dbus devel/py-qt5-dbussupport devel/py-qt5-de...
Tobias C. Berner
tcberner at FreeBSD.org
Fri Apr 5 23:05:32 UTC 2019
Author: tcberner
Date: Fri Apr 5 23:05:20 2019
New Revision: 498035
URL: https://svnweb.freebsd.org/changeset/ports/498035
Log:
Update PyQt5 to 5.12.1
- Upgrade sip to 4.19.15
- Upgrade qscintilla2 to 2.11.1
- Upgrade PyQt to 5.12.1
- From this version on www/py-qt5-webengine is unbundled and ships its own distfile
PR: 236894
Exp-run by: antoine
Added:
head/www/py-qt5-webengine/distinfo (contents, props changed)
Modified:
head/Mk/Uses/pyqt.mk
head/comms/py-qt5-serialport/Makefile
head/databases/py-qt5-sql/Makefile
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-dbus/Makefile
head/devel/py-qt5-dbussupport/Makefile
head/devel/py-qt5-designer/Makefile
head/devel/py-qt5-designerplugin/Makefile
head/devel/py-qt5-help/Makefile
head/devel/py-qt5-qscintilla2/Makefile
head/devel/py-qt5-qscintilla2/pkg-plist
head/devel/py-qt5-test/Makefile
head/devel/py-qt5/Makefile
head/devel/py-qt5/distinfo
head/devel/py-sip/Makefile
head/devel/py-sip/distinfo
head/devel/py-sip/pkg-plist
head/devel/qscintilla2-designerplugin-qt5/Makefile
head/devel/qscintilla2-qt5/Makefile
head/devel/qscintilla2-qt5/distinfo
head/devel/qscintilla2-qt5/pkg-plist
head/graphics/py-qt5-svg/Makefile
head/lang/py-qt5-qml/Makefile
head/misc/py-qt5-demo/Makefile
head/misc/py-qt5-demo/pkg-plist
head/multimedia/py-qt5-multimedia/Makefile
head/multimedia/py-qt5-multimediawidgets/Makefile
head/net/py-qt5-network/Makefile
head/net/py-qt5-network/pkg-plist
head/print/py-qt5-printsupport/Makefile
head/textproc/py-qt5-xml/Makefile
head/textproc/py-qt5-xmlpatterns/Makefile
head/www/py-qt5-webchannel/Makefile
head/www/py-qt5-webengine/Makefile
head/www/py-qt5-webengine/pkg-plist
head/www/py-qt5-webkit/Makefile
head/www/py-qt5-webkitwidgets/Makefile
head/x11-toolkits/py-qt5-gui/Makefile
head/x11-toolkits/py-qt5-quick/Makefile
head/x11-toolkits/py-qt5-quickwidgets/Makefile
head/x11-toolkits/py-qt5-widgets/Makefile
head/x11/py-qt5-opengl/Makefile
Modified: head/Mk/Uses/pyqt.mk
==============================================================================
--- head/Mk/Uses/pyqt.mk Fri Apr 5 22:57:51 2019 (r498034)
+++ head/Mk/Uses/pyqt.mk Fri Apr 5 23:05:20 2019 (r498035)
@@ -52,16 +52,21 @@ PYQT_MAINTAINER= kde at 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}
Modified: head/comms/py-qt5-serialport/Makefile
==============================================================================
--- head/comms/py-qt5-serialport/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/comms/py-qt5-serialport/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= serialport
-PORTREVISION= 1
CATEGORIES= comms devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/databases/py-qt5-sql/Makefile
==============================================================================
--- head/databases/py-qt5-sql/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/databases/py-qt5-sql/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= sql
-PORTREVISION= 1
CATEGORIES= databases devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/devel/py-qt5-core/Makefile
==============================================================================
--- head/devel/py-qt5-core/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-core/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= core
-PORTREVISION= 2
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/devel/py-qt5-core/files/patch-configure.py
==============================================================================
--- head/devel/py-qt5-core/files/patch-configure.py Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-core/files/patch-configure.py Fri Apr 5 23:05:20 2019 (r498035)
@@ -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.
Modified: head/devel/py-qt5-core/pkg-plist
==============================================================================
--- head/devel/py-qt5-core/pkg-plist Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-core/pkg-plist Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/devel/py-qt5-dbus/Makefile
==============================================================================
--- head/devel/py-qt5-dbus/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-dbus/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= dbus
-PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/devel/py-qt5-dbussupport/Makefile
==============================================================================
--- head/devel/py-qt5-dbussupport/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-dbussupport/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= dbussupport
-PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/devel/py-qt5-designer/Makefile
==============================================================================
--- head/devel/py-qt5-designer/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-designer/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= designer
-PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/devel/py-qt5-designerplugin/Makefile
==============================================================================
--- head/devel/py-qt5-designerplugin/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-designerplugin/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= designerplugin
-PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/devel/py-qt5-help/Makefile
==============================================================================
--- head/devel/py-qt5-help/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-help/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= help
-PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/devel/py-qt5-qscintilla2/Makefile
==============================================================================
--- head/devel/py-qt5-qscintilla2/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-qscintilla2/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -2,7 +2,6 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
-PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_QSCI2}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt5-
Modified: head/devel/py-qt5-qscintilla2/pkg-plist
==============================================================================
--- head/devel/py-qt5-qscintilla2/pkg-plist Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-qscintilla2/pkg-plist Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/devel/py-qt5-test/Makefile
==============================================================================
--- head/devel/py-qt5-test/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5-test/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= test
-PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/devel/py-qt5/Makefile
==============================================================================
--- head/devel/py-qt5/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -2,7 +2,6 @@
PORTNAME= qt5
PORTVERSION= ${PYQT5_VERSION}
-PORTREVISION= 1
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Modified: head/devel/py-qt5/distinfo
==============================================================================
--- head/devel/py-qt5/distinfo Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-qt5/distinfo Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/devel/py-sip/Makefile
==============================================================================
--- head/devel/py-sip/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-sip/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -3,7 +3,6 @@
PORTNAME= sip
PORTVERSION= ${SIP_VERSION}
-PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_SIP}
Modified: head/devel/py-sip/distinfo
==============================================================================
--- head/devel/py-sip/distinfo Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-sip/distinfo Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/devel/py-sip/pkg-plist
==============================================================================
--- head/devel/py-sip/pkg-plist Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/py-sip/pkg-plist Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/devel/qscintilla2-designerplugin-qt5/Makefile
==============================================================================
--- head/devel/qscintilla2-designerplugin-qt5/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/qscintilla2-designerplugin-qt5/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -2,7 +2,6 @@
PORTNAME= designerplugin-qt5
PORTVERSION= ${QSCI2_VERSION}
-PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
PKGNAMEPREFIX= qscintilla2-
Modified: head/devel/qscintilla2-qt5/Makefile
==============================================================================
--- head/devel/qscintilla2-qt5/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/qscintilla2-qt5/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -2,7 +2,6 @@
PORTNAME= qscintilla2-qt5
PORTVERSION= ${QSCI2_VERSION}
-PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
DISTNAME= ${QSCI2_DISTNAME}
Modified: head/devel/qscintilla2-qt5/distinfo
==============================================================================
--- head/devel/qscintilla2-qt5/distinfo Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/qscintilla2-qt5/distinfo Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/devel/qscintilla2-qt5/pkg-plist
==============================================================================
--- head/devel/qscintilla2-qt5/pkg-plist Fri Apr 5 22:57:51 2019 (r498034)
+++ head/devel/qscintilla2-qt5/pkg-plist Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/graphics/py-qt5-svg/Makefile
==============================================================================
--- head/graphics/py-qt5-svg/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/graphics/py-qt5-svg/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= svg
-PORTREVISION= 1
CATEGORIES= graphics devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/lang/py-qt5-qml/Makefile
==============================================================================
--- head/lang/py-qt5-qml/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/lang/py-qt5-qml/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= qml
-PORTREVISION= 1
CATEGORIES= lang devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/misc/py-qt5-demo/Makefile
==============================================================================
--- head/misc/py-qt5-demo/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/misc/py-qt5-demo/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -2,7 +2,6 @@
PORTNAME= demo
PORTVERSION= ${PYQT5_VERSION}
-PORTREVISION= 1
CATEGORIES= misc devel python
MASTER_SITES= ${MASTER_SITES_PYQT5}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt5-
Modified: head/misc/py-qt5-demo/pkg-plist
==============================================================================
--- head/misc/py-qt5-demo/pkg-plist Fri Apr 5 22:57:51 2019 (r498034)
+++ head/misc/py-qt5-demo/pkg-plist Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/multimedia/py-qt5-multimedia/Makefile
==============================================================================
--- head/multimedia/py-qt5-multimedia/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/multimedia/py-qt5-multimedia/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= multimedia
-PORTREVISION= 1
CATEGORIES= multimedia devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/multimedia/py-qt5-multimediawidgets/Makefile
==============================================================================
--- head/multimedia/py-qt5-multimediawidgets/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/multimedia/py-qt5-multimediawidgets/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= multimediawidgets
-PORTREVISION= 1
CATEGORIES= multimedia devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/net/py-qt5-network/Makefile
==============================================================================
--- head/net/py-qt5-network/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/net/py-qt5-network/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= network
-PORTREVISION= 1
CATEGORIES= net devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/net/py-qt5-network/pkg-plist
==============================================================================
--- head/net/py-qt5-network/pkg-plist Fri Apr 5 22:57:51 2019 (r498034)
+++ head/net/py-qt5-network/pkg-plist Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/print/py-qt5-printsupport/Makefile
==============================================================================
--- head/print/py-qt5-printsupport/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/print/py-qt5-printsupport/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= printsupport
-PORTREVISION= 1
CATEGORIES= print python
MAINTAINER= kde at FreeBSD.org
Modified: head/textproc/py-qt5-xml/Makefile
==============================================================================
--- head/textproc/py-qt5-xml/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/textproc/py-qt5-xml/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= xml
-PORTREVISION= 1
CATEGORIES= textproc devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/textproc/py-qt5-xmlpatterns/Makefile
==============================================================================
--- head/textproc/py-qt5-xmlpatterns/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/textproc/py-qt5-xmlpatterns/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= xmlpatterns
-PORTREVISION= 1
CATEGORIES= textproc devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/www/py-qt5-webchannel/Makefile
==============================================================================
--- head/www/py-qt5-webchannel/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/www/py-qt5-webchannel/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= webchannel
-PORTREVISION= 1
CATEGORIES= www devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/www/py-qt5-webengine/Makefile
==============================================================================
--- head/www/py-qt5-webengine/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/www/py-qt5-webengine/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,41 +1,49 @@
# $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 at 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
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 <bsd.port.mk>
Added: head/www/py-qt5-webengine/distinfo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/py-qt5-webengine/distinfo Fri Apr 5 23:05:20 2019 (r498035)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1553936960
+SHA256 (PyQtWebEngine_gpl-5.12.1.tar.gz) = 860704672ea1b616e1347be1f347bc1c749e64ed378370863fe209e84e9bd473
+SIZE (PyQtWebEngine_gpl-5.12.1.tar.gz) = 42474
Modified: head/www/py-qt5-webengine/pkg-plist
==============================================================================
--- head/www/py-qt5-webengine/pkg-plist Fri Apr 5 22:57:51 2019 (r498034)
+++ head/www/py-qt5-webengine/pkg-plist Fri Apr 5 23:05:20 2019 (r498035)
@@ -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
Modified: head/www/py-qt5-webkit/Makefile
==============================================================================
--- head/www/py-qt5-webkit/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/www/py-qt5-webkit/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= webkit
-PORTREVISION= 1
CATEGORIES= www devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/www/py-qt5-webkitwidgets/Makefile
==============================================================================
--- head/www/py-qt5-webkitwidgets/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/www/py-qt5-webkitwidgets/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= webkitwidgets
-PORTREVISION= 1
CATEGORIES= www devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/x11-toolkits/py-qt5-gui/Makefile
==============================================================================
--- head/x11-toolkits/py-qt5-gui/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/x11-toolkits/py-qt5-gui/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= gui
-PORTREVISION= 1
CATEGORIES= x11-toolkits devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/x11-toolkits/py-qt5-quick/Makefile
==============================================================================
--- head/x11-toolkits/py-qt5-quick/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/x11-toolkits/py-qt5-quick/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= quick
-PORTREVISION= 1
CATEGORIES= x11-toolkits devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/x11-toolkits/py-qt5-quickwidgets/Makefile
==============================================================================
--- head/x11-toolkits/py-qt5-quickwidgets/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/x11-toolkits/py-qt5-quickwidgets/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= quickwidgets
-PORTREVISION= 1
CATEGORIES= x11-toolkits devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/x11-toolkits/py-qt5-widgets/Makefile
==============================================================================
--- head/x11-toolkits/py-qt5-widgets/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/x11-toolkits/py-qt5-widgets/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= widgets
-PORTREVISION= 1
CATEGORIES= x11-toolkits devel python
MAINTAINER= kde at FreeBSD.org
Modified: head/x11/py-qt5-opengl/Makefile
==============================================================================
--- head/x11/py-qt5-opengl/Makefile Fri Apr 5 22:57:51 2019 (r498034)
+++ head/x11/py-qt5-opengl/Makefile Fri Apr 5 23:05:20 2019 (r498035)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= opengl
-PORTREVISION= 1
CATEGORIES= x11 devel python
MAINTAINER= kde at FreeBSD.org
More information about the svn-ports-all
mailing list