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/
Date: Sun, 07 Feb 2021 13:43:01
Message-Id: 1612705360.09ed381b5b2c292770b089b410afa9fb1d770ec2.asturm@gentoo
1 commit: 09ed381b5b2c292770b089b410afa9fb1d770ec2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 7 12:48:14 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 7 13:42:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ed381b
7
8 dev-qt/qtwebengine: 5.15.2_p20210205 snapshot bump
9
10 Snapshotted at:
11 Branch: 5.15
12 Commit: a4fce092cbd877560dd75b38a2e495aaa75f60f3
13
14 Submodule qtwebengine-chromium.git:
15 Branch: 87-based
16 Commit: 19c6bab869563fc97a5047eeea6eed7992458af8
17 Package-Manager: Portage-3.0.14, Repoman-3.0.2
18 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
19
20 dev-qt/qtwebengine/Manifest | 1 +
21 .../qtwebengine-5.15.2_p20210205.ebuild | 183 +++++++++++++++++++++
22 2 files changed, 184 insertions(+)
23
24 diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
25 index 80ac5d47606..928d6ee9870 100644
26 --- a/dev-qt/qtwebengine/Manifest
27 +++ b/dev-qt/qtwebengine/Manifest
28 @@ -1,3 +1,4 @@
29 DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
30 DIST qtwebengine-5.15.2_p20210126.tar.xz 316160016 BLAKE2B 8de7b37585a040673d200de3149bfb878cd3d6d71e5b5343960022b1ca111364b2d351b1ca4cf760d9de46d4b247f2a7638c5d217210ad3f1d416b703d70d4a9 SHA512 448ca09609150756c64b05dd48178445fda7eb935e8cfa4bb30a1cc520de50939e5e85c2b6a60cff40147849a7b19b48a15d1eb923aeca969779482060c44a77
31 +DIST qtwebengine-5.15.2_p20210205.tar.xz 317422912 BLAKE2B a5cdbea0347db21b7fb981a358ad6419ea9cebef98f3d8fef3618b9010164986257cb87caef6a09648e463c3b864ce28e0591a2a783b8b5727b69d85b4b3289c SHA512 8e8b4918f7c3232aafd9f2d13655501e0d03d90514ef3a0b8319df1c8792aeaf7800f370cee15634c708ee14f86ef831749556cb6710578d03c3c2e468149be0
32 DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
33
34 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
35 new file mode 100644
36 index 00000000000..e78bacb1133
37 --- /dev/null
38 +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
39 @@ -0,0 +1,183 @@
40 +# Copyright 1999-2021 Gentoo Authors
41 +# Distributed under the terms of the GNU General Public License v2
42 +
43 +EAPI=7
44 +
45 +PYTHON_COMPAT=( python2_7 )
46 +QTVER=$(ver_cut 1-3)
47 +inherit multiprocessing python-any-r1 qt5-build
48 +
49 +DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
50 +
51 +if [[ ${QT5_BUILD_TYPE} == release ]]; then
52 +# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
53 + if [[ ${PV} == ${QTVER}_p* ]]; then
54 + SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
55 + S="${WORKDIR}/${P}"
56 + fi
57 +fi
58 +
59 +# patchset based on https://github.com/chromium-ppc64le releases
60 +SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
61 +
62 +IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +system-icu widgets"
63 +REQUIRED_USE="designer? ( widgets )"
64 +
65 +RDEPEND="
66 + app-arch/snappy:=
67 + dev-libs/glib:2
68 + dev-libs/nspr
69 + dev-libs/nss
70 + dev-libs/expat
71 + dev-libs/libevent:=
72 + dev-libs/libxml2[icu]
73 + dev-libs/libxslt
74 + dev-libs/re2:=
75 + ~dev-qt/qtcore-${QTVER}
76 + ~dev-qt/qtdeclarative-${QTVER}
77 + ~dev-qt/qtgui-${QTVER}
78 + ~dev-qt/qtnetwork-${QTVER}
79 + ~dev-qt/qtprintsupport-${QTVER}
80 + ~dev-qt/qtwebchannel-${QTVER}[qml]
81 + media-libs/fontconfig
82 + media-libs/freetype
83 + media-libs/harfbuzz:=
84 + media-libs/lcms:2
85 + media-libs/libjpeg-turbo:=
86 + media-libs/libpng:0=
87 + >=media-libs/libvpx-1.5:=[svc(+)]
88 + media-libs/libwebp:=
89 + media-libs/mesa[egl,X(+)]
90 + media-libs/opus
91 + sys-apps/dbus
92 + sys-apps/pciutils
93 + sys-libs/zlib[minizip]
94 + virtual/libudev
95 + x11-libs/libdrm
96 + x11-libs/libX11
97 + x11-libs/libXcomposite
98 + x11-libs/libXcursor
99 + x11-libs/libXdamage
100 + x11-libs/libXext
101 + x11-libs/libXfixes
102 + x11-libs/libXi
103 + x11-libs/libXrandr
104 + x11-libs/libXrender
105 + x11-libs/libXScrnSaver
106 + x11-libs/libXtst
107 + alsa? ( media-libs/alsa-lib )
108 + designer? ( ~dev-qt/designer-${QTVER} )
109 + geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
110 + kerberos? ( virtual/krb5 )
111 + pulseaudio? ( media-sound/pulseaudio:= )
112 + system-ffmpeg? ( media-video/ffmpeg:0= )
113 + system-icu? ( >=dev-libs/icu-60.2:= )
114 + widgets? (
115 + ~dev-qt/qtdeclarative-${QTVER}[widgets]
116 + ~dev-qt/qtwidgets-${QTVER}
117 + )
118 +"
119 +DEPEND="${RDEPEND}
120 + ${PYTHON_DEPS}
121 + >=app-arch/gzip-1.7
122 + dev-util/gperf
123 + dev-util/ninja
124 + dev-util/re2c
125 + net-libs/nodejs
126 + sys-devel/bison
127 +"
128 +
129 +PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
130 +
131 +src_prepare() {
132 + if [[ ${PV} == ${QTVER}_p* ]]; then
133 + # This is made from git, and for some reason will fail w/o .git directories.
134 + mkdir -p .git src/3rdparty/chromium/.git || die
135 +
136 + # We need to make sure this integrates well into Qt 5.15.2 installation.
137 + # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
138 + sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
139 + fi
140 +
141 + # QTBUG-88657 - jumbo-build is broken
142 + #if ! use jumbo-build; then
143 + sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
144 + src/buildtools/config/common.pri || die
145 + #fi
146 +
147 + # bug 630834 - pass appropriate options to ninja when building GN
148 + sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
149 + -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
150 +
151 + # bug 620444 - ensure local headers are used
152 + find "${S}" -type f -name "*.pr[fio]" | \
153 + xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
154 +
155 + if use system-icu; then
156 + # Sanity check to ensure that bundled copy of ICU is not used.
157 + # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
158 + # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
159 + # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
160 + # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
161 + # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
162 + local file
163 + while read file; do
164 + echo "#error This file should not be used!" > "${file}" || die
165 + done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
166 + fi
167 +
168 + qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
169 + qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
170 +
171 + qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
172 +
173 + qt_use_disable_mod widgets widgets src/src.pro
174 +
175 + qt5-build_src_prepare
176 +
177 + # we need to generate ppc64 stuff because upstream does not ship it yet
178 + if use ppc64; then
179 + einfo "Patching for ppc64le and generating build files"
180 + eapply "${WORKDIR}/${PN}-ppc64"
181 + pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
182 + mkdir -vp source/config/linux/ppc64 || die
183 + mkdir -p source/libvpx/test || die
184 + touch source/libvpx/test/test.mk || die
185 + # generate_gni.sh runs git at the end of process, prevent it.
186 + git() { : ; }
187 + export -f git
188 + ./generate_gni.sh || die
189 + unset git
190 + popd >/dev/null || die
191 + fi
192 +}
193 +
194 +src_configure() {
195 + export NINJA_PATH=/usr/bin/ninja
196 + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
197 +
198 + local myqmakeargs=(
199 + --
200 + -no-build-qtpdf
201 + -printing-and-pdf
202 + -system-opus
203 + -system-webp
204 + $(usex alsa '-alsa' '-no-alsa')
205 + $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
206 + $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
207 + $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
208 + $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
209 + $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
210 + $(usex system-icu '-webengine-icu' '-no-webengine-icu')
211 + )
212 + qt5-build_src_configure
213 +}
214 +
215 +src_install() {
216 + qt5-build_src_install
217 +
218 + # bug 601472
219 + if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
220 + die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
221 + fi
222 +}