Hello community,
here is the log from the commit of package python-qtwebengine-qt5 for
openSUSE:Factory checked in at 2019-11-26 16:53:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qtwebengine-qt5 (Old)
and /work/SRC/openSUSE:Factory/.python-qtwebengine-qt5.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qtwebengine-qt5"
Tue Nov 26 16:53:15 2019 rev:4 rq:748564 version:5.13.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-qtwebengine-qt5/python-qtwebengine-qt5.changes
2019-09-26 20:39:08.926876791 +0200
+++
/work/SRC/openSUSE:Factory/.python-qtwebengine-qt5.new.26869/python-qtwebengine-qt5.changes
2019-11-26 16:53:25.136226425 +0100
@@ -1,0 +2,7 @@
+Wed Nov 13 15:21:27 UTC 2019 - Todd R <[email protected]>
+
+- Update to 5.13.2
+ * Added PYQT_WEBENGINE_VERSION and PYQT_WEBENGINE_VERSION_STR.
+ * Added support for SIP v5.
+
+-------------------------------------------------------------------
Old:
----
PyQtWebEngine_gpl-5.13.1.tar.gz
New:
----
PyQtWebEngine-5.13.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qtwebengine-qt5.spec ++++++
--- /var/tmp/diff_new_pack.Z3Kpi7/_old 2019-11-26 16:53:25.976226121 +0100
+++ /var/tmp/diff_new_pack.Z3Kpi7/_new 2019-11-26 16:53:25.976226121 +0100
@@ -18,13 +18,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-qtwebengine-qt5
-Version: 5.13.1
+Version: 5.13.2
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/pyqtwebengine/intro
-Source:
https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/%{version}/PyQtWebEngine_gpl-%{version}.tar.gz
+Source:
https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/%{version}/PyQtWebEngine-%{version}.tar.gz
# PATCH-FIX-UPSTREAM
Patch0: update-timeline.patch
BuildRequires: %{python_module devel}
@@ -67,7 +67,7 @@
bindings to the Qt5 WebEngine framework.
%prep
-%autosetup -p1 -n PyQtWebEngine_gpl-%{version}
+%autosetup -p1 -n PyQtWebEngine-%{version}
%{python_expand mkdir build_%{$python_bin_suffix}
cp *.py build_%{$python_bin_suffix}
cp -r sip build_%{$python_bin_suffix}
++++++ PyQtWebEngine_gpl-5.13.1.tar.gz -> PyQtWebEngine-5.13.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtWebEngine_gpl-5.13.1/ChangeLog
new/PyQtWebEngine-5.13.2/ChangeLog
--- old/PyQtWebEngine_gpl-5.13.1/ChangeLog 2019-09-07 21:38:38.000000000
+0200
+++ new/PyQtWebEngine-5.13.2/ChangeLog 2019-11-02 19:55:51.000000000 +0100
@@ -1,5 +1,52 @@
+2019-11-02 Phil Thompson <[email protected]>
+
+ * NEWS:
+ Released as v5.13.2.
+ [5627b4a59e44] [5.13.2] <5.13-maint>
+
+ * NEWS:
+ Updated the NEWS file.
+ [b2d827860c80] <5.13-maint>
+
+2019-10-03 Phil Thompson <[email protected]>
+
+ * pyproject.toml:
+ Fixed the name of PEP 566.
+ [5a397978105b] <5.13-maint>
+
+ * pyproject.toml:
+ Requires PyQt-builder v1.
+ [31bb17aa756b] <5.13-maint>
+
+2019-10-01 Phil Thompson <[email protected]>
+
+ * pyproject.toml:
+ Fixed the name of the PyQt-builder project.
+ [a5e7ae0b670c] <5.13-maint>
+
+2019-09-18 Phil Thompson <[email protected]>
+
+ * configure.py:
+ Fixed building against Qt v5.12.5 and later.
+ [c2040bb2bee2] <5.13-maint>
+
+ * PyQtWebEngine.msp:
+ Added PYQT_WEBENGINE_VERSION and PYQT_WEBENGINE_VERSION_STR ot
+ QtWebEngine.
+ [0a4790429fad] <5.13-maint>
+
+2019-09-14 Phil Thompson <[email protected]>
+
+ * pyproject.toml:
+ Added the requires-dist meta-data.
+ [77195f172cbd] <5.13-maint>
+
2019-09-07 Phil Thompson <[email protected]>
+ * .hgtags:
+ Added tag 5.13.1 for changeset e7b3704583be
+ [6d1079a1d9d7] <5.13-maint>
+
* NEWS:
Released as v5.13.1.
[e7b3704583be] [5.13.1] <5.13-maint>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtWebEngine_gpl-5.13.1/NEWS
new/PyQtWebEngine-5.13.2/NEWS
--- old/PyQtWebEngine_gpl-5.13.1/NEWS 2019-09-07 21:38:06.000000000 +0200
+++ new/PyQtWebEngine-5.13.2/NEWS 2019-11-02 19:55:00.000000000 +0100
@@ -1,6 +1,9 @@
+v5.13.2 3rd November 2019
+ - Added PYQT_WEBENGINE_VERSION and PYQT_WEBENGINE_VERSION_STR.
+ - Added support for SIP v5.
+
v5.13.1 14th September 2019
- Added the missing QWebEnginePage.Feature.Notifications enum member.
- - Added support for sip v5.
v5.13.0 5th July 2019
- Added support for Qt v5.13.0.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtWebEngine_gpl-5.13.1/configure.py
new/PyQtWebEngine-5.13.2/configure.py
--- old/PyQtWebEngine_gpl-5.13.1/configure.py 2019-09-07 21:38:38.000000000
+0200
+++ new/PyQtWebEngine-5.13.2/configure.py 2019-11-02 19:55:51.000000000
+0100
@@ -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.13 of this boilerplate.
+# This is v2.15 of this boilerplate.
from distutils import sysconfig
@@ -238,7 +238,7 @@
# The version of the module as a string. Set it to None if you don't
# provide version information.
- version = '5.13.1'
+ version = '5.13.2'
# The name of the PEP 376 .dist-info directory to be created.
distinfo_name = 'PyQtWebEngine'
@@ -384,7 +384,19 @@
target_configuration is the target configuration.
"""
- version_tag = 'QtWebEngine_' +
target_configuration.qt_version_str.replace('.', '_')
+ # Qt v5.12.4 was the last release where we updated PyQt for a patch
+ # version.
+ major = (target_configuration.qt_version >> 16) & 0xff
+ minor = (target_configuration.qt_version >> 8) & 0xff
+ patch = target_configuration.qt_version & 0xff
+
+ if (major, minor) >= (5, 13):
+ patch = 0
+ elif (major, minor) == (5, 12):
+ if patch > 4:
+ patch = 4
+
+ version_tag = 'QtWebEngine_%d_%d_%d' % (major, minor, patch)
return ['-t', version_tag]
@@ -983,7 +995,6 @@
self.py_pylib_dir = self._apply_sysroot(self.py_pylib_dir)
self.py_sip_dir = self._apply_sysroot(self.py_sip_dir)
self.module_dir = self._apply_sysroot(self.module_dir)
- self.sip_inc_dir = self._apply_sysroot(self.sip_inc_dir)
def _apply_sysroot(self, dir_name):
""" Replace any leading sys.prefix of a directory name with sysroot.
@@ -1862,13 +1873,13 @@
os.makedirs(target_config.sip_inc_dir, exist_ok=True)
- argv = ['sip5-header']
+ argv = ['sip-module', '--sip-h']
if target_config.abi_version:
argv.append('--abi-version')
argv.append(target_config.abi_version)
- argv.append('--include-dir')
+ argv.append('--target-dir')
argv.append(quote(target_config.sip_inc_dir)),
argv.append('PyQt5.sip')
@@ -1876,7 +1887,7 @@
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." %
+ "sip-module failed to install sip.h in %s." %
target_config.sip_inc_dir)
else:
if target_config.sip_inc_dir is None:
@@ -2000,14 +2011,10 @@
distinfo_dir = os.path.join(target_config.py_module_dir,
pkg_config.distinfo_name + '-' + pkg_config.version + '.dist-info')
- if target_config.using_sip5():
- run_mk_distinfo = 'sip-distinfo --prefix \\"$(INSTALL_ROOT)\\"
--inventory installed.txt ' + distinfo_dir
- else:
- mk_distinfo = os.path.join(
- os.path.dirname(os.path.abspath(__file__)),
- 'mk_distinfo.py')
- run_mk_distinfo = '%s %s \\"$(INSTALL_ROOT)\\" %s installed.txt' %
(
- sys.executable, mk_distinfo, distinfo_dir)
+ mk_distinfo = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ 'mk_distinfo.py')
+ run_mk_distinfo = '%s %s \\"$(INSTALL_ROOT)\\" %s installed.txt' % (
+ sys.executable, mk_distinfo, distinfo_dir)
pro.write('''
distinfo.extra = %s
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQtWebEngine_gpl-5.13.1/pyproject.toml
new/PyQtWebEngine-5.13.2/pyproject.toml
--- old/PyQtWebEngine_gpl-5.13.1/pyproject.toml 2019-09-07 21:38:38.000000000
+0200
+++ new/PyQtWebEngine-5.13.2/pyproject.toml 2019-11-02 19:55:51.000000000
+0100
@@ -1,18 +1,18 @@
-# Specify PyQt-build v1.0 as the build system for the package.
+# Specify PyQt-builder v1.0 as the build system for the package.
[build-system]
-#requires = ["PyQt-build >=1, <2"]
-requires = ["PyQt-build >=0.1.0, <1"]
+requires = ["PyQt-builder >=1, <2"]
build-backend = "sipbuild.api"
-# Specify the PEP 522 metadata for the project.
+# Specify the PEP 566 metadata for the project.
[tool.sip.metadata]
name = "PyQtWebEngine"
-version = "5.13.1"
+version = "5.13.2"
summary = "Python bindings for the Qt WebEngine framework"
home-page = "https://www.riverbankcomputing.com/software/pyqtwebengine/"
author = "Riverbank Computing Limited"
author-email = "[email protected]"
license = "GPL v3"
+requires-dist = "PyQt5 (>=5.13)"
description-file = "README"
# Specify a PyQt-based project.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/PyQtWebEngine_gpl-5.13.1/sip/QtWebEngine/qtwebengineglobal.sip
new/PyQtWebEngine-5.13.2/sip/QtWebEngine/qtwebengineglobal.sip
--- old/PyQtWebEngine_gpl-5.13.1/sip/QtWebEngine/qtwebengineglobal.sip
2019-09-07 21:38:38.000000000 +0200
+++ new/PyQtWebEngine-5.13.2/sip/QtWebEngine/qtwebengineglobal.sip
2019-11-02 19:55:52.000000000 +0100
@@ -20,6 +20,14 @@
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+// PyQtWebEngine version information.
+int PYQT_WEBENGINE_VERSION;
+const char *PYQT_WEBENGINE_VERSION_STR;
+
+%ModuleCode
+static int PYQT_WEBENGINE_VERSION = 0x050d02;
+static const char *PYQT_WEBENGINE_VERSION_STR = "5.13.2";
+%End
%If (QtWebEngine_5_6_0 -)
namespace QtWebEngine