From 3d5ab9af850d8cc08c7f262b7fd4df4a74590c39 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 16 2018 19:42:53 +0000 Subject: workaround FTBFS, build with -fabi-version=11 (#1545918) --- diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 8c9055c..f318164 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -50,7 +50,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.10.0 -Release: 5%{?dist} +Release: 6%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -117,6 +117,8 @@ Patch22: qtwebengine-everywhere-src-5.10.0-icu59.patch # 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} @@ -365,6 +367,7 @@ BuildArch: noarch %patch21 -p1 -b .gn-bootstrap-verbose %patch22 -p1 -b .icu59 %patch100 -p1 -b .no-aspirational-scripts +%patch101 -p1 -b .QTBUG-64759 # 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 @@ -570,6 +573,9 @@ done %changelog +* Fri Feb 16 2018 Rex Dieter - 5.10.0-6 +- workaround FTBFS, build with -fabi-version=11 (#1545918) + * Sat Feb 10 2018 Kevin Kofler - 5.10.0-5 - Reenable system libvpx on F28+, Rawhide (future F28) has libvpx 1.7.0 now diff --git a/qtwebengine-everywhere-src-5.10.0-QTBUG-64759.patch b/qtwebengine-everywhere-src-5.10.0-QTBUG-64759.patch new file mode 100644 index 0000000..7c5d32b --- /dev/null +++ b/qtwebengine-everywhere-src-5.10.0-QTBUG-64759.patch @@ -0,0 +1,13 @@ +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 = [] +