From 7a09077c55ed43a39369c217d8b5f9814a128296 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 26 Sep 2019 15:07:11 -0500 Subject: [PATCH] 5.12.5 --- .gitignore | 1 + ...uld_override_user_agent_in_new_tabs_.patch | 34 ------------------ 0002-Bump-V8-patch-level.patch | 30 ---------------- ...-segfaults-with-arm-32bit-on-metrics.patch | 31 ---------------- ...compilation-of-simplebrowser-example.patch | 35 ------------------- get_free_ffmpeg_source_files.py | 2 +- qt5-qtwebengine.spec | 17 ++++----- sources | 2 +- 8 files changed, 10 insertions(+), 142 deletions(-) delete mode 100644 0001-Fix-changing-should_override_user_agent_in_new_tabs_.patch delete mode 100644 0002-Bump-V8-patch-level.patch delete mode 100644 0003-Fix-segfaults-with-arm-32bit-on-metrics.patch delete mode 100644 0027-Fix-compilation-of-simplebrowser-example.patch diff --git a/.gitignore b/.gitignore index 1ceb264..cdfb6c3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /qtwebengine-everywhere-src-5.12.3-clean.tar.xz /qtwebengine-everywhere-src-5.12.4-clean.tar.xz /pulseaudio-12.2-headers.tar.gz +/qtwebengine-everywhere-src-5.12.5-clean.tar.xz diff --git a/0001-Fix-changing-should_override_user_agent_in_new_tabs_.patch b/0001-Fix-changing-should_override_user_agent_in_new_tabs_.patch deleted file mode 100644 index 92b8a73..0000000 --- a/0001-Fix-changing-should_override_user_agent_in_new_tabs_.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e8eec84aac0dc626770a483d503f7b16ab0dbe70 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Fri, 7 Jun 2019 14:18:23 +0200 -Subject: [PATCH 1/3] Fix changing should_override_user_agent_in_new_tabs_ - -It wouldn't be updated if the custom user-agent didn't change. - -Change-Id: Ic31ef485e2cb84903f9b48cb9ad5f9f1a723eb92 -Reviewed-by: Michal Klocek ---- - chromium/content/browser/web_contents/web_contents_impl.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/chromium/content/browser/web_contents/web_contents_impl.cc b/chromium/content/browser/web_contents/web_contents_impl.cc -index a2659263737..4c127f835d6 100644 ---- a/chromium/content/browser/web_contents/web_contents_impl.cc -+++ b/chromium/content/browser/web_contents/web_contents_impl.cc -@@ -1230,11 +1230,11 @@ WebUI* WebContentsImpl::GetCommittedWebUI() const { - - void WebContentsImpl::SetUserAgentOverride(const std::string& override, - bool override_in_new_tabs) { -+ should_override_user_agent_in_new_tabs_ = override_in_new_tabs; -+ - if (GetUserAgentOverride() == override) - return; - -- should_override_user_agent_in_new_tabs_ = override_in_new_tabs; -- - renderer_preferences_.user_agent_override = override; - - // Send the new override string to the renderer. --- -2.21.0 - diff --git a/0002-Bump-V8-patch-level.patch b/0002-Bump-V8-patch-level.patch deleted file mode 100644 index 768c923..0000000 --- a/0002-Bump-V8-patch-level.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6f3c15d2319ca11c2e31076292f5733baf64d991 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Tue, 18 Jun 2019 10:29:48 +0200 -Subject: [PATCH 2/3] Bump V8 patch level - -Otherwise it might use outdated script caches. - -Change-Id: I839c6a11c3e1991f232972ad2d87fe6318256307 -Fixes: QTBUG-72532 -Reviewed-by: Michal Klocek ---- - chromium/v8/include/v8-version.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h -index 3e703039517..8dacc30c340 100644 ---- a/chromium/v8/include/v8-version.h -+++ b/chromium/v8/include/v8-version.h -@@ -11,7 +11,7 @@ - #define V8_MAJOR_VERSION 6 - #define V8_MINOR_VERSION 9 - #define V8_BUILD_NUMBER 427 --#define V8_PATCH_LEVEL 31 -+#define V8_PATCH_LEVEL 32 - - // Use 1 for candidates and 0 otherwise. - // (Boolean macro values are not supported by all preprocessors.) --- -2.21.0 - diff --git a/0003-Fix-segfaults-with-arm-32bit-on-metrics.patch b/0003-Fix-segfaults-with-arm-32bit-on-metrics.patch deleted file mode 100644 index 793efb2..0000000 --- a/0003-Fix-segfaults-with-arm-32bit-on-metrics.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2323dc924a3b107647f9e5f0bdbcfc44b9713195 Mon Sep 17 00:00:00 2001 -From: Michal Klocek -Date: Thu, 20 Jun 2019 09:09:53 +0200 -Subject: [PATCH 3/3] Fix segfaults with arm 32bit on metrics - -Gcc 6 seems to misscompile pair's template constructor -in std::map emplace, use converting move constructor instead. - -Fixes: QTBUG-75097 -Change-Id: Ia50dc9eadb58f713432c0228a4a5aed73b275f32 -Reviewed-by: Allan Sandfeld Jensen ---- - chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc b/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc -index 6685a5816db..5c5380e007e 100644 ---- a/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc -+++ b/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc -@@ -23,7 +23,7 @@ UkmEntryBuilderBase::~UkmEntryBuilderBase() = default; - - void UkmEntryBuilderBase::SetMetricInternal(uint64_t metric_hash, - int64_t value) { -- entry_->metrics.emplace(metric_hash, value); -+ entry_->metrics.emplace(std::make_pair(metric_hash, value)); - } - - void UkmEntryBuilderBase::Record(UkmRecorder* recorder) { --- -2.21.0 - diff --git a/0027-Fix-compilation-of-simplebrowser-example.patch b/0027-Fix-compilation-of-simplebrowser-example.patch deleted file mode 100644 index e6c895f..0000000 --- a/0027-Fix-compilation-of-simplebrowser-example.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c041711febbee334ce5369f25cfae3f560819855 Mon Sep 17 00:00:00 2001 -From: Kai Koehne -Date: Tue, 16 Jan 2018 14:09:50 +0100 -Subject: [PATCH 027/230] Fix compilation of simplebrowser example -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Previously qstyle.h was included indirectly through the uic -generated code, but this got changed in qtbase -commit 058474884c2505a8a0. - -Task-number: QTBUG-65793 -Change-Id: I56a1cd045d53b268999d728f6907ee8d952ba6e9 -Reviewed-by: Jüri Valdmann -Reviewed-by: Michal Klocek ---- - examples/webenginewidgets/simplebrowser/webpage.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp -index 3b78b861..90395641 100644 ---- a/examples/webenginewidgets/simplebrowser/webpage.cpp -+++ b/examples/webenginewidgets/simplebrowser/webpage.cpp -@@ -56,6 +56,7 @@ - #include "webview.h" - #include - #include -+#include - - WebPage::WebPage(QWebEngineProfile *profile, QObject *parent) - : QWebEnginePage(profile, parent) --- -2.17.0 - diff --git a/get_free_ffmpeg_source_files.py b/get_free_ffmpeg_source_files.py index 76c73ae..899e774 100755 --- a/get_free_ffmpeg_source_files.py +++ b/get_free_ffmpeg_source_files.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # Copyright 2015 Tomas Popela # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 363f7d3..1d4e7dd 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -46,8 +46,8 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine -Version: 5.12.4 -Release: 10%{?dist} +Version: 5.12.5 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -55,8 +55,8 @@ Release: 10%{?dist} License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: http://www.qt.io # cleaned tarball with patent-encumbered codecs removed from the bundled FFmpeg -# wget http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz -# ./clean_qtwebengine.sh 5.12.2 +# wget http://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtwebengine-everywhere-src-5.12.5.tar.xz +# ./clean_qtwebengine.sh 5.12.5 Source0: qtwebengine-everywhere-src-%{version}-clean.tar.xz # cleanup scripts used above Source1: clean_qtwebengine.sh @@ -92,9 +92,6 @@ Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch ## Upstream patches: # qtwebengine-chromium -Patch101: 0001-Fix-changing-should_override_user_agent_in_new_tabs_.patch -Patch102: 0002-Bump-V8-patch-level.patch -Patch103: 0003-Fix-segfaults-with-arm-32bit-on-metrics.patch # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches ExclusiveArch: %{qt5_qtwebengine_arches} @@ -355,9 +352,6 @@ BuildArch: noarch mv pulse src/3rdparty/chromium/ pushd src/3rdparty/chromium -%patch101 -p2 -b .0001 -%patch102 -p2 -b .0002 -%patch103 -p2 -b .0003 popd %patch0 -p1 -b .linux-pri @@ -595,6 +589,9 @@ done %changelog +* Thu Sep 26 2019 Rex Dieter - 5.12.5-1 +- 5.12.5 + * Tue Sep 24 2019 Jan Grulich - 5.12.4-10 - rebuild (qt5) diff --git a/sources b/sources index 39eb9c0..0c2c194 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qtwebengine-everywhere-src-5.12.4-clean.tar.xz) = 6ac76ef0fde00763a407363e1ce79d883d827020580c0ec712ae1b2f1262d9daf2a1039c44f271ac4b498acaa9af1c1dcdb7367bcf3a6b97acdc9d8973b3cd18 SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be +SHA512 (qtwebengine-everywhere-src-5.12.5-clean.tar.xz) = 62b88f5710a16e8e5770d6a38f24f3f4355a1d7559f8a80906bc5d3b3214a8cb0600943a78770bc625f8a8b2e35a338c45325035f6bced259b39edba5f96f7b6