[qt5-qtwebengine-freeworld] Sync patches from Fedora.

commit 32d39f57d445169c64bb312592d1c6dab3990f50 Author: Kevin Kofler <kevin.kofler(a)chello.at&gt; Date: Tue Jan 14 19:51:48 2020 +0100 Sync patches from Fedora. qtwebengine-SIOCGSTAMP.patch | 14 ++++++------ ...rywhere-5.13.2-missing-semicolon-in-blink.patch | 13 +++++++++++ qtwebengine-everywhere-5.13.2-use-python2.patch | 13 +++++++++++ ...ngine-everywhere-src-5.11.0-no-icudtl-dat.patch | 26 ++++++++++++---------- ...verywhere-src-5.12.0-gn-bootstrap-verbose.patch | 17 +++++++------- qtwebengine-gcc9-drop-rsp-clobber.patch | 12 ---------- qtwebengine-opensource-src-5.9.0-no-neon.patch | 9 ++++---- ...gine-opensource-src-5.9.0-openmax-dl-neon.patch | 25 ++++++++++++--------- 8 files changed, 76 insertions(+), 53 deletions(-) --- diff --git a/qtwebengine-SIOCGSTAMP.patch b/qtwebengine-SIOCGSTAMP.patch index 0b9df9b..7609f85 100644 --- a/qtwebengine-SIOCGSTAMP.patch +++ b/qtwebengine-SIOCGSTAMP.patch @@ -1,11 +1,11 @@ -diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc -index ca7849917..31c5f7697 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc -@@ -69,6 +69,11 @@ typedef void* SockOptArg; - +diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc +index c38d7fdfa..0a8b0fd8b 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc ++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc +@@ -72,6 +72,11 @@ typedef void* SockOptArg; + #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) - + +// Seems that kernel 5.2.0 renames this define to SIOCGSTAMP_OLD +#ifndef SIOCGSTAMP +#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ diff --git a/qtwebengine-everywhere-5.13.2-missing-semicolon-in-blink.patch b/qtwebengine-everywhere-5.13.2-missing-semicolon-in-blink.patch new file mode 100644 index 0000000..55251d7 --- /dev/null +++ b/qtwebengine-everywhere-5.13.2-missing-semicolon-in-blink.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc +index 18100c7b7..542f9bd11 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc +@@ -5710,7 +5710,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal( + + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (c == ':') { + if (saw_colon) + return ParseQualifiedNameResult(kQNMultipleColons); diff --git a/qtwebengine-everywhere-5.13.2-use-python2.patch b/qtwebengine-everywhere-5.13.2-use-python2.patch new file mode 100644 index 0000000..91a17ae --- /dev/null +++ b/qtwebengine-everywhere-5.13.2-use-python2.patch @@ -0,0 +1,13 @@ +diff --git a/src/webengine/module.pro b/src/webengine/module.pro +index 49a1086b2..afc89d49e 100644 +--- a/src/webengine/module.pro ++++ b/src/webengine/module.pro +@@ -76,7 +76,7 @@ qtConfig(webengine-testsupport) { + python = $$pythonPathForShell() + chromium_attributions.commands = \ + cd $$shell_quote($$shell_path($$PWD/../3rdparty)) && \ +- $$python chromium/tools/licenses.py \ ++ python2 chromium/tools/licenses.py \ + --file-template ../../tools/about_credits.tmpl \ + --entry-template ../../tools/about_credits_entry.tmpl credits \ + $$shell_quote($$shell_path($$OUT_PWD/chromium_attributions.qdoc)) diff --git a/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch b/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch index 59da86e..e035dff 100644 --- a/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch +++ b/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch @@ -1,9 +1,10 @@ -diff -up qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp ---- qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat 2018-06-14 09:23:48.931195271 -0500 -+++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp 2018-06-14 09:27:26.248014325 -0500 -@@ -258,28 +258,12 @@ QString dictionariesPath() +diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp +index 1c8316430..a1c27d28f 100644 +--- a/src/core/web_engine_library_info.cpp ++++ b/src/core/web_engine_library_info.cpp +@@ -259,29 +259,12 @@ QString dictionariesPath() - QString icuDataPath() + QString resourcesDataPath() { - static bool initialized = false; static QString potentialResourcesPath = @@ -14,19 +15,20 @@ diff -up qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp. #endif - if (!initialized) { - initialized = true; -- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) { -- qWarning("Qt WebEngine ICU data not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath)); +- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) { +- qWarning("Qt WebEngine resources not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath)); - potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath); - } -- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) { -- qWarning("Qt WebEngine ICU data not found at %s. Trying application directory...", qPrintable(potentialResourcesPath)); +- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) { +- qWarning("Qt WebEngine resources not found at %s. Trying application directory...", qPrintable(potentialResourcesPath)); - potentialResourcesPath = QCoreApplication::applicationDirPath(); - } -- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) { -- qWarning("Qt WebEngine ICU data not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath)); +- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) { +- qWarning("Qt WebEngine resources not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath)); - potentialResourcesPath = fallbackDir(); - } - } - +- return potentialResourcesPath; } + } // namespace diff --git a/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch b/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch index 9d4cadb..ef1012f 100644 --- a/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch +++ b/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch @@ -1,12 +1,13 @@ -diff -up qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro.gn-bootstrap-verbose qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro ---- qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro.gn-bootstrap-verbose 2018-12-07 09:53:18.262171677 -0600 -+++ qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro 2018-12-07 09:57:53.246646133 -0600 +diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro +index b6bf9cfc4..30f92e6ac 100644 +--- a/src/buildtools/gn.pro ++++ b/src/buildtools/gn.pro @@ -18,7 +18,7 @@ build_pass|!debug_and_release { src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) -- gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path -+ gn_configure = $$system_quote($$gn_bootstrap) --verbose --no-last-commit-position --out-path $$out_path - !system("$$pythonPathForSystem() $$gn_configure") { - error("GN generation error!") - } +- gn_gen_args = --no-last-commit-position --out-path $$out_path \ ++ gn_gen_args = --no-last-commit-position --verbose --out-path $$out_path \ + --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ + --ld \"$$which($$QMAKE_LINK)\" + diff --git a/qtwebengine-opensource-src-5.9.0-no-neon.patch b/qtwebengine-opensource-src-5.9.0-no-neon.patch index 0fc7395..dd24ee2 100644 --- a/qtwebengine-opensource-src-5.9.0-no-neon.patch +++ b/qtwebengine-opensource-src-5.9.0-no-neon.patch @@ -1,7 +1,8 @@ -diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-no-neon/src/core/config/linux.pri ---- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri 2017-05-19 06:22:04.000000000 +0200 -+++ qtwebengine-opensource-src-5.9.0-no-neon/src/core/config/linux.pri 2017-06-08 00:55:22.257781563 +0200 -@@ -70,7 +70,9 @@ +diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri +index f45c418fe..f6c7b714e 100644 +--- a/src/core/config/linux.pri ++++ b/src/core/config/linux.pri +@@ -87,7 +87,9 @@ contains(QT_ARCH, "arm") { gn_args += arm_use_neon=false # If the toolchain does not explicitly specify to use NEON instructions # we use arm_neon_optional for ARMv7 diff --git a/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch b/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch index fd11fae..09803b2 100644 --- a/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch +++ b/qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch @@ -1,19 +1,24 @@ -diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn ---- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2017-05-18 16:51:44.000000000 +0200 -+++ qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn 2017-06-10 02:41:10.317340598 +0200 -@@ -196,9 +196,6 @@ +diff --git a/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn b/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn +index 96a59c7c7..d5470f284 100644 +--- a/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/openmax_dl/dl/BUILD.gn +@@ -208,12 +208,6 @@ if (current_cpu == "arm") { ] if (arm_optionally_use_neon) { # Run-time NEON detection. -- deps = [ "//third_party/android_tools:cpu_features" ] +- deps = [ +- "//third_party/android_tools:cpu_features", +- ] +- - # To get the __android_log_print routine - libs = [ "log" ] + # Detection routine sources += [ "sp/src/arm/detect.c" ] - } -diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c ---- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c 2017-05-18 16:51:44.000000000 +0200 -+++ qtwebengine-opensource-src-5.9.0-openmax-dl-neon/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c 2017-06-10 02:38:30.593809570 +0200 +diff --git a/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c b/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c +index 57bfe4089..94a3f7ddc 100644 +--- a/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c ++++ b/src/3rdparty/chromium/third_party/openmax_dl/dl/sp/src/arm/detect.c @@ -9,13 +9,57 @@ * */ @@ -76,7 +81,7 @@ diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/third_party/open } static void SetFFTRoutines() { -@@ -24,13 +68,9 @@ +@@ -24,13 +68,9 @@ static void SetFFTRoutines() { * forward and inverse FFTs */ if (omxSP_HasArmNeon()) {