[qt5-qtwebengine-freeworld/f25] Fix FTBFS with Qt 5.7

commit 490cee505f6ede8bfb7668c64665639f618bb1af Author: Kevin Kofler <kevin.kofler(a)chello.at&gt; Date: Thu Nov 16 19:37:12 2017 +0100 Fix FTBFS with Qt 5.7 qt5-qtwebengine-freeworld.spec | 4 ++++ qtwebengine-opensource-src-5.9.2-qt57.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) --- diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index 1b28784..51dcbf4 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -95,6 +95,8 @@ Patch11: qtwebengine-opensource-src-5.9.0-skia-neon.patch Patch12: qtwebengine-opensource-src-5.9.0-webrtc-neon-detect.patch # Force verbose output from the GN bootstrap process Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch +# Fix FTBFS with Qt 5.7 +Patch22: qtwebengine-opensource-src-5.9.2-qt57.patch %if 0%{?fedora} && 0%{?fedora} < 25 # work around missing qt5_qtwebengine_arches macro on F24 @@ -319,6 +321,7 @@ This version is compiled with support for patent-encumbered codecs enabled. %patch11 -p1 -b .skia-neon %patch12 -p1 -b .webrtc-neon-detect %patch21 -p1 -b .gn-bootstrap-verbose +%patch22 -p1 -b .qt57 # 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 @@ -408,6 +411,7 @@ echo "%{_libdir}/%{name}" \ - Drop system-re2 patch (patching the no longer used unbundle/re2.gn), the QtWebEngine re2/BUILD.gn is already correct - Explicitly force use_system_re2, the autodetection does not work on F25 +- Fix FTBFS with Qt 5.7 * Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 5.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/qtwebengine-opensource-src-5.9.2-qt57.patch b/qtwebengine-opensource-src-5.9.2-qt57.patch new file mode 100644 index 0000000..1c10e4b --- /dev/null +++ b/qtwebengine-opensource-src-5.9.2-qt57.patch @@ -0,0 +1,19 @@ +diff -ur qtwebengine-opensource-src-5.9.2/src/core/web_contents_adapter.cpp qtwebengine-opensource-src-5.9.2-qt57/src/core/web_contents_adapter.cpp +--- qtwebengine-opensource-src-5.9.2/src/core/web_contents_adapter.cpp 2017-10-03 11:06:38.000000000 +0200 ++++ qtwebengine-opensource-src-5.9.2-qt57/src/core/web_contents_adapter.cpp 2017-11-16 17:17:51.072511997 +0100 +@@ -1265,7 +1265,15 @@ + } + + const QString &fileName = toQt(dropData.file_description_filename); ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) + const QString &filePath = d->dndTmpDir->filePath(fileName); ++#else ++ QString filePath = d->dndTmpDir->path(); ++ if (!filePath.isEmpty()) { ++ filePath += QLatin1Char('/'); ++ filePath += fileName; ++ } ++#endif + QFile file(filePath); + if (!file.open(QIODevice::WriteOnly)) { + qWarning("Cannot write temporary file %s.", qUtf8Printable(filePath));