From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 787371382C5 for ; Fri, 26 Feb 2021 21:19:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B26F6E084A; Fri, 26 Feb 2021 21:19:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88303E084A for ; Fri, 26 Feb 2021 21:19:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4476E3410D4 for ; Fri, 26 Feb 2021 21:19:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C40042A9 for ; Fri, 26 Feb 2021 21:19:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1614374363.b17a3763239b411e863259e928b496bea2b9d051.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/Manifest dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-chromium-87-v8-icu68.patch dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-disable-git.patch dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-fixup-CVE-2021-21149-backport.patch dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch dev-qt/qtwebengine/metadata.xml dev-qt/qtwebengine/qtwebengine-5.15.2_p20210220.ebuild dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b17a3763239b411e863259e928b496bea2b9d051 X-VCS-Branch: master Date: Fri, 26 Feb 2021 21:19:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b81feae0-b011-4772-be26-df1ae2a95a6c X-Archives-Hash: 7d8704eb9d1acf553d92e780678083e8 commit: b17a3763239b411e863259e928b496bea2b9d051 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 26 13:35:44 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Feb 26 21:19:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17a3763 dev-qt/qtwebengine: 5.15.2_p20210224 bump Snapshotted at: Branch: 5.15 Commit: 0b5f110234256eabaa264189d9117069f2a2d144 Submodule qtwebengine-chromium.git: Branch: 87-based Commit: 0eea95b24a9ed61c185adeeb787fb5b62e8f4537 V8-ICU-68 runtime fix: Thanks-to: Stephan Hartmann gentoo.org> Bug: https://bugs.gentoo.org/773040 Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebengine/Manifest | 2 +- ...2_p20210220-fixup-CVE-2021-21149-backport.patch | 42 ---------------------- ...ne-5.15.2_p20210224-chromium-87-v8-icu68.patch} | 0 ...qtwebengine-5.15.2_p20210224-disable-git.patch} | 0 dev-qt/qtwebengine/metadata.xml | 1 + ....ebuild => qtwebengine-5.15.2_p20210224.ebuild} | 11 +++--- 6 files changed, 7 insertions(+), 49 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index ac12b6baffd..56dc6ae1cdc 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,4 +1,4 @@ DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc DIST qtwebengine-5.15.2_p20210205.tar.xz 317422912 BLAKE2B a5cdbea0347db21b7fb981a358ad6419ea9cebef98f3d8fef3618b9010164986257cb87caef6a09648e463c3b864ce28e0591a2a783b8b5727b69d85b4b3289c SHA512 8e8b4918f7c3232aafd9f2d13655501e0d03d90514ef3a0b8319df1c8792aeaf7800f370cee15634c708ee14f86ef831749556cb6710578d03c3c2e468149be0 -DIST qtwebengine-5.15.2_p20210220.tar.xz 320087924 BLAKE2B 8db495e853948d8a47d04d34e8f2e99f33423874026d447fd119be885c74671f6566f8ba34f6e37ed5abcc347150213bef9575cc61b80ee8fbc4a005c2448df8 SHA512 7502a3d7df68764d1ed8953f8bd8a6def88344c56800bf32d1527133bceaf669f2ef6899dd2b4f23ca284ad5f0a9b086f1807f3a5f0a482b0744d1ba2391c480 +DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84 SHA512 939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51 DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-fixup-CVE-2021-21149-backport.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-fixup-CVE-2021-21149-backport.patch deleted file mode 100644 index eeca3627d0b..00000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-fixup-CVE-2021-21149-backport.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d9d9e606cb34b1b4ac0f44de132b1eb10763f1f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20Br=C3=BCning?= -Date: Tue, 23 Feb 2021 16:34:39 +0100 -Subject: [PATCH] FIXUP: [Backport] CVE-2021-21149: Stack overflow in Data - Transfer - -Const qualifier removed by another patch upstream had to be removed -as well. - -Change-Id: I4823080661b815884c49ad9881e9958c1ba65251 -Reviewed-by: Allan Sandfeld Jensen ---- - src/3rdparty/chromium/ui/gfx/x/connection.cc | 2 +- - src/3rdparty/chromium/ui/gfx/x/connection.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/3rdparty/chromium/ui/gfx/x/connection.cc b/src/3rdparty/chromium/ui/gfx/x/connection.cc -index 0afbac2c605..8152f4e06be 100644 ---- a/src/3rdparty/chromium/ui/gfx/x/connection.cc -+++ b/src/3rdparty/chromium/ui/gfx/x/connection.cc -@@ -423,7 +423,7 @@ Event Connection::WaitForNextEvent() { - return Event(); - } - --bool Connection::HasPendingResponses() const { -+bool Connection::HasPendingResponses() { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - return HasNextEvent() || HasNextResponse(); - } -diff --git a/src/3rdparty/chromium/ui/gfx/x/connection.h b/src/3rdparty/chromium/ui/gfx/x/connection.h -index 73a306a2ca1..0e3bbb66e53 100644 ---- a/src/3rdparty/chromium/ui/gfx/x/connection.h -+++ b/src/3rdparty/chromium/ui/gfx/x/connection.h -@@ -124,7 +124,7 @@ class COMPONENT_EXPORT(X11) Connection : public XProto, - Event WaitForNextEvent(); - - // Are there any events, errors, or replies already buffered? -- bool HasPendingResponses() const; -+ bool HasPendingResponses(); - - // Dispatch any buffered events, errors, or replies. - void Dispatch(Delegate* delegate); diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-chromium-87-v8-icu68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch similarity index 100% rename from dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-chromium-87-v8-icu68.patch rename to dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-disable-git.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch similarity index 100% rename from dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-disable-git.patch rename to dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml index 4c0b395c7e0..ea633503ac7 100644 --- a/dev-qt/qtwebengine/metadata.xml +++ b/dev-qt/qtwebengine/metadata.xml @@ -15,6 +15,7 @@ dev-qt/designer forms that display web pages. Enable physical position determination via dev-qt/qtpositioning + Combine source files to speed up build process. Use the system-wide media-video/ffmpeg instead of bundled. Use the system-wide dev-libs/icu diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210220.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild similarity index 95% rename from dev-qt/qtwebengine/qtwebengine-5.15.2_p20210220.ebuild rename to dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild index ff0e14bee9e..5271d30d4ae 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210220.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild @@ -10,7 +10,7 @@ inherit multiprocessing python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" if [[ ${QT5_BUILD_TYPE} == release ]]; then -# KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" if [[ ${PV} == ${QTVER}_p* ]]; then SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" S="${WORKDIR}/${P}" @@ -20,7 +20,7 @@ fi # patchset based on https://github.com/chromium-ppc64le releases SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )" -IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -90,7 +90,6 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446 "${FILESDIR}/${P}-chromium-87-v8-icu68.patch" # bug 757606 - "${FILESDIR}/${P}-fixup-CVE-2021-21149-backport.patch" "${FILESDIR}/${P}-disable-git.patch" # downstream snapshot fix ) @@ -104,11 +103,11 @@ src_prepare() { sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die fi - # QTBUG-88657 - jumbo-build is broken - #if ! use jumbo-build; then + # QTBUG-88657 - jumbo-build could still make trouble + if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ src/buildtools/config/common.pri || die - #fi + fi # bug 630834 - pass appropriate options to ninja when building GN sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \