1 |
commit: ee1fce21c9395edf6cbbf8b0a8afab36c15f816d |
2 |
Author: Han Gao <rabenda.cn <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Aug 10 06:42:39 2022 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 18 07:49:31 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=ee1fce21 |
7 |
|
8 |
dev-qt/qtwebengine: add riscv support |
9 |
|
10 |
Closes: https://github.com/gentoo/riscv/pull/7 |
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 |
dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild | 9 ++++++--- |
16 |
2 files changed, 7 insertions(+), 3 deletions(-) |
17 |
|
18 |
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest |
19 |
index 282326e..b74ebef 100644 |
20 |
--- a/dev-qt/qtwebengine/Manifest |
21 |
+++ b/dev-qt/qtwebengine/Manifest |
22 |
@@ -1,4 +1,5 @@ |
23 |
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e |
24 |
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89 |
25 |
+DIST qtwebengine-5.15.3-riscv-0.tar.xz 189688 BLAKE2B 987b09aa79d1bb425e23a9d4573d46dc1f470b7abf169a446317b68b42a131fa9fb3f1839d0589858a91949759ec1909b0488deeb40863a362fd28307c7b5bb0 SHA512 1e6aaa13118eaba839e82482f30ba14843bcd67bc4c42a38bf09e1f89bb53175dedcf74ddbd68ea9821dc36645f23de3e63211de2a82962ae6ada49f520bc4f6 |
26 |
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840 |
27 |
DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944 |
28 |
|
29 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild |
30 |
index b1d2486..240159b 100644 |
31 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild |
32 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild |
33 |
@@ -11,7 +11,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic |
34 |
HOMEPAGE="https://www.qt.io/" |
35 |
|
36 |
if [[ ${QT5_BUILD_TYPE} == release ]]; then |
37 |
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" |
38 |
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" |
39 |
if [[ ${PV} == ${QT5_PV}_p* ]]; then |
40 |
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" |
41 |
S="${WORKDIR}/${P}" |
42 |
@@ -29,7 +29,8 @@ fi |
43 |
# ppc64 patchset based on https://github.com/chromium-ppc64le releases |
44 |
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2 |
45 |
https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz |
46 |
- ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )" |
47 |
+ ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz ) |
48 |
+ riscv? ( https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-5.15.3-riscv-0.tar.xz )" |
49 |
|
50 |
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets" |
51 |
REQUIRED_USE="designer? ( widgets )" |
52 |
@@ -113,6 +114,8 @@ PATCHES=( |
53 |
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957 |
54 |
"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3 |
55 |
"${FILESDIR}/${P}-fixup-CVE-2022-0796.patch" # bug 853097 |
56 |
+ "${WORKDIR}/${PN}-5.15.3-riscv-general.patch" |
57 |
+ "${WORKDIR}/${PN}-5.15.3-riscv-v8.patch" |
58 |
) |
59 |
|
60 |
qtwebengine_check-reqs() { |
61 |
@@ -132,7 +135,7 @@ qtwebengine_check-reqs() { |
62 |
# Estimate the amount of RAM required |
63 |
# Multiplier is *10 because Bash doesn't do floating point maths. |
64 |
# Let's crudely assume ~2GB per compiler job for GCC. |
65 |
- local multiplier=20 |
66 |
+ local multiplier=8 |
67 |
|
68 |
# And call it ~1.5GB for Clang. |
69 |
if tc-is-clang ; then |