Hello community,
here is the log from the commit of package python-qtwebengine-qt5 for
openSUSE:Factory checked in at 2019-07-16 08:40:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qtwebengine-qt5 (Old)
and /work/SRC/openSUSE:Factory/.python-qtwebengine-qt5.new.1887 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qtwebengine-qt5"
Tue Jul 16 08:40:27 2019 rev:2 rq:714849 version:5.13.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-qtwebengine-qt5/python-qtwebengine-qt5.changes
2019-03-06 15:48:46.160428843 +0100
+++
/work/SRC/openSUSE:Factory/.python-qtwebengine-qt5.new.1887/python-qtwebengine-qt5.changes
2019-07-16 08:40:28.447019183 +0200
@@ -1,0 +2,13 @@
+Fri Jul 12 10:27:56 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.13.0
+ * Bindings updated for QtWebEngine 5.13.0
+
+-------------------------------------------------------------------
+Wed Apr 10 15:26:54 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.12.1
+ * Fixed the configure.py options that relate to stub files.
+- Run spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
PyQtWebEngine_gpl-5.12.tar.gz
New:
----
PyQtWebEngine_gpl-5.13.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qtwebengine-qt5.spec ++++++
--- /var/tmp/diff_new_pack.IfqrkA/_old 2019-07-16 08:40:29.007019370 +0200
+++ /var/tmp/diff_new_pack.IfqrkA/_new 2019-07-16 08:40:29.015019372 +0200
@@ -18,18 +18,18 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-qtwebengine-qt5
-Version: 5.12
+Version: 5.13.0
Release: 0
Summary: Python bindings for the Qt5 WebEngine framework
License: GPL-3.0-only
Group: Development/Libraries/Python
-URL: https://www.riverbankcomputing.com/software/pyqtchart/intro
-Source:
https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/PyQtWebEngine_gpl-%{version}.tar.gz
-BuildRequires: pkgconfig(Qt5WebEngine)
+URL: https://www.riverbankcomputing.com/software/pyqtwebengine/intro
+Source:
https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/%{version}/PyQtWebEngine_gpl-%{version}.tar.gz
BuildRequires: %{python_module devel}
BuildRequires: %{python_module qt5-devel}
BuildRequires: %{python_module sip-devel >= 4.19.1}
BuildRequires: python-rpm-macros
+BuildRequires: pkgconfig(Qt5WebEngine)
Requires: python-qt5
Requires: python-sip(api) = %{python_sip_api_ver}
@@ -91,9 +91,9 @@
%license LICENSE
%doc NEWS README
%dir %{python_sitearch}/PyQt5/
-%{python_sitearch}/PyQt5/QtWebEngine.so
-%{python_sitearch}/PyQt5/QtWebEngineCore.so
-%{python_sitearch}/PyQt5/QtWebEngineWidgets.so
+%{python_sitearch}/PyQt5/QtWebEngine.*
+%{python_sitearch}/PyQt5/QtWebEngineCore.*
+%{python_sitearch}/PyQt5/QtWebEngineWidgets.*
%files -n %{name}-api
%license LICENSE
++++++ PyQtWebEngine_gpl-5.12.tar.gz -> PyQtWebEngine_gpl-5.13.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtWebEngine_gpl-5.12/ChangeLog
new/PyQtWebEngine_gpl-5.13.0/ChangeLog
--- old/PyQtWebEngine_gpl-5.12/ChangeLog 2019-02-04 16:17:47.000000000
+0100
+++ new/PyQtWebEngine_gpl-5.13.0/ChangeLog 2019-07-04 18:45:46.000000000
+0200
@@ -1,5 +1,84 @@
+2019-07-03 Phil Thompson <[email protected]>
+
+ * NEWS:
+ Released as v5.13.0.
+ [fe9bb03004fd] [5.13.0]
+
+2019-07-02 Phil Thompson <[email protected]>
+
+ * NEWS:
+ Updated the NEWS file.
+ [1c0db7013251]
+
+2019-06-30 Phil Thompson <[email protected]>
+
+ * PyQtWebEngine.msp, QtWebEngineCore.versions:
+ Updated for Qt v5.13.0.
+ [4e2c0056d0f9]
+
+2019-06-20 Phil Thompson <[email protected]>
+
+ * rb-product:
+ Updated the minimum PyQt5 wheel.
+ [6eb69c15f896]
+
+ * Merged the 5.12-maint branch.
+ [baeb73a545a6]
+
+ * PyQtWebEngine.msp:
+ Updated for Qt v5.12.4.
+ [9e68d6e3e8d9] <5.12-maint>
+
+2019-04-19 Phil Thompson <[email protected]>
+
+ * PyQtWebEngine.msp:
+ Updated for Qt v5.12.3.
+ [2905d2eac4b4] <5.12-maint>
+
+2019-03-19 Phil Thompson <[email protected]>
+
+ * .hgtags:
+ Added tag 5.12.1 for changeset f0583eb7da8a
+ [03e09b7b4953] <5.12-maint>
+
+ * NEWS:
+ Released as v5.12.1.
+ [f0583eb7da8a] [5.12.1] <5.12-maint>
+
+2019-03-18 Phil Thompson <[email protected]>
+
+ * NEWS:
+ Updated the NEWS file.
+ [598cae9d0f9f] <5.12-maint>
+
+2019-03-17 Phil Thompson <[email protected]>
+
+ * PyQtWebEngine.msp:
+ Updated for Qt v5.12.2.
+ [525c367f8949] <5.12-maint>
+
+2019-03-08 Phil Thompson <[email protected]>
+
+ * PyQtWebEngine.msp:
+ Fixed building without SSL support.
+ [a0b9d2b41efc] <5.12-maint>
+
+ * configure.py:
+ Fixed the configure.py options that relate to stub files.
+ [f089ac081a92] <5.12-maint>
+
+2019-02-10 Phil Thompson <[email protected]>
+
+ * METADATA.in:
+ Fixes for the PyPI project description.
+ [537ba6f4f470] <5.12-maint>
+
2019-02-04 Phil Thompson <[email protected]>
+ * .hgtags:
+ Added tag 5.12 for changeset c4c19b66da43
+ [38d16c6e0c93]
+
* NEWS:
Released as v5.12.
[c4c19b66da43] [5.12]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtWebEngine_gpl-5.12/NEWS
new/PyQtWebEngine_gpl-5.13.0/NEWS
--- old/PyQtWebEngine_gpl-5.12/NEWS 2019-02-04 16:17:03.000000000 +0100
+++ new/PyQtWebEngine_gpl-5.13.0/NEWS 2019-07-04 18:45:04.000000000 +0200
@@ -1,3 +1,9 @@
+v5.13.0 5th July 2019
+ - Added support for Qt v5.13.0.
+
+v5.12.1 19th March 2019
+ - Added support for Qt v5.12.2.
+
v5.12 10th February 2019
- The first release based on Qt v5.12. Previously the modules were part of
PyQt5.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtWebEngine_gpl-5.12/configure.py
new/PyQtWebEngine_gpl-5.13.0/configure.py
--- old/PyQtWebEngine_gpl-5.12/configure.py 2019-02-04 16:17:47.000000000
+0100
+++ new/PyQtWebEngine_gpl-5.13.0/configure.py 2019-07-04 18:45:46.000000000
+0200
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Riverbank Computing Limited
+# Copyright (c) 2019, Riverbank Computing Limited
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-# This is v2.10 of this boilerplate.
+# This is v2.12 of this boilerplate.
from distutils import sysconfig
@@ -86,7 +86,6 @@
version of Qt. target_configuration is the target configuration.
"""
- # TODO: do we need to add '-gui'?
return {'QT': 'webengine'}
@staticmethod
@@ -149,7 +148,6 @@
version of Qt. target_configuration is the target configuration.
"""
- # TODO: do we need to add '-gui'?
return {'QT': 'webenginecore'}
@staticmethod
@@ -212,7 +210,6 @@
version of Qt. target_configuration is the target configuration.
"""
- # TODO: do we need to add 'webchannel network widgets'?
return {'QT': 'webenginewidgets'}
@staticmethod
@@ -241,13 +238,14 @@
# The version of the module as a string. Set it to None if you don't
# provide version information.
- version = '5.12'
+ version = '5.13.0'
# The name of the PEP 376 .dist-info directory to be created.
distinfo_name = 'PyQtWebEngine'
# The sequence of module configurations that make up the package.
- modules = []
+ modules = [QtWebEngineConfiguration(), QtWebEngineCoreConfiguration(),
+ QtWebEngineWidgetsConfiguration()]
# Set if a configuration script is provided that handles versions of PyQt4
# prior to v4.10 (i.e. versions where the pyqtconfig.py module is
@@ -345,16 +343,23 @@
configuration.
"""
- # Add modules that are Qt version specific.
- if target_configuration.qt_version >= 0x050400:
- PackageConfiguration.modules.append(
- QtWebEngineWidgetsConfiguration())
-
- if target_configuration.qt_version >= 0x050600:
- PackageConfiguration.modules.append(
- QtWebEngineConfiguration())
- PackageConfiguration.modules.append(
- QtWebEngineCoreConfiguration())
+ # Remove modules that are Qt version specific. Note that we don't add
+ # them if we find they are needed because we need to make sure the
+ # initial list of modules isn't empty when the command line parser is
+ # created.
+ remove = []
+
+ if target_configuration.qt_version < 0x050400:
+ remove.append('QtWebEngineWidgets')
+
+ if target_configuration.qt_version < 0x050600:
+ remove.append('QtWebEngine')
+ remove.append('QtWebEngineCore')
+
+ if remove:
+ PackageConfiguration.modules = [
+ m for m in PackageConfiguration.modules
+ if m.name not in remove]
@staticmethod
def inform_user(target_configuration):
@@ -762,17 +767,19 @@
self.py_venv_inc_dir = py_config.venv_inc_dir
self.py_pylib_dir = py_config.lib_dir
self.py_sip_dir = os.path.join(py_config.data_dir, 'sip')
- self.sip_inc_dir = py_config.venv_inc_dir
# Remaining values.
+ self.abi_version = None
self.debug = False
self.pyqt_sip_flags = None
self.pyqt_version_str = ''
self.qmake = self._find_exe('qmake')
self.qmake_spec = ''
+ self.qmake_variables = []
self.qt_version = 0
self.qt_version_str = ''
self.sip = self._find_exe('sip5', 'sip')
+ self.sip_inc_dir = None
self.sip_version = None
self.sip_version_str = None
self.sysroot = ''
@@ -860,8 +867,6 @@
self.py_pylib_dir = parser.get(section, 'py_pylib_dir',
self.py_pylib_dir)
- self.sip_inc_dir = self.py_venv_inc_dir
-
self.module_dir = parser.get(section, 'module_dir', self.module_dir)
if self.pyqt_package is not None:
@@ -893,6 +898,14 @@
minor = (self.qt_version >> 8) & 0xff
patch = self.qt_version & 0xff
+ # Qt v5.12.4 was the last release where we updated PyQt for a
+ # patch version.
+ if (major, minor) >= (5, 13):
+ patch = 0
+ elif (major, minor) == (5, 12):
+ if patch > 4:
+ patch = 4
+
flags.append('-t')
flags.append('Qt_%d_%d_%d' % (major, minor, patch))
@@ -1134,6 +1147,12 @@
if opts.sip is not None:
self.sip = opts.sip
+ if opts.abi_version is not None:
+ if os.path.basename(self.sip) != 'sip5':
+ error("The --abi-version argument can only be used with sip5.")
+
+ self.abi_version = opts.abi_version
+
if pkg_config.distinfo_name and opts.distinfo:
self.distinfo = True
@@ -1255,6 +1274,9 @@
callback=optparser_store_abspath_dir, metavar="DIR",
help="the directory containing the sip.h header file file is DIR "
"[default: %s]" % target_config.sip_inc_dir)
+ p.add_option("--abi-version", dest='abi_version', default=None,
+ metavar="VERSION",
+ help="the SIP ABI version to use (sip5 only)")
if target_config.pyqt_package is not None:
p.add_option('--pyqt-sipdir', dest='pyqt_sip_dir', type='string',
@@ -1373,6 +1395,10 @@
# Build the SIP command line.
argv = [quote(target_config.sip)]
+ if target_config.abi_version:
+ argv.append('--abi-version')
+ argv.append(target_config.abi_version)
+
# Tell SIP if this is a debug build of Python (SIP v4.19.1 and later).
if target_config.sip_version >= 0x041301 and target_config.py_debug:
argv.append('-D')
@@ -1664,6 +1690,9 @@
pro.write(' \\\n %s' % s)
pro.write('\n')
+ if target_config.qmake_variables:
+ pro.write('\n'.join(target_config.qmake_variables) + '\n')
+
pro.close()
@@ -1770,9 +1799,10 @@
pass
-def _check_sip(target_config, pkg_config):
+def _check_sip(target_config, pkg_config, verbose):
""" Check that the version of sip is good enough. target_config is the
- target configuration. pkg_config is the package configuration.
+ target configuration. pkg_config is the package configuration. verbose is
+ set if the output is to be displayed.
"""
if target_config.sip is None:
@@ -1791,7 +1821,11 @@
pipe.close()
if '.dev' in version_str or 'snapshot' in version_str:
- version = 0
+ # We only need to distinguish between sip v4 and sip v5.
+ if os.path.basename(target_config.sip) == 'sip5':
+ version = 0x050000
+ else:
+ version = 0x040000
else:
version = version_from_string(version_str)
if version is None:
@@ -1807,6 +1841,36 @@
"This version of %s requires sip %s or later." %
(pkg_config.descriptive_name, min_sip_version))
+ if version >= 0x050000:
+ # Install the sip.h file for the private sip module.
+ if target_config.sip_inc_dir is None:
+ target_config.sip_inc_dir = os.path.join(
+ os.path.abspath(os.getcwd()), 'include')
+
+ inform("Installing sip.h in %s..." % target_config.sip_inc_dir)
+
+ os.makedirs(target_config.sip_inc_dir, exist_ok=True)
+
+ argv = ['sip5-header']
+
+ if target_config.abi_version:
+ argv.append('--abi-version')
+ argv.append(target_config.abi_version)
+
+ argv.append('--include-dir')
+ argv.append(quote(target_config.sip_inc_dir)),
+ argv.append('PyQt5.sip')
+
+ _run_command(' '.join(argv), verbose)
+
+ if not os.access(os.path.join(target_config.sip_inc_dir, 'sip.h'),
os.F_OK):
+ error(
+ "sip5-module failed to install sip.h int %s." %
+ target_config.sip_inc_dir)
+ else:
+ if target_config.sip_inc_dir is None:
+ target_config.sip_inc_dir = target_config.py_venv_inc_dir
+
target_config.sip_version = version
target_config.sip_version_str = version_str
@@ -1821,11 +1885,7 @@
# Parse the command line.
p = _create_optparser(target_config, pkg_config)
- opts, args = p.parse_args()
-
- if args:
- p.print_help()
- sys.exit(2)
+ opts, target_config.qmake_variables = p.parse_args()
target_config.apply_pre_options(opts)
@@ -1850,7 +1910,7 @@
target_config.introspect_pyqt(pkg_config)
# Check SIP is new enough.
- _check_sip(target_config, pkg_config)
+ _check_sip(target_config, pkg_config, opts.verbose)
# Perform any package specific checks now that all other information has
# been captured.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtWebEngine_gpl-5.12/mk_distinfo.py
new/PyQtWebEngine_gpl-5.13.0/mk_distinfo.py
--- old/PyQtWebEngine_gpl-5.12/mk_distinfo.py 2019-02-04 13:02:04.000000000
+0100
+++ new/PyQtWebEngine_gpl-5.13.0/mk_distinfo.py 2019-07-04 18:26:17.000000000
+0200
@@ -86,6 +86,10 @@
all_fns = []
for root, dirs, files in os.walk(native_name):
+ # Reproducable builds.
+ dirs.sort()
+ files.sort()
+
for f in files:
all_fns.append(os.path.join(root, f).replace(os.sep, '/'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngine/qquickwebengineprofile.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngine/qquickwebengineprofile.sip
--- old/PyQtWebEngine_gpl-5.12/sip/QtWebEngine/qquickwebengineprofile.sip
2019-02-04 16:17:48.000000000 +0100
+++ new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngine/qquickwebengineprofile.sip
2019-07-04 18:45:47.000000000 +0200
@@ -100,6 +100,9 @@
QString httpAcceptLanguage() const;
void setHttpAcceptLanguage(const QString &httpAcceptLanguage);
QWebEngineCookieStore *cookieStore() const /Transfer/;
+%If (QtWebEngine_5_13_0 -)
+ void setUrlRequestInterceptor(QWebEngineUrlRequestInterceptor
*interceptor);
+%End
void setRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor);
const QWebEngineUrlSchemeHandler *urlSchemeHandler(const QByteArray &)
const;
void installUrlSchemeHandler(const QByteArray &scheme,
QWebEngineUrlSchemeHandler *);
@@ -143,6 +146,34 @@
%If (QtWebEngine_5_8_0 -)
void spellCheckEnabledChanged();
%End
+
+public:
+%If (QtWebEngine_5_13_0 -)
+ void setUseForGlobalCertificateVerification(bool b);
+%End
+%If (QtWebEngine_5_13_0 -)
+ bool isUsedForGlobalCertificateVerification() const;
+%End
+%If (QtWebEngine_5_13_0 -)
+ QString downloadPath() const;
+%End
+%If (QtWebEngine_5_13_0 -)
+ void setDownloadPath(const QString &path);
+%End
+%If (QtWebEngine_5_13_0 -)
+ QWebEngineClientCertificateStore *clientCertificateStore();
+%End
+
+signals:
+%If (QtWebEngine_5_13_0 -)
+ void useForGlobalCertificateVerificationChanged();
+%End
+%If (QtWebEngine_5_13_0 -)
+ void downloadPathChanged();
+%End
+%If (QtWebEngine_5_13_0 -)
+ void presentNotification(QWebEngineNotification *notification);
+%End
};
%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/QtWebEngineCoremod.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/QtWebEngineCoremod.sip
--- old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/QtWebEngineCoremod.sip
2019-02-04 16:17:48.000000000 +0100
+++ new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/QtWebEngineCoremod.sip
2019-07-04 18:45:47.000000000 +0200
@@ -23,9 +23,10 @@
%Module(name=PyQt5.QtWebEngineCore, keyword_arguments="Optional",
use_limited_api=True)
%Import QtCore/QtCoremod.sip
+%Import QtGui/QtGuimod.sip
%Import QtNetwork/QtNetworkmod.sip
-%Timeline {QtWebEngine_5_4_0 QtWebEngine_5_4_1 QtWebEngine_5_4_2
QtWebEngine_5_5_0 QtWebEngine_5_5_1 QtWebEngine_5_6_0 QtWebEngine_5_6_1
QtWebEngine_5_6_2 QtWebEngine_5_6_3 QtWebEngine_5_6_4 QtWebEngine_5_6_5
QtWebEngine_5_6_6 QtWebEngine_5_6_7 QtWebEngine_5_6_8 QtWebEngine_5_6_9
QtWebEngine_5_7_0 QtWebEngine_5_7_1 QtWebEngine_5_8_0 QtWebEngine_5_8_1
QtWebEngine_5_9_0 QtWebEngine_5_9_1 QtWebEngine_5_9_2 QtWebEngine_5_9_3
QtWebEngine_5_9_4 QtWebEngine_5_9_5 QtWebEngine_5_9_6 QtWebEngine_5_9_7
QtWebEngine_5_9_8 QtWebEngine_5_9_9 QtWebEngine_5_10_0 QtWebEngine_5_10_1
QtWebEngine_5_11_0 QtWebEngine_5_11_1 QtWebEngine_5_11_2 QtWebEngine_5_11_3
QtWebEngine_5_12_0 QtWebEngine_5_12_1}
+%Timeline {QtWebEngine_5_4_0 QtWebEngine_5_4_1 QtWebEngine_5_4_2
QtWebEngine_5_5_0 QtWebEngine_5_5_1 QtWebEngine_5_6_0 QtWebEngine_5_6_1
QtWebEngine_5_6_2 QtWebEngine_5_6_3 QtWebEngine_5_6_4 QtWebEngine_5_6_5
QtWebEngine_5_6_6 QtWebEngine_5_6_7 QtWebEngine_5_6_8 QtWebEngine_5_6_9
QtWebEngine_5_7_0 QtWebEngine_5_7_1 QtWebEngine_5_8_0 QtWebEngine_5_8_1
QtWebEngine_5_9_0 QtWebEngine_5_9_1 QtWebEngine_5_9_2 QtWebEngine_5_9_3
QtWebEngine_5_9_4 QtWebEngine_5_9_5 QtWebEngine_5_9_6 QtWebEngine_5_9_7
QtWebEngine_5_9_8 QtWebEngine_5_9_9 QtWebEngine_5_10_0 QtWebEngine_5_10_1
QtWebEngine_5_11_0 QtWebEngine_5_11_1 QtWebEngine_5_11_2 QtWebEngine_5_11_3
QtWebEngine_5_12_0 QtWebEngine_5_12_1 QtWebEngine_5_12_2 QtWebEngine_5_12_3
QtWebEngine_5_12_4 QtWebEngine_5_13_0}
%Copying
Copyright (c) 2019 Riverbank Computing Limited <[email protected]>
@@ -48,8 +49,10 @@
%DefaultSupertype sip.simplewrapper
+%Include qwebengineclientcertificatestore.sip
%Include qwebenginecookiestore.sip
%Include qwebenginehttprequest.sip
+%Include qwebenginenotification.sip
%Include qwebenginequotarequest.sip
%Include qwebengineregisterprotocolhandlerrequest.sip
%Include qwebengineurlrequestinfo.sip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/qwebengineclientcertificatestore.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/qwebengineclientcertificatestore.sip
---
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/qwebengineclientcertificatestore.sip
1970-01-01 01:00:00.000000000 +0100
+++
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/qwebengineclientcertificatestore.sip
2019-07-04 18:45:47.000000000 +0200
@@ -0,0 +1,53 @@
+// qwebengineclientcertificatestore.sip generated by MetaSIP
+//
+// This file is part of the QtWebEngineCore Python extension module.
+//
+// Copyright (c) 2019 Riverbank Computing Limited <[email protected]>
+//
+// This file is part of PyQtWebEngine.
+//
+// This file may be used under the terms of the GNU General Public License
+// version 3.0 as published by the Free Software Foundation and appearing in
+// the file LICENSE included in the packaging of this file. Please review the
+// following information to ensure the GNU General Public License version 3.0
+// requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+//
+// If you do not wish to use this file under the terms of the GPL version 3.0
+// then you may purchase a commercial license. For more information contact
+// [email protected].
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+%If (QtWebEngine_5_13_0 -)
+
+namespace QtWebEngineCore
+{
+%TypeHeaderCode
+#include <qwebengineclientcertificatestore.h>
+%End
+};
+
+%End
+%If (QtWebEngine_5_13_0 -)
+%If (PyQt_SSL)
+
+class QWebEngineClientCertificateStore /NoDefaultCtors/
+{
+%TypeHeaderCode
+#include <qwebengineclientcertificatestore.h>
+%End
+
+public:
+ void add(const QSslCertificate &certificate, const QSslKey &privateKey);
+ QVector<QSslCertificate> certificates() const;
+ void remove(const QSslCertificate &certificate);
+ void clear();
+
+private:
+ ~QWebEngineClientCertificateStore();
+};
+
+%End
+%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/qwebenginecookiestore.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/qwebenginecookiestore.sip
--- old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/qwebenginecookiestore.sip
2019-02-04 16:17:48.000000000 +0100
+++ new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/qwebenginecookiestore.sip
2019-07-04 18:45:47.000000000 +0200
@@ -34,10 +34,15 @@
sipTypeDef **type;
int yes, no;
} graph[] = {
- {sipName_QWebEngineUrlRequestInterceptor,
&sipType_QWebEngineUrlRequestInterceptor, -1, 1},
- {sipName_QWebEngineUrlRequestJob, &sipType_QWebEngineUrlRequestJob,
-1, 2},
- {sipName_QWebEngineUrlSchemeHandler,
&sipType_QWebEngineUrlSchemeHandler, -1, 3},
- {sipName_QWebEngineCookieStore, &sipType_QWebEngineCookieStore, -1,
-1},
+ {sipName_QWebEngineCookieStore, &sipType_QWebEngineCookieStore, -1, 1},
+ #if QT_VERSION >= 0x050d00
+ {sipName_QWebEngineNotification, &sipType_QWebEngineNotification, -1,
2},
+ #else
+ {0, 0, -1, 2},
+ #endif
+ {sipName_QWebEngineUrlRequestInterceptor,
&sipType_QWebEngineUrlRequestInterceptor, -1, 3},
+ {sipName_QWebEngineUrlRequestJob, &sipType_QWebEngineUrlRequestJob,
-1, 4},
+ {sipName_QWebEngineUrlSchemeHandler,
&sipType_QWebEngineUrlSchemeHandler, -1, -1},
};
int i = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/qwebenginenotification.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/qwebenginenotification.sip
--- old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/qwebenginenotification.sip
1970-01-01 01:00:00.000000000 +0100
+++ new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/qwebenginenotification.sip
2019-07-04 18:45:47.000000000 +0200
@@ -0,0 +1,61 @@
+// qwebenginenotification.sip generated by MetaSIP
+//
+// This file is part of the QtWebEngineCore Python extension module.
+//
+// Copyright (c) 2019 Riverbank Computing Limited <[email protected]>
+//
+// This file is part of PyQtWebEngine.
+//
+// This file may be used under the terms of the GNU General Public License
+// version 3.0 as published by the Free Software Foundation and appearing in
+// the file LICENSE included in the packaging of this file. Please review the
+// following information to ensure the GNU General Public License version 3.0
+// requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+//
+// If you do not wish to use this file under the terms of the GPL version 3.0
+// then you may purchase a commercial license. For more information contact
+// [email protected].
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+%If (QtWebEngine_5_13_0 -)
+
+namespace QtWebEngineCore
+{
+%TypeHeaderCode
+#include <qwebenginenotification.h>
+%End
+};
+
+%End
+%If (QtWebEngine_5_13_0 -)
+
+class QWebEngineNotification : QObject /NoDefaultCtors/
+{
+%TypeHeaderCode
+#include <qwebenginenotification.h>
+%End
+
+public:
+ virtual ~QWebEngineNotification();
+ bool matches(const QWebEngineNotification *other) const;
+ QUrl origin() const;
+ QImage icon() const;
+ QString title() const;
+ QString message() const;
+ QString tag() const;
+ QString language() const;
+ Qt::LayoutDirection direction() const;
+
+public slots:
+ void show() const;
+ void click() const;
+ void close() const;
+
+signals:
+ void closed();
+};
+
+%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/qwebengineurlrequestjob.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/qwebengineurlrequestjob.sip
--- old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineCore/qwebengineurlrequestjob.sip
2019-02-04 16:17:48.000000000 +0100
+++
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineCore/qwebengineurlrequestjob.sip
2019-07-04 18:45:47.000000000 +0200
@@ -49,6 +49,9 @@
%If (QtWebEngine_5_11_0 -)
QUrl initiator() const;
%End
+%If (QtWebEngine_5_13_0 -)
+ QMap<QByteArray, QByteArray> requestHeaders() const;
+%End
};
%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
--- old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
2019-02-04 16:17:48.000000000 +0100
+++
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
2019-07-04 18:45:47.000000000 +0200
@@ -26,10 +26,9 @@
%Import QtNetwork/QtNetworkmod.sip
%Import QtPrintSupport/QtPrintSupportmod.sip
%Import QtWebChannel/QtWebChannelmod.sip
+%Import QtWebEngineCore/QtWebEngineCoremod.sip
%Import QtWidgets/QtWidgetsmod.sip
-%Timeline {QtWebEngine_5_4_0 QtWebEngine_5_4_1 QtWebEngine_5_4_2
QtWebEngine_5_5_0 QtWebEngine_5_5_1 QtWebEngine_5_6_0 QtWebEngine_5_6_1
QtWebEngine_5_6_2 QtWebEngine_5_6_3 QtWebEngine_5_6_4 QtWebEngine_5_6_5
QtWebEngine_5_6_6 QtWebEngine_5_6_7 QtWebEngine_5_6_8 QtWebEngine_5_6_9
QtWebEngine_5_7_0 QtWebEngine_5_7_1 QtWebEngine_5_8_0 QtWebEngine_5_8_1
QtWebEngine_5_9_0 QtWebEngine_5_9_1 QtWebEngine_5_9_2 QtWebEngine_5_9_3
QtWebEngine_5_9_4 QtWebEngine_5_9_5 QtWebEngine_5_9_6 QtWebEngine_5_9_7
QtWebEngine_5_9_8 QtWebEngine_5_9_9 QtWebEngine_5_10_0 QtWebEngine_5_10_1
QtWebEngine_5_11_0 QtWebEngine_5_11_1 QtWebEngine_5_11_2 QtWebEngine_5_11_3
QtWebEngine_5_12_0 QtWebEngine_5_12_1}
-
%Copying
Copyright (c) 2019 Riverbank Computing Limited <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/qwebengineclientcertificateselection.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/qwebengineclientcertificateselection.sip
---
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/qwebengineclientcertificateselection.sip
2019-02-04 16:17:48.000000000 +0100
+++
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/qwebengineclientcertificateselection.sip
2019-07-04 18:45:47.000000000 +0200
@@ -21,6 +21,7 @@
%If (QtWebEngine_5_12_0 -)
+%If (PyQt_SSL)
class QWebEngineClientCertificateSelection
{
@@ -38,3 +39,4 @@
};
%End
+%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/qwebenginepage.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/qwebenginepage.sip
--- old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/qwebenginepage.sip
2019-02-04 16:17:48.000000000 +0100
+++ new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/qwebenginepage.sip
2019-07-04 18:45:47.000000000 +0200
@@ -598,11 +598,18 @@
void
registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest
request);
%End
%If (QtWebEngine_5_12_0 -)
+%If (PyQt_SSL)
void selectClientCertificate(QWebEngineClientCertificateSelection
clientCertSelection);
%End
+%End
%If (QtWebEngine_5_12_0 -)
void printRequested();
%End
+
+public:
+%If (QtWebEngine_5_13_0 -)
+ void setUrlRequestInterceptor(QWebEngineUrlRequestInterceptor
*interceptor);
+%End
};
%If (QtWebEngine_5_11_0 -)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/qwebengineprofile.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/qwebengineprofile.sip
--- old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/qwebengineprofile.sip
2019-02-04 16:17:48.000000000 +0100
+++ new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/qwebengineprofile.sip
2019-07-04 18:45:47.000000000 +0200
@@ -28,6 +28,11 @@
#include <qwebengineprofile.h>
%End
+%TypeCode
+// For QWebEngineProfile.setNotificationPresenter().
+#include <QWebEngineNotification>
+%End
+
public:
explicit QWebEngineProfile(QObject *parent /TransferThis/ = 0);
QWebEngineProfile(const QString &name, QObject *parent /TransferThis/ = 0);
@@ -83,6 +88,9 @@
%If (QtWebEngine_5_6_0 -)
QWebEngineCookieStore *cookieStore() /Transfer/;
%End
+%If (QtWebEngine_5_13_0 -)
+ void setUrlRequestInterceptor(QWebEngineUrlRequestInterceptor
*interceptor);
+%End
%If (QtWebEngine_5_6_0 -)
void setRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor);
%End
@@ -121,6 +129,70 @@
%If (QtWebEngine_5_6_0 -)
QWebEngineProfile(const QWebEngineProfile &);
%End
+
+public:
+%If (QtWebEngine_5_13_0 -)
+ void setUseForGlobalCertificateVerification(bool enabled = true);
+%End
+%If (QtWebEngine_5_13_0 -)
+ bool isUsedForGlobalCertificateVerification() const;
+%End
+%If (QtWebEngine_5_13_0 -)
+ QString downloadPath() const;
+%End
+%If (QtWebEngine_5_13_0 -)
+ void setDownloadPath(const QString &path);
+%End
+%If (QtWebEngine_5_13_0 -)
+ void setNotificationPresenter(SIP_PYCALLABLE /AllowNone,
TypeHint="Callable[[QWebEngineNotification], None]"/);
+%MethodCode
+ // Make sure any callable doesn't get garbage collected.
+ Py_XINCREF(a0);
+
+ Py_BEGIN_ALLOW_THREADS
+
+
sipCpp->setNotificationPresenter([a0](std::unique_ptr<QWebEngineNotification>
arg) {
+ if (a0)
+ {
+ SIP_BLOCK_THREADS
+
+ // We have to find the generated type structure because a name
isn't
+ // automatically generated as it isn't used anywhere else in
the
+ // module.
+ PyObject *arg_obj = sipConvertFromType(arg.get(),
+ sipFindType("QWebEngineNotification"), NULL);
+
+ if (arg_obj)
+ {
+ PyObject *res = PyObject_CallFunctionObjArgs(a0, arg_obj,
NULL);
+
+ Py_DECREF(arg_obj);
+ Py_DECREF(a0);
+
+ if (!res)
+ pyqt5_qtwebenginewidgets_err_print();
+ else
+ Py_DECREF(res);
+ }
+ else
+ {
+ Py_DECREF(a0);
+ pyqt5_qtwebenginewidgets_err_print();
+ }
+
+ SIP_UNBLOCK_THREADS
+ }
+ });
+
+ Py_END_ALLOW_THREADS
+%End
+
+%End
+%If (QtWebEngine_5_13_0 -)
+%If (PyQt_SSL)
+ QWebEngineClientCertificateStore *clientCertificateStore();
+%End
+%End
};
%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/qwebenginesettings.sip
new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/qwebenginesettings.sip
--- old/PyQtWebEngine_gpl-5.12/sip/QtWebEngineWidgets/qwebenginesettings.sip
2019-02-04 16:17:48.000000000 +0100
+++ new/PyQtWebEngine_gpl-5.13.0/sip/QtWebEngineWidgets/qwebenginesettings.sip
2019-07-04 18:45:47.000000000 +0200
@@ -106,6 +106,9 @@
%If (QtWebEngine_5_12_0 -)
DnsPrefetchEnabled,
%End
+%If (QtWebEngine_5_13_0 -)
+ PdfViewerEnabled,
+%End
};
enum FontSize
