aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-16 23:35:23 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-16 23:35:23 +0100
commit7122efed47bb1e5db727c80a9f3004b4fe64b881 (patch)
treed98f7bec86b4487d319f042d31e8c7b7c6b359b0
parentdev-qt: Add Qt 5.12.2 (diff)
downloadqt-7122efed47bb1e5db727c80a9f3004b4fe64b881.tar.gz
qt-7122efed47bb1e5db727c80a9f3004b4fe64b881.tar.bz2
qt-7122efed47bb1e5db727c80a9f3004b4fe64b881.zip
dev-qt/qtwebengine: Drop upstreamed patch
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.12.1-CVE-2019-5786.patch29
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild1
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild2
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.9999.ebuild1
4 files changed, 0 insertions, 33 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.1-CVE-2019-5786.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.1-CVE-2019-5786.patch
deleted file mode 100644
index 5dbc6172..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.1-CVE-2019-5786.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# Bug: https://bugs.gentoo.org/679530
-# Chromium Gerrit: https://chromium-review.googlesource.com/c/chromium/src/+/1495209
-
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-@@ -143,14 +143,16 @@
- if (!raw_data_ || error_code_ != FileErrorCode::kOK)
- return nullptr;
-
-- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-- if (finished_loading_) {
-- array_buffer_result_ = result;
-- AdjustReportedMemoryUsageToV8(
-- -1 * static_cast<int64_t>(raw_data_->ByteLength()));
-- raw_data_.reset();
-+ if (!finished_loading_) {
-+ return DOMArrayBuffer::Create(
-+ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength()));
- }
-- return result;
-+
-+ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-+ AdjustReportedMemoryUsageToV8(-1 *
-+ static_cast<int64_t>(raw_data_->ByteLength()));
-+ raw_data_.reset();
-+ return array_buffer_result_;
- }
-
- String FileReaderLoader::StringResult() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 50e3c61c..48fcb535 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -81,7 +81,6 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
- "${FILESDIR}/${PN}-5.12.1-CVE-2019-5786.patch" # bug 679530
)
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index 2b24b481..cff56886 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.12.1-CVE-2019-5786.patch" ) # bug 679530
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index fbf405c6..220936d4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -81,7 +81,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch"
- "${FILESDIR}/${PN}-5.12.1-CVE-2019-5786.patch" # bug 679530
)
src_prepare() {