From 414d54d31bbaa9c98f5b2b1a02258f74873614f854cb69da3728c4594fd482d1 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 20 Sep 2019 13:11:12 +0000 Subject: [PATCH] Accepting request 732186 from home:cgiboudeaux:pyqt - Add update-timeline.patch OBS-URL: https://build.opensuse.org/request/show/732186 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-qtwebengine-qt5?expand=0&rev=9 --- python-qtwebengine-qt5.changes | 1 + python-qtwebengine-qt5.spec | 4 +++- update-timeline.patch | 40 ++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 update-timeline.patch diff --git a/python-qtwebengine-qt5.changes b/python-qtwebengine-qt5.changes index 31647c2..66cef48 100644 --- a/python-qtwebengine-qt5.changes +++ b/python-qtwebengine-qt5.changes @@ -6,6 +6,7 @@ Fri Sep 20 11:44:26 UTC 2019 - Christophe Giboudeaux * Fix building against Qt v5.12 and earlier. * Fixed building when Qt doesn't support QtWebChannel. * Added support for sip v5. +- Add update-timeline.patch ------------------------------------------------------------------- Fri Jul 12 10:27:56 UTC 2019 - Christophe Giboudeaux diff --git a/python-qtwebengine-qt5.spec b/python-qtwebengine-qt5.spec index c61bac6..85d431b 100644 --- a/python-qtwebengine-qt5.spec +++ b/python-qtwebengine-qt5.spec @@ -25,6 +25,8 @@ 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 +# PATCH-FIX-UPSTREAM +Patch0: update-timeline.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module qt5-devel} BuildRequires: %{python_module sip-devel >= 4.19.1} @@ -65,7 +67,7 @@ This package contains sip files used to generate bindings to the Qt5 WebEngine framework. %prep -%setup -q -n PyQtWebEngine_gpl-%{version} +%autosetup -p1 -n PyQtWebEngine_gpl-%{version} %{python_expand mkdir build_%{$python_bin_suffix} cp *.py build_%{$python_bin_suffix} cp -r sip build_%{$python_bin_suffix} diff --git a/update-timeline.patch b/update-timeline.patch new file mode 100644 index 0000000..cbe33d9 --- /dev/null +++ b/update-timeline.patch @@ -0,0 +1,40 @@ +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. + +--- + sip/QtWebEngineCore/QtWebEngineCoremod.sip | 2 +- + sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sip/QtWebEngineCore/QtWebEngineCoremod.sip b/sip/QtWebEngineCore/QtWebEngineCoremod.sip +index 8f34dfd..94d366a 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} ++%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_13_1 QtWebEngine_5_13_2 QtWebEngine_5_13_3} + + %Copying + Copyright (c) 2019 Riverbank Computing Limited +diff --git a/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip b/sip/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip +index 78262d9..16f9fd3 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} ++%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_13_1 QtWebEngine_5_13_2 QtWebEngine_5_13_3} + + %Copying + Copyright (c) 2019 Riverbank Computing Limited +-- +2.23.0 +