diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 15a0a20..3b5cc7e 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -98,6 +98,8 @@ Patch11: qtwebengine-opensource-src-5.9.0-skia-neon.patch Patch12: qtwebengine-opensource-src-5.9.0-webrtc-neon-detect.patch # FTBFS using qt < 5.8 Patch20: qtwebengine-opensource-src-5.8.0-qt57.patch +# Force verbose output from the GN bootstrap process +Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch %if 0%{?fedora} && 0%{?fedora} < 25 # work around missing qt5_qtwebengine_arches macro on F24 @@ -339,6 +341,7 @@ BuildArch: noarch %patch11 -p1 -b .skia-neon %patch12 -p1 -b .webrtc-neon-detect %patch20 -p1 -b .qt57 +%patch21 -p1 -b .gn-bootstrap-verbose # 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 @@ -549,6 +552,7 @@ done - Update system libvpx/libwebp version requirements (libvpx now F25+ only) - Drop the flag hacks (-g1 -fno-delete-null-pointer-checks) that are fixed upstream, force -g2 on x86_64 instead +- Force verbose output from the GN bootstrap process * Sat May 13 2017 Rex Dieter - 5.8.0-14 - fix rpm macros diff --git a/qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch b/qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch new file mode 100644 index 0000000..87b5beb --- /dev/null +++ b/qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch @@ -0,0 +1,12 @@ +diff -ur qtwebengine-opensource-src-5.9.0/src/buildtools/gn.pro qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose/src/buildtools/gn.pro +--- qtwebengine-opensource-src-5.9.0/src/buildtools/gn.pro 2017-05-19 06:22:04.000000000 +0200 ++++ qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose/src/buildtools/gn.pro 2017-06-10 15:24:55.426814326 +0200 +@@ -20,7 +20,7 @@ + src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") + gn_bootstrap = $$system_path($$absolute_path(chromium/tools/gn/bootstrap/bootstrap.py, $$src_3rd_party_dir)) + gn_args = $$system_quote($$gn_args) +- gn_configure = $$system_quote($$gn_bootstrap) --shadow --gn-gen-args=$$gn_args $$ninja_path ++ gn_configure = $$system_quote($$gn_bootstrap) --verbose --shadow --gn-gen-args=$$gn_args $$ninja_path + !system("cd $$system_quote($$system_path($$dirname(out))) && $$pythonPathForSystem() $$gn_configure") { + error("GN build error!") + }