diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 1163051..002c05d 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -112,13 +112,14 @@ Patch21: qtwebengine-everywhere-src-5.10.0-gn-bootstrap-verbose.patch # https://codereview.qt-project.org/#/c/196922/ # see QTBUG-60886 and QTBUG-65090 Patch22: qtwebengine-everywhere-src-5.10.0-icu59.patch +# workaround FTBFS with GCC 8 (#1546255, gcc#84286, #1545918, QTBUG-64759) +# build GN with -fabi-version=11 for now +Patch23: qtwebengine-everywhere-src-5.10.0-QTBUG-64759.patch # drop support for obsolete Unicode "aspirational scripts" (dropped in UTS 31), # fixes #error with ICU >= 60 (which was a reminder to double-check the list) # see: http://www.unicode.org/reports/tr31/#Aspirational_Use_Scripts # backport of: https://chromium-review.googlesource.com/c/chromium/src/+/731871 Patch100: qtwebengine-everywhere-src-5.10.0-no-aspirational-scripts.patch -# workaround FTBFS -Patch101: qtwebengine-everywhere-src-5.10.0-QTBUG-64759.patch # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches ExclusiveArch: %{qt5_qtwebengine_arches} @@ -366,10 +367,10 @@ BuildArch: noarch %patch12 -p1 -b .webrtc-neon-detect %patch21 -p1 -b .gn-bootstrap-verbose %patch22 -p1 -b .icu59 -%patch100 -p1 -b .no-aspirational-scripts %if 0%{?fedora} > 27 -%patch101 -p1 -b .QTBUG-64759 +%patch23 -p1 -b .QTBUG-64759 %endif +%patch100 -p1 -b .no-aspirational-scripts # 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