1 |
commit: fd6fb46a681e8d3a3628fb13c92d459a022e1acd |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 19 13:35:18 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 19 13:41:47 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd6fb46a |
7 |
|
8 |
dev-qt/qtwebengine: Drop vulnerable 5.15.2_p20210625 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/810781 |
11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
dev-qt/qtwebengine/Manifest | 1 - |
15 |
...qtwebengine-5.15.0-disable-fatal-warnings.patch | 10 - |
16 |
.../qtwebengine-5.15.2_p20210625.ebuild | 224 --------------------- |
17 |
3 files changed, 235 deletions(-) |
18 |
|
19 |
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest |
20 |
index c4c1b9d408f..b4883d999d5 100644 |
21 |
--- a/dev-qt/qtwebengine/Manifest |
22 |
+++ b/dev-qt/qtwebengine/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654 |
25 |
-DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1 |
26 |
DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6 |
27 |
|
28 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch |
29 |
deleted file mode 100644 |
30 |
index af602855b12..00000000000 |
31 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch |
32 |
+++ /dev/null |
33 |
@@ -1,10 +0,0 @@ |
34 |
---- a/src/buildtools/config/common.pri 2020-02-28 22:21:09.341072620 +0200 |
35 |
-+++ b/src/buildtools/config/common.pri 2020-02-28 22:20:26.702399180 +0200 |
36 |
-@@ -25,6 +25,7 @@ |
37 |
- strip_absolute_paths_from_debug_symbols=false \ |
38 |
- toolkit_views=false \ |
39 |
- treat_warnings_as_errors=false \ |
40 |
-+ fatal_linker_warnings=false \ |
41 |
- use_allocator_shim=false \ |
42 |
- use_allocator=\"none\" \ |
43 |
- use_custom_libcxx=false \ |
44 |
|
45 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild |
46 |
deleted file mode 100644 |
47 |
index 3b18dfa1b72..00000000000 |
48 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild |
49 |
+++ /dev/null |
50 |
@@ -1,224 +0,0 @@ |
51 |
-# Copyright 1999-2021 Gentoo Authors |
52 |
-# Distributed under the terms of the GNU General Public License v2 |
53 |
- |
54 |
-EAPI=7 |
55 |
- |
56 |
-PYTHON_COMPAT=( python2_7 ) |
57 |
-QTVER=$(ver_cut 1-3) |
58 |
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build |
59 |
- |
60 |
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
61 |
-HOMEPAGE="https://www.qt.io/" |
62 |
- |
63 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
64 |
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" |
65 |
- if [[ ${PV} == ${QTVER}_p* ]]; then |
66 |
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" |
67 |
- S="${WORKDIR}/${P}" |
68 |
- QT5_BUILD_DIR="${S}_build" |
69 |
- fi |
70 |
-else |
71 |
- EGIT_BRANCH="5.15" |
72 |
- EGIT_REPO_URI=( |
73 |
- "https://code.qt.io/qt/${QT5_MODULE}.git" |
74 |
- "https://github.com/qt/${QT5_MODULE}.git" |
75 |
- ) |
76 |
- inherit git-r3 |
77 |
-fi |
78 |
- |
79 |
-# patchset based on https://github.com/chromium-ppc64le releases |
80 |
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )" |
81 |
- |
82 |
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" |
83 |
-REQUIRED_USE="designer? ( widgets )" |
84 |
- |
85 |
-RDEPEND=" |
86 |
- app-arch/snappy:= |
87 |
- dev-libs/glib:2 |
88 |
- dev-libs/nspr |
89 |
- dev-libs/nss |
90 |
- dev-libs/expat |
91 |
- dev-libs/libevent:= |
92 |
- dev-libs/libxml2[icu] |
93 |
- dev-libs/libxslt |
94 |
- dev-libs/re2:= |
95 |
- ~dev-qt/qtcore-${QTVER} |
96 |
- ~dev-qt/qtdeclarative-${QTVER} |
97 |
- ~dev-qt/qtgui-${QTVER} |
98 |
- ~dev-qt/qtnetwork-${QTVER} |
99 |
- ~dev-qt/qtprintsupport-${QTVER} |
100 |
- ~dev-qt/qtwebchannel-${QTVER}[qml] |
101 |
- media-libs/fontconfig |
102 |
- media-libs/freetype |
103 |
- media-libs/harfbuzz:= |
104 |
- media-libs/lcms:2 |
105 |
- media-libs/libjpeg-turbo:= |
106 |
- media-libs/libpng:0= |
107 |
- >=media-libs/libvpx-1.5:=[svc(+)] |
108 |
- media-libs/libwebp:= |
109 |
- media-libs/mesa[egl,X(+)] |
110 |
- media-libs/opus |
111 |
- sys-apps/dbus |
112 |
- sys-apps/pciutils |
113 |
- sys-libs/zlib[minizip] |
114 |
- virtual/libudev |
115 |
- x11-libs/libdrm |
116 |
- x11-libs/libX11 |
117 |
- x11-libs/libXcomposite |
118 |
- x11-libs/libXcursor |
119 |
- x11-libs/libXdamage |
120 |
- x11-libs/libXext |
121 |
- x11-libs/libXfixes |
122 |
- x11-libs/libXi |
123 |
- x11-libs/libxkbfile |
124 |
- x11-libs/libXrandr |
125 |
- x11-libs/libXrender |
126 |
- x11-libs/libXScrnSaver |
127 |
- x11-libs/libXtst |
128 |
- alsa? ( media-libs/alsa-lib ) |
129 |
- designer? ( ~dev-qt/designer-${QTVER} ) |
130 |
- geolocation? ( ~dev-qt/qtpositioning-${QTVER} ) |
131 |
- kerberos? ( virtual/krb5 ) |
132 |
- pulseaudio? ( media-sound/pulseaudio:= ) |
133 |
- system-ffmpeg? ( media-video/ffmpeg:0= ) |
134 |
- system-icu? ( >=dev-libs/icu-69.1:= ) |
135 |
- widgets? ( |
136 |
- ~dev-qt/qtdeclarative-${QTVER}[widgets] |
137 |
- ~dev-qt/qtwidgets-${QTVER} |
138 |
- ) |
139 |
-" |
140 |
-DEPEND="${RDEPEND}" |
141 |
-BDEPEND="${PYTHON_DEPS} |
142 |
- dev-util/gperf |
143 |
- dev-util/ninja |
144 |
- dev-util/re2c |
145 |
- net-libs/nodejs[ssl] |
146 |
- sys-devel/bison |
147 |
- sys-devel/flex |
148 |
- ppc64? ( >=dev-util/gn-0.1807 ) |
149 |
-" |
150 |
- |
151 |
-PATCHES=( |
152 |
- "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446 |
153 |
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606 |
154 |
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix |
155 |
- "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989 |
156 |
- "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261 |
157 |
-) |
158 |
- |
159 |
-pkg_preinst() { |
160 |
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with" |
161 |
- elog "additional security fixes from newer versions. Extensive as it is, the" |
162 |
- elog "list of backports is impossible to evaluate, but always bound to be behind" |
163 |
- elog "Chromium's release schedule." |
164 |
- elog "In addition, various online services may deny service based on an outdated" |
165 |
- elog "user agent version (and/or other checks). Google is already known to do so." |
166 |
- elog |
167 |
- elog "tldr: Your web browsing experience will be compromised." |
168 |
-} |
169 |
- |
170 |
-src_unpack() { |
171 |
- # bug 307861 |
172 |
- eshopts_push -s extglob |
173 |
- if is-flagq '-g?(gdb)?([1-9])'; then |
174 |
- ewarn |
175 |
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." |
176 |
- ewarn "You may experience really long compilation times and/or increased memory usage." |
177 |
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." |
178 |
- ewarn |
179 |
- fi |
180 |
- eshopts_pop |
181 |
- |
182 |
- case ${QT5_BUILD_TYPE} in |
183 |
- live) git-r3_src_unpack ;& |
184 |
- release) default ;; |
185 |
- esac |
186 |
-} |
187 |
- |
188 |
-src_prepare() { |
189 |
- if [[ ${PV} == ${QTVER}_p* ]]; then |
190 |
- # This is made from git, and for some reason will fail w/o .git directories. |
191 |
- mkdir -p .git src/3rdparty/chromium/.git || die |
192 |
- |
193 |
- # We need to make sure this integrates well into Qt 5.15.2 installation. |
194 |
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. |
195 |
- sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die |
196 |
- fi |
197 |
- |
198 |
- # QTBUG-88657 - jumbo-build could still make trouble |
199 |
- if ! use jumbo-build; then |
200 |
- sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
201 |
- src/buildtools/config/common.pri || die |
202 |
- fi |
203 |
- |
204 |
- # bug 620444 - ensure local headers are used |
205 |
- find "${S}" -type f -name "*.pr[fio]" | \ |
206 |
- xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die |
207 |
- |
208 |
- if use system-icu; then |
209 |
- # Sanity check to ensure that bundled copy of ICU is not used. |
210 |
- # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because |
211 |
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. |
212 |
- # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in |
213 |
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in |
214 |
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated. |
215 |
- local file |
216 |
- while read file; do |
217 |
- echo "#error This file should not be used!" > "${file}" || die |
218 |
- done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) |
219 |
- fi |
220 |
- |
221 |
- qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri |
222 |
- qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri |
223 |
- |
224 |
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro |
225 |
- |
226 |
- qt_use_disable_mod widgets widgets src/src.pro |
227 |
- |
228 |
- qt5-build_src_prepare |
229 |
- |
230 |
- # we need to generate ppc64 stuff because upstream does not ship it yet |
231 |
- if use ppc64; then |
232 |
- einfo "Patching for ppc64le and generating build files" |
233 |
- eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" |
234 |
- pushd src/3rdparty/chromium > /dev/null || die |
235 |
- eapply -p0 "${WORKDIR}/${PN}-ppc64le" |
236 |
- popd > /dev/null || die |
237 |
- pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die |
238 |
- mkdir -vp source/config/linux/ppc64 || die |
239 |
- mkdir -p source/libvpx/test || die |
240 |
- touch source/libvpx/test/test.mk || die |
241 |
- ./generate_gni.sh || die |
242 |
- popd >/dev/null || die |
243 |
- fi |
244 |
-} |
245 |
- |
246 |
-src_configure() { |
247 |
- export NINJA_PATH=/usr/bin/ninja |
248 |
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" |
249 |
- |
250 |
- local myqmakeargs=( |
251 |
- -- |
252 |
- -no-build-qtpdf |
253 |
- -printing-and-pdf |
254 |
- -system-opus |
255 |
- -system-webp |
256 |
- $(usex alsa '-alsa' '-no-alsa') |
257 |
- $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs') |
258 |
- $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation') |
259 |
- $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos') |
260 |
- $(usex pulseaudio '-pulseaudio' '-no-pulseaudio') |
261 |
- $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg') |
262 |
- $(usex system-icu '-webengine-icu' '-no-webengine-icu') |
263 |
- ) |
264 |
- qt5-build_src_configure |
265 |
-} |
266 |
- |
267 |
-src_install() { |
268 |
- qt5-build_src_install |
269 |
- |
270 |
- # bug 601472 |
271 |
- if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then |
272 |
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" |
273 |
- fi |
274 |
-} |