diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index df8149a..f281984 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -50,7 +50,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.10.1 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -112,9 +112,6 @@ 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 @@ -367,9 +364,6 @@ BuildArch: noarch %patch12 -p1 -b .webrtc-neon-detect %patch21 -p1 -b .gn-bootstrap-verbose %patch22 -p1 -b .icu59 -%if 0%{?fedora} > 27 -%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' \ @@ -576,6 +570,9 @@ done %changelog +* Fri Feb 23 2018 Kevin Kofler - 5.10.1-2 +- Drop -fabi-version=11 workaround, gcc-8.0.1-0.16.fc28 should fix this + * Sun Feb 18 2018 Kevin Kofler - 5.10.1-1 - Update to 5.10.1 - Rediff (unfuzz) no-sse2 patch diff --git a/qtwebengine-everywhere-src-5.10.0-QTBUG-64759.patch b/qtwebengine-everywhere-src-5.10.0-QTBUG-64759.patch deleted file mode 100644 index 7c5d32b..0000000 --- a/qtwebengine-everywhere-src-5.10.0-QTBUG-64759.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py.QTBUG-64759 qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py ---- qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py.QTBUG-64759 2018-02-16 12:52:27.991861536 -0600 -+++ qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py 2018-02-16 13:16:30.778130158 -0600 -@@ -331,6 +331,9 @@ def write_gn_ninja(path, root_gen_dir, o - cflags_cc = [] - ldflags = [] - -+ cflags.extend(['-fabi-version=11']) -+ cflags_cc.extend(['-fabi-version=11']) -+ - include_dirs = [root_gen_dir, SRC_ROOT] - libs = [] -