1 |
commit: 74c82e6fb38650a3ef7c533a7668a31a71d39c23 |
2 |
Author: Han Gao <rabenda.cn <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Apr 25 21:04:57 2022 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 26 06:56:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=74c82e6f |
7 |
|
8 |
dev-qt/qtwebengine: drop old version |
9 |
|
10 |
Closes: https://github.com/gentoo/riscv/pull/4 |
11 |
Signed-off-by: Han Gao <rabenda.cn <AT> gmail.com> |
12 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
13 |
|
14 |
dev-qt/qtwebengine/Manifest | 1 - |
15 |
...ngine-5.15.2_p20211210-sandbox-glibc-2.34.patch | 27 --- |
16 |
.../qtwebengine-5.15.3_p20220310.ebuild | 268 --------------------- |
17 |
3 files changed, 296 deletions(-) |
18 |
|
19 |
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest |
20 |
index dc9b5d7..ca85627 100644 |
21 |
--- a/dev-qt/qtwebengine/Manifest |
22 |
+++ b/dev-qt/qtwebengine/Manifest |
23 |
@@ -1,6 +1,5 @@ |
24 |
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e |
25 |
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89 |
26 |
DIST qtwebengine-5.15.3-riscv-0.tar.xz 189688 BLAKE2B 987b09aa79d1bb425e23a9d4573d46dc1f470b7abf169a446317b68b42a131fa9fb3f1839d0589858a91949759ec1909b0488deeb40863a362fd28307c7b5bb0 SHA512 1e6aaa13118eaba839e82482f30ba14843bcd67bc4c42a38bf09e1f89bb53175dedcf74ddbd68ea9821dc36645f23de3e63211de2a82962ae6ada49f520bc4f6 |
27 |
-DIST qtwebengine-5.15.3_p20220310.tar.xz 319290976 BLAKE2B 0a0e74e7d94e59d81687ceb4d791034d43daaeef887894acedc2d2568a8c74e4b7303440518d377c16de21a546e2609fdd89ab64c0664c230df4657cec9d399c SHA512 e57c7c51d0f27d116d2dc80043cb563a1dbce2357221ba87ae3c3b0e8c781e3ef09f69b8f6f20fcb7d85d596ae312b2f85ebc35ba7ee283ab30caa8f796fe2d6 |
28 |
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840 |
29 |
DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8 SHA512 80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6 |
30 |
|
31 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch |
32 |
deleted file mode 100644 |
33 |
index aac512a..0000000 |
34 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch |
35 |
+++ /dev/null |
36 |
@@ -1,27 +0,0 @@ |
37 |
-Patch taken from www-client/chromium: |
38 |
-https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-glibc-2.34.patch |
39 |
- |
40 |
-Dropped parts already upstream. |
41 |
- |
42 |
-diff --git a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc |
43 |
-index ca6b595..1c1ee42 100644 |
44 |
---- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc |
45 |
-+++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc |
46 |
-@@ -11,6 +11,7 @@ |
47 |
- #include <stddef.h> |
48 |
- #include <stdint.h> |
49 |
- #include <stdio.h> |
50 |
-+#include <string.h> |
51 |
- #include <sys/syscall.h> |
52 |
- #include <sys/types.h> |
53 |
- #include <sys/wait.h> |
54 |
-@@ -100,7 +101,8 @@ bool ChrootToSafeEmptyDir() { |
55 |
- // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f. |
56 |
- clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS; |
57 |
- |
58 |
-- char tls_buf[PTHREAD_STACK_MIN] = {0}; |
59 |
-+ char tls_buf[PTHREAD_STACK_MIN]; |
60 |
-+ memset(tls_buf, 0, PTHREAD_STACK_MIN); |
61 |
- tls = tls_buf; |
62 |
- #endif |
63 |
- |
64 |
|
65 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220310.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220310.ebuild |
66 |
deleted file mode 100644 |
67 |
index 507c247..0000000 |
68 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220310.ebuild |
69 |
+++ /dev/null |
70 |
@@ -1,268 +0,0 @@ |
71 |
-# Copyright 1999-2022 Gentoo Authors |
72 |
-# Distributed under the terms of the GNU General Public License v2 |
73 |
- |
74 |
-EAPI=8 |
75 |
- |
76 |
-PYTHON_COMPAT=( python2_7 ) |
77 |
-PYTHON_REQ_USE="xml(+)" |
78 |
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs |
79 |
- |
80 |
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
81 |
-HOMEPAGE="https://www.qt.io/" |
82 |
- |
83 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
84 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
85 |
- if [[ ${PV} == ${QT5_PV}_p* ]]; then |
86 |
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" |
87 |
- S="${WORKDIR}/${P}" |
88 |
- QT5_BUILD_DIR="${S}_build" |
89 |
- fi |
90 |
-else |
91 |
- EGIT_BRANCH="5.15" |
92 |
- EGIT_REPO_URI=( |
93 |
- "https://code.qt.io/qt/${QT5_MODULE}.git" |
94 |
- "https://github.com/qt/${QT5_MODULE}.git" |
95 |
- ) |
96 |
- inherit git-r3 |
97 |
-fi |
98 |
- |
99 |
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases |
100 |
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2 |
101 |
- https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-5.15.3-riscv-0.tar.xz |
102 |
- ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )" |
103 |
- |
104 |
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" |
105 |
-REQUIRED_USE="designer? ( widgets )" |
106 |
- |
107 |
-RDEPEND=" |
108 |
- app-arch/snappy:= |
109 |
- dev-libs/glib:2 |
110 |
- dev-libs/nspr |
111 |
- dev-libs/nss |
112 |
- dev-libs/expat |
113 |
- dev-libs/libevent:= |
114 |
- dev-libs/libxml2[icu] |
115 |
- dev-libs/libxslt |
116 |
- dev-libs/re2:= |
117 |
- =dev-qt/qtcore-${QT5_PV}* |
118 |
- =dev-qt/qtdeclarative-${QT5_PV}* |
119 |
- =dev-qt/qtgui-${QT5_PV}* |
120 |
- =dev-qt/qtnetwork-${QT5_PV}* |
121 |
- =dev-qt/qtprintsupport-${QT5_PV}* |
122 |
- =dev-qt/qtwebchannel-${QT5_PV}*[qml] |
123 |
- media-libs/fontconfig |
124 |
- media-libs/freetype |
125 |
- media-libs/harfbuzz:= |
126 |
- media-libs/lcms:2 |
127 |
- media-libs/libjpeg-turbo:= |
128 |
- media-libs/libpng:0= |
129 |
- >=media-libs/libvpx-1.5:=[svc(+)] |
130 |
- media-libs/libwebp:= |
131 |
- media-libs/opus |
132 |
- sys-apps/dbus |
133 |
- sys-apps/pciutils |
134 |
- sys-libs/zlib[minizip] |
135 |
- virtual/libudev |
136 |
- x11-libs/libdrm |
137 |
- x11-libs/libX11 |
138 |
- x11-libs/libXcomposite |
139 |
- x11-libs/libXcursor |
140 |
- x11-libs/libXdamage |
141 |
- x11-libs/libXext |
142 |
- x11-libs/libXfixes |
143 |
- x11-libs/libXi |
144 |
- x11-libs/libxkbfile |
145 |
- x11-libs/libXrandr |
146 |
- x11-libs/libXrender |
147 |
- x11-libs/libXScrnSaver |
148 |
- x11-libs/libXtst |
149 |
- alsa? ( media-libs/alsa-lib ) |
150 |
- designer? ( =dev-qt/designer-${QT5_PV}* ) |
151 |
- geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* ) |
152 |
- kerberos? ( virtual/krb5 ) |
153 |
- pulseaudio? ( media-sound/pulseaudio:= ) |
154 |
- system-ffmpeg? ( media-video/ffmpeg:0= ) |
155 |
- system-icu? ( >=dev-libs/icu-69.1:= ) |
156 |
- widgets? ( |
157 |
- =dev-qt/qtdeclarative-${QT5_PV}*[widgets] |
158 |
- =dev-qt/qtwidgets-${QT5_PV}* |
159 |
- ) |
160 |
-" |
161 |
-DEPEND="${RDEPEND} |
162 |
- media-libs/libglvnd |
163 |
-" |
164 |
-BDEPEND="${PYTHON_DEPS} |
165 |
- dev-util/gperf |
166 |
- dev-util/ninja |
167 |
- dev-util/re2c |
168 |
- net-libs/nodejs[ssl] |
169 |
- sys-devel/bison |
170 |
- sys-devel/flex |
171 |
- ppc64? ( >=dev-util/gn-0.1807 ) |
172 |
-" |
173 |
- |
174 |
-PATCHES=( |
175 |
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446 |
176 |
- "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186 |
177 |
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606 |
178 |
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix |
179 |
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746 |
180 |
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957 |
181 |
- "${WORKDIR}/${PN}-5.15.3-riscv-general.patch" |
182 |
- "${WORKDIR}/${PN}-5.15.3-riscv-v8.patch" |
183 |
-) |
184 |
- |
185 |
-qtwebengine_check-reqs() { |
186 |
- # bug #307861 |
187 |
- eshopts_push -s extglob |
188 |
- if is-flagq '-g?(gdb)?([1-9])'; then |
189 |
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." |
190 |
- ewarn "You may experience really long compilation times and/or increased memory usage." |
191 |
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." |
192 |
- fi |
193 |
- eshopts_pop |
194 |
- |
195 |
- [[ ${MERGE_TYPE} == binary ]] && return |
196 |
- |
197 |
- # (check-reqs added for bug #570534) |
198 |
- # |
199 |
- # Estimate the amount of RAM required |
200 |
- # Multiplier is *10 because Bash doesn't do floating point maths. |
201 |
- # Let's crudely assume ~2GB per compiler job for GCC. |
202 |
- local multiplier=8 |
203 |
- |
204 |
- # And call it ~1.5GB for Clang. |
205 |
- if tc-is-clang ; then |
206 |
- multiplier=15 |
207 |
- fi |
208 |
- |
209 |
- local CHECKREQS_DISK_BUILD="7G" |
210 |
- local CHECKREQS_DISK_USR="150M" |
211 |
- if ! has "distcc" ${FEATURES} ; then |
212 |
- # bug #830661 |
213 |
- # Not super realistic to come up with good estimates for distcc right now |
214 |
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G |
215 |
- fi |
216 |
- |
217 |
- check-reqs_${EBUILD_PHASE_FUNC} |
218 |
-} |
219 |
- |
220 |
-pkg_pretend() { |
221 |
- qtwebengine_check-reqs |
222 |
-} |
223 |
- |
224 |
-pkg_setup() { |
225 |
- qtwebengine_check-reqs |
226 |
- python-any-r1_pkg_setup |
227 |
-} |
228 |
- |
229 |
-src_unpack() { |
230 |
- case ${QT5_BUILD_TYPE} in |
231 |
- live) git-r3_src_unpack ;& |
232 |
- release) default ;; |
233 |
- esac |
234 |
-} |
235 |
- |
236 |
-src_prepare() { |
237 |
- if [[ ${PV} == ${QT5_PV}_p* ]]; then |
238 |
- # This is made from git, and for some reason will fail w/o .git directories. |
239 |
- mkdir -p .git src/3rdparty/chromium/.git || die |
240 |
- fi |
241 |
- # We need to make sure this integrates well into Qt 5.15.2 installation. |
242 |
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. |
243 |
- # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions |
244 |
- sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die |
245 |
- |
246 |
- # QTBUG-88657 - jumbo-build could still make trouble |
247 |
- if ! use jumbo-build; then |
248 |
- sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
249 |
- src/buildtools/config/common.pri || die |
250 |
- fi |
251 |
- |
252 |
- # bug 620444 - ensure local headers are used |
253 |
- find "${S}" -type f -name "*.pr[fio]" | \ |
254 |
- xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die |
255 |
- |
256 |
- if use system-icu; then |
257 |
- # Sanity check to ensure that bundled copy of ICU is not used. |
258 |
- # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because |
259 |
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. |
260 |
- # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in |
261 |
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in |
262 |
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated. |
263 |
- local file |
264 |
- while read file; do |
265 |
- echo "#error This file should not be used!" > "${file}" || die |
266 |
- done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) |
267 |
- fi |
268 |
- |
269 |
- # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++` |
270 |
- if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then |
271 |
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch" |
272 |
- fi |
273 |
- |
274 |
- qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri |
275 |
- qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri |
276 |
- |
277 |
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro |
278 |
- |
279 |
- qt_use_disable_mod widgets widgets src/src.pro |
280 |
- |
281 |
- qt5-build_src_prepare |
282 |
- |
283 |
- # we need to generate ppc64 stuff because upstream does not ship it yet |
284 |
- if use ppc64; then |
285 |
- einfo "Patching for ppc64le and generating build files" |
286 |
- eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" |
287 |
- pushd src/3rdparty/chromium > /dev/null || die |
288 |
- eapply -p0 "${WORKDIR}/${PN}-ppc64le" |
289 |
- popd > /dev/null || die |
290 |
- pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die |
291 |
- mkdir -vp source/config/linux/ppc64 || die |
292 |
- mkdir -p source/libvpx/test || die |
293 |
- touch source/libvpx/test/test.mk || die |
294 |
- ./generate_gni.sh || die |
295 |
- popd >/dev/null || die |
296 |
- fi |
297 |
-} |
298 |
- |
299 |
-src_configure() { |
300 |
- export NINJA_PATH=/usr/bin/ninja |
301 |
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" |
302 |
- |
303 |
- local myqmakeargs=( |
304 |
- -- |
305 |
- -no-build-qtpdf |
306 |
- -printing-and-pdf |
307 |
- -system-opus |
308 |
- -system-webp |
309 |
- $(qt_use alsa) |
310 |
- $(qt_use !bindist proprietary-codecs) |
311 |
- $(qt_use geolocation webengine-geolocation) |
312 |
- $(qt_use kerberos webengine-kerberos) |
313 |
- $(qt_use pulseaudio) |
314 |
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg) |
315 |
- $(qt_use system-icu webengine-icu) |
316 |
- ) |
317 |
- qt5-build_src_configure |
318 |
-} |
319 |
- |
320 |
-src_install() { |
321 |
- qt5-build_src_install |
322 |
- |
323 |
- # bug 601472 |
324 |
- if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then |
325 |
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" |
326 |
- fi |
327 |
-} |
328 |
- |
329 |
-pkg_preinst() { |
330 |
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with" |
331 |
- elog "additional security fixes from newer versions. Extensive as it is, the" |
332 |
- elog "list of backports is impossible to evaluate, but always bound to be behind" |
333 |
- elog "Chromium's release schedule." |
334 |
- elog "In addition, various online services may deny service based on an outdated" |
335 |
- elog "user agent version (and/or other checks). Google is already known to do so." |
336 |
- elog |
337 |
- elog "tldr: Your web browsing experience will be compromised." |
338 |
-} |