From 2ef1c5e991ecc415bc054a2493bf50834f5256a6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 28 2018 21:39:03 +0000 Subject: include 0027-Fix-compilation-of-simplebrowser-example.patch (5.11 branch) --- diff --git a/0027-Fix-compilation-of-simplebrowser-example.patch b/0027-Fix-compilation-of-simplebrowser-example.patch new file mode 100644 index 0000000..e6c895f --- /dev/null +++ b/0027-Fix-compilation-of-simplebrowser-example.patch @@ -0,0 +1,35 @@ +From c041711febbee334ce5369f25cfae3f560819855 Mon Sep 17 00:00:00 2001 +From: Kai Koehne +Date: Tue, 16 Jan 2018 14:09:50 +0100 +Subject: [PATCH 027/230] Fix compilation of simplebrowser example +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Previously qstyle.h was included indirectly through the uic +generated code, but this got changed in qtbase +commit 058474884c2505a8a0. + +Task-number: QTBUG-65793 +Change-Id: I56a1cd045d53b268999d728f6907ee8d952ba6e9 +Reviewed-by: Jüri Valdmann +Reviewed-by: Michal Klocek +--- + examples/webenginewidgets/simplebrowser/webpage.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp +index 3b78b861..90395641 100644 +--- a/examples/webenginewidgets/simplebrowser/webpage.cpp ++++ b/examples/webenginewidgets/simplebrowser/webpage.cpp +@@ -56,6 +56,7 @@ + #include "webview.h" + #include + #include ++#include + + WebPage::WebPage(QWebEngineProfile *profile, QObject *parent) + : QWebEnginePage(profile, parent) +-- +2.17.0 + diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 62feef4..5939aaa 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -130,6 +130,8 @@ Patch101: qtwebengine-everywhere-src-5.10.1-security-5.9.5.patch # fix incomplete (and thus having no effect) fix for CVE-2018-6033 in 5.10.1 # (forward-ported from 5.9.5, will also be included in 5.11) Patch102: qtwebengine-everywhere-src-5.10.1-CVE-2018-6033.patch +# From 5.11 branch, fix build against Qt 5.11.x +Patch103: 0027-Fix-compilation-of-simplebrowser-example.patch # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches ExclusiveArch: %{qt5_qtwebengine_arches} @@ -382,6 +384,7 @@ BuildArch: noarch %patch100 -p1 -b .no-aspirational-scripts %patch101 -p1 -b .security-5.9.5 %patch102 -p1 -b .CVE-2018-6033 +%patch103 -p1 -b .0027 # fix // in #include in content/renderer/gpu to avoid debugedit failure sed -i -e 's!gpu//!gpu/!g' \ src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc @@ -590,6 +593,7 @@ done * Sun May 27 2018 Rex Dieter - 5.10.1-7 - rebuild (qt5 5.11.0) - Add patch by spot from the Fedora Chromium RPM for FTBFS with GCC 8 on i686 +- include 0027-Fix-compilation-of-simplebrowser-example.patch (5.11 branch) * Mon Apr 30 2018 Pete Walter - 5.10.1-6 - Rebuild for ICU 61.1