From 8e5ef9d1361ac1033911d5292053efc66c7f526154a53a6a4e10ca2dba0ed3f4 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 29 Aug 2020 08:04:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-qtwebengine-qt5?expand=0&rev=18 --- python-qtwebengine-qt5.changes | 6 +++++- python-qtwebengine-qt5.spec | 2 ++ update-timeline.patch | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 update-timeline.patch diff --git a/python-qtwebengine-qt5.changes b/python-qtwebengine-qt5.changes index 7aac25d..a141770 100644 --- a/python-qtwebengine-qt5.changes +++ b/python-qtwebengine-qt5.changes @@ -1,10 +1,14 @@ +------------------------------------------------------------------- +Sat Aug 29 08:04:01 UTC 2020 - Christophe Giboudeaux + +- Update update-timeline.patch + ------------------------------------------------------------------- Thu Aug 27 19:44:00 UTC 2020 - Benjamin Greiner - Update to version 5.15.0 * Added support for Qt v5.15.0. - v5.14.0 added support for Qt v5.14.0 in December 2019 -- drop update-timeline.patch - The source location has changed to PyPI ------------------------------------------------------------------- diff --git a/python-qtwebengine-qt5.spec b/python-qtwebengine-qt5.spec index e616e25..e27f57b 100644 --- a/python-qtwebengine-qt5.spec +++ b/python-qtwebengine-qt5.spec @@ -29,6 +29,8 @@ License: GPL-3.0-only Group: Development/Libraries/Python URL: https://www.riverbankcomputing.com/software/pyqtwebengine/intro Source: https://files.pythonhosted.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: update-timeline.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module qt5-devel} BuildRequires: %{python_module sip-devel >= 4.19.4} diff --git a/update-timeline.patch b/update-timeline.patch new file mode 100644 index 0000000..73ca42a --- /dev/null +++ b/update-timeline.patch @@ -0,0 +1,33 @@ +From d9569822ddf882c8115d3e7ab0423388eddca627 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Fri, 20 Sep 2019 15:06:44 +0200 +Subject: [PATCH] PyQtWebEngine 5.13.1 introduced the same stupid timeline as + PyQt5. + +--- +diff --git a/sip/QtWebEngineCore/QtWebEngineCoremod.sip b/sip/QtWebEngineCore/QtWebEngineCoremod.sip +index 957abf5..cfbff36 100644 +--- a/sip/QtWebEngineCore/QtWebEngineCoremod.sip ++++ b/sip/QtWebEngineCore/QtWebEngineCoremod.sip +@@ -26,7 +26,7 @@ + %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 QtWebEngine_5_12_2 QtWebEngine_5_12_3 QtWebEngine_5_12_4 QtWebEngine_5_13_0 QtWebEngine_5_14_0 QtWebEngine_5_15_0} ++%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 QtWebEngine_5_14_0 QtWebEngine_5_15_0 QtWebEngine_5_15_1 QtWebEngine_5_15_2 QtWebEngine_5_15_3} + + %Copying + Copyright (c) 2020 Riverbank Computing Limited +diff --git a/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip b/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip +index e3da76d..fdee035 100644 +--- a/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip ++++ b/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip +@@ -27,7 +27,7 @@ + %Import QtPrintSupport/QtPrintSupportmod.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 QtWebEngine_5_12_2 QtWebEngine_5_12_3 QtWebEngine_5_12_4 QtWebEngine_5_13_0 QtWebEngine_5_14_0 QtWebEngine_5_15_0} ++%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 QtWebEngine_5_14_0 QtWebEngine_5_15_0 QtWebEngine_5_15_1 QtWebEngine_5_15_2 QtWebEngine_5_15_3} + + %Copying + Copyright (c) 2020 Riverbank Computing Limited