Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
Date: Fri, 26 Feb 2021 21:19:40
Message-Id: 1614374363.b17a3763239b411e863259e928b496bea2b9d051.asturm@gentoo
1 commit: b17a3763239b411e863259e928b496bea2b9d051
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 26 13:35:44 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 26 21:19:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17a3763
7
8 dev-qt/qtwebengine: 5.15.2_p20210224 bump
9
10 Snapshotted at:
11 Branch: 5.15
12 Commit: 0b5f110234256eabaa264189d9117069f2a2d144
13
14 Submodule qtwebengine-chromium.git:
15 Branch: 87-based
16 Commit: 0eea95b24a9ed61c185adeeb787fb5b62e8f4537
17
18 V8-ICU-68 runtime fix:
19 Thanks-to: Stephan Hartmann <sultan <AT> gentoo.org>
20
21 Bug: https://bugs.gentoo.org/773040
22 Package-Manager: Portage-3.0.15, Repoman-3.0.2
23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
24
25 dev-qt/qtwebengine/Manifest | 2 +-
26 ...2_p20210220-fixup-CVE-2021-21149-backport.patch | 42 ----------------------
27 ...ne-5.15.2_p20210224-chromium-87-v8-icu68.patch} | 0
28 ...qtwebengine-5.15.2_p20210224-disable-git.patch} | 0
29 dev-qt/qtwebengine/metadata.xml | 1 +
30 ....ebuild => qtwebengine-5.15.2_p20210224.ebuild} | 11 +++---
31 6 files changed, 7 insertions(+), 49 deletions(-)
32
33 diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
34 index ac12b6baffd..56dc6ae1cdc 100644
35 --- a/dev-qt/qtwebengine/Manifest
36 +++ b/dev-qt/qtwebengine/Manifest
37 @@ -1,4 +1,4 @@
38 DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
39 DIST qtwebengine-5.15.2_p20210205.tar.xz 317422912 BLAKE2B a5cdbea0347db21b7fb981a358ad6419ea9cebef98f3d8fef3618b9010164986257cb87caef6a09648e463c3b864ce28e0591a2a783b8b5727b69d85b4b3289c SHA512 8e8b4918f7c3232aafd9f2d13655501e0d03d90514ef3a0b8319df1c8792aeaf7800f370cee15634c708ee14f86ef831749556cb6710578d03c3c2e468149be0
40 -DIST qtwebengine-5.15.2_p20210220.tar.xz 320087924 BLAKE2B 8db495e853948d8a47d04d34e8f2e99f33423874026d447fd119be885c74671f6566f8ba34f6e37ed5abcc347150213bef9575cc61b80ee8fbc4a005c2448df8 SHA512 7502a3d7df68764d1ed8953f8bd8a6def88344c56800bf32d1527133bceaf669f2ef6899dd2b4f23ca284ad5f0a9b086f1807f3a5f0a482b0744d1ba2391c480
41 +DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84 SHA512 939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51
42 DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
43
44 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
45 deleted file mode 100644
46 index eeca3627d0b..00000000000
47 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-fixup-CVE-2021-21149-backport.patch
48 +++ /dev/null
49 @@ -1,42 +0,0 @@
50 -From d9d9e606cb34b1b4ac0f44de132b1eb10763f1f6 Mon Sep 17 00:00:00 2001
51 -From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@××.io>
52 -Date: Tue, 23 Feb 2021 16:34:39 +0100
53 -Subject: [PATCH] FIXUP: [Backport] CVE-2021-21149: Stack overflow in Data
54 - Transfer
55 -
56 -Const qualifier removed by another patch upstream had to be removed
57 -as well.
58 -
59 -Change-Id: I4823080661b815884c49ad9881e9958c1ba65251
60 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@××.io>
61 ----
62 - src/3rdparty/chromium/ui/gfx/x/connection.cc | 2 +-
63 - src/3rdparty/chromium/ui/gfx/x/connection.h | 2 +-
64 - 2 files changed, 2 insertions(+), 2 deletions(-)
65 -
66 -diff --git a/src/3rdparty/chromium/ui/gfx/x/connection.cc b/src/3rdparty/chromium/ui/gfx/x/connection.cc
67 -index 0afbac2c605..8152f4e06be 100644
68 ---- a/src/3rdparty/chromium/ui/gfx/x/connection.cc
69 -+++ b/src/3rdparty/chromium/ui/gfx/x/connection.cc
70 -@@ -423,7 +423,7 @@ Event Connection::WaitForNextEvent() {
71 - return Event();
72 - }
73 -
74 --bool Connection::HasPendingResponses() const {
75 -+bool Connection::HasPendingResponses() {
76 - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
77 - return HasNextEvent() || HasNextResponse();
78 - }
79 -diff --git a/src/3rdparty/chromium/ui/gfx/x/connection.h b/src/3rdparty/chromium/ui/gfx/x/connection.h
80 -index 73a306a2ca1..0e3bbb66e53 100644
81 ---- a/src/3rdparty/chromium/ui/gfx/x/connection.h
82 -+++ b/src/3rdparty/chromium/ui/gfx/x/connection.h
83 -@@ -124,7 +124,7 @@ class COMPONENT_EXPORT(X11) Connection : public XProto,
84 - Event WaitForNextEvent();
85 -
86 - // Are there any events, errors, or replies already buffered?
87 -- bool HasPendingResponses() const;
88 -+ bool HasPendingResponses();
89 -
90 - // Dispatch any buffered events, errors, or replies.
91 - void Dispatch(Delegate* delegate);
92
93 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
94 similarity index 100%
95 rename from dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-chromium-87-v8-icu68.patch
96 rename to dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
97
98 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
99 similarity index 100%
100 rename from dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210220-disable-git.patch
101 rename to dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch
102
103 diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
104 index 4c0b395c7e0..ea633503ac7 100644
105 --- a/dev-qt/qtwebengine/metadata.xml
106 +++ b/dev-qt/qtwebengine/metadata.xml
107 @@ -15,6 +15,7 @@
108 <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
109 <flag name="geolocation">Enable physical position determination
110 via <pkg>dev-qt/qtpositioning</pkg></flag>
111 + <flag name="jumbo-build">Combine source files to speed up build process.</flag>
112 <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
113 instead of bundled.</flag>
114 <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
115
116 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210220.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
117 similarity index 95%
118 rename from dev-qt/qtwebengine/qtwebengine-5.15.2_p20210220.ebuild
119 rename to dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
120 index ff0e14bee9e..5271d30d4ae 100644
121 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210220.ebuild
122 +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
123 @@ -10,7 +10,7 @@ inherit multiprocessing python-any-r1 qt5-build
124 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
125
126 if [[ ${QT5_BUILD_TYPE} == release ]]; then
127 -# KEYWORDS="~amd64 ~arm ~arm64 ~x86"
128 + KEYWORDS="~amd64 ~arm ~arm64 ~x86"
129 if [[ ${PV} == ${QTVER}_p* ]]; then
130 SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
131 S="${WORKDIR}/${P}"
132 @@ -20,7 +20,7 @@ fi
133 # patchset based on https://github.com/chromium-ppc64le releases
134 SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
135
136 -IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +system-icu widgets"
137 +IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
138 REQUIRED_USE="designer? ( widgets )"
139
140 RDEPEND="
141 @@ -90,7 +90,6 @@ DEPEND="${RDEPEND}
142 PATCHES=(
143 "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
144 "${FILESDIR}/${P}-chromium-87-v8-icu68.patch" # bug 757606
145 - "${FILESDIR}/${P}-fixup-CVE-2021-21149-backport.patch"
146 "${FILESDIR}/${P}-disable-git.patch" # downstream snapshot fix
147 )
148
149 @@ -104,11 +103,11 @@ src_prepare() {
150 sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
151 fi
152
153 - # QTBUG-88657 - jumbo-build is broken
154 - #if ! use jumbo-build; then
155 + # QTBUG-88657 - jumbo-build could still make trouble
156 + if ! use jumbo-build; then
157 sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
158 src/buildtools/config/common.pri || die
159 - #fi
160 + fi
161
162 # bug 630834 - pass appropriate options to ninja when building GN
163 sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \