Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
Date: Sat, 24 Sep 2022 17:03:25
Message-Id: 1664030570.cdca692129df164b25115ff25218bdaeb7cd8709.asturm@gentoo
1 commit: cdca692129df164b25115ff25218bdaeb7cd8709
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 24 14:42:50 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 24 14:42:50 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cdca6921
7
8 dev-qt/qtwebengine: drop 6.3.2
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 dev-qt/qtwebengine/Manifest | 1 -
13 dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild | 242 ----------------------------
14 2 files changed, 243 deletions(-)
15
16 diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
17 index 8d6b7341..d169e66b 100644
18 --- a/dev-qt/qtwebengine/Manifest
19 +++ b/dev-qt/qtwebengine/Manifest
20 @@ -1,4 +1,3 @@
21 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
22 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
23 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
24 -DIST qtwebengine-everywhere-src-6.3.2.tar.xz 398294888 BLAKE2B 7fb59e9c0a09e4ffc2c59398e9249cb91c864168b81befa9ea7e2044ed328bc010f0e6d03ecfc74e006044b56c826b35dba05375aba6fee29e5d5aa08b33fa4c SHA512 deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a
25
26 diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
27 deleted file mode 100644
28 index 2ce46d9a..00000000
29 --- a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
30 +++ /dev/null
31 @@ -1,242 +0,0 @@
32 -# Copyright 2021-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=8
36 -
37 -PYTHON_COMPAT=( python3_{9,10} )
38 -PYTHON_REQ_USE="xml(+)"
39 -CHROMIUM_VER="94.0.4606.126"
40 -CHROMIUM_PATCHES_VER="104.0.5112.81"
41 -
42 -inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
43 -
44 -DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
45 -
46 -if [[ ${QT6_BUILD_TYPE} == release ]]; then
47 - KEYWORDS="~amd64"
48 -fi
49 -
50 -IUSE="
51 - alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
52 - +system-ffmpeg +system-icu widgets
53 -"
54 -REQUIRED_USE="designer? ( widgets )"
55 -
56 -BDEPEND="
57 - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
58 - dev-util/gperf
59 - dev-util/ninja
60 - dev-util/re2c
61 - net-libs/nodejs[ssl]
62 - sys-devel/bison
63 - sys-devel/flex
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/qtdeclarative-${PV}*
76 - =dev-qt/qtwebchannel-${PV}*
77 - media-libs/fontconfig
78 - media-libs/freetype
79 - media-libs/harfbuzz:=
80 - media-libs/lcms:2
81 - media-libs/libjpeg-turbo:=
82 - media-libs/libpng:=
83 - >=media-libs/libvpx-1.5:=[svc(+)]
84 - media-libs/libwebp:=
85 - media-libs/opus
86 - sys-apps/dbus
87 - sys-apps/pciutils
88 - sys-libs/zlib[minizip]
89 - virtual/libudev
90 - x11-libs/libdrm
91 - x11-libs/libX11
92 - x11-libs/libXcomposite
93 - x11-libs/libXcursor
94 - x11-libs/libxcb:=
95 - x11-libs/libXdamage
96 - x11-libs/libXext
97 - x11-libs/libXfixes
98 - x11-libs/libXi
99 - x11-libs/libxkbcommon
100 - x11-libs/libxkbfile
101 - x11-libs/libXrandr
102 - x11-libs/libXrender
103 - x11-libs/libXScrnSaver
104 - x11-libs/libXtst
105 - alsa? ( media-libs/alsa-lib )
106 - geolocation? ( =dev-qt/qtpositioning-${PV}* )
107 - kerberos? ( virtual/krb5 )
108 - pulseaudio? ( media-libs/libpulse:= )
109 - screencast? ( media-video/pipewire:= )
110 - system-ffmpeg? ( media-video/ffmpeg:= )
111 - system-icu? ( >=dev-libs/icu-69.1:= )
112 - widgets? (
113 - =dev-qt/qtbase-${PV}*[widgets]
114 - )
115 -"
116 -DEPEND="${RDEPEND}
117 - media-libs/libglvnd
118 -"
119 -
120 -python_check_deps() {
121 - python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
122 -}
123 -
124 -qtwebengine_check-reqs() {
125 - # bug #307861
126 - eshopts_push -s extglob
127 - if is-flagq '-g?(gdb)?([1-9])'; then
128 - ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
129 - ewarn "You may experience really long compilation times and/or increased memory usage."
130 - ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
131 - fi
132 - eshopts_pop
133 -
134 - [[ ${MERGE_TYPE} == binary ]] && return
135 -
136 - # (check-reqs added for bug #570534)
137 - #
138 - # Estimate the amount of RAM required
139 - # Multiplier is *10 because Bash doesn't do floating point maths.
140 - # Let's crudely assume ~2GB per compiler job for GCC.
141 - local multiplier=20
142 -
143 - # And call it ~1.5GB for Clang.
144 - if tc-is-clang ; then
145 - multiplier=15
146 - fi
147 -
148 - local CHECKREQS_DISK_BUILD="7G"
149 - local CHECKREQS_DISK_USR="150M"
150 - if ! has "distcc" ${FEATURES} ; then
151 - # bug #830661
152 - # Not super realistic to come up with good estimates for distcc right now
153 - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
154 - fi
155 -
156 - check-reqs_${EBUILD_PHASE_FUNC}
157 -}
158 -
159 -pkg_pretend() {
160 - qtwebengine_check-reqs
161 -}
162 -
163 -pkg_setup() {
164 - qtwebengine_check-reqs
165 - python-any-r1_pkg_setup
166 -}
167 -
168 -pkg_preinst() {
169 - elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
170 - elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
171 - elog "list of backports is impossible to evaluate, but always bound to be behind"
172 - elog "Chromium's release schedule."
173 - elog "In addition, various online services may deny service based on an outdated"
174 - elog "user agent version (and/or other checks). Google is already known to do so."
175 - elog
176 - elog "tldr: Your web browsing experience will be compromised."
177 -}
178 -
179 -src_unpack() {
180 - # bug 307861
181 - eshopts_push -s extglob
182 - if is-flagq '-g?(gdb)?([1-9])'; then
183 - ewarn
184 - ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
185 - ewarn "You may experience really long compilation times and/or increased memory usage."
186 - ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
187 - ewarn
188 - fi
189 - eshopts_pop
190 -
191 - case ${QT6_BUILD_TYPE} in
192 - live) git-r3_src_unpack ;&
193 - release) default ;;
194 - esac
195 -}
196 -
197 -src_prepare() {
198 - # bug 620444 - ensure local headers are used
199 - find . -type f -name "*.pr[fio]" -exec \
200 - sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
201 -
202 - if use system-icu; then
203 - # Sanity check to ensure that bundled copy of ICU is not used.
204 - # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
205 - # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
206 - # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
207 - # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
208 - # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
209 - local file
210 - while read file; do
211 - echo "#error This file should not be used!" > "${file}" || die
212 - done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
213 - fi
214 -
215 - qt6-build_src_prepare
216 -}
217 -
218 -src_configure() {
219 - export NINJA_PATH="${BROOT}"/usr/bin/ninja
220 - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
221 -
222 - local mycmakeargs=(
223 - #-DQT_FEATURE_accessibility=off
224 - #-DQT_FEATURE_force_asserts=off
225 - #-DQT_FEATURE_opengl=off
226 - #-DQT_FEATURE_printer=off
227 - -DQT_FEATURE_qtpdf_build=off
228 - -DQT_FEATURE_qtpdf_quick_build=off
229 - -DQT_FEATURE_qtpdf_widgets_build=off
230 - -DQT_FEATURE_qtwebengine_build=on
231 - -DQT_FEATURE_qtwebengine_quick_build=on
232 - -DQT_FEATURE_qtwebengine_widgets_build=on
233 - #-DQT_FEATURE_ssl=off
234 - #-DQT_FEATURE_static=off
235 - #-DQT_FEATURE_system_zlib=off
236 - #-DQT_FEATURE_system_png=off
237 - #-DQT_FEATURE_system_jpeg=off
238 - #-DQT_FEATURE_system_freetype=off
239 - #-DQT_FEATURE_system_harfbuzz=off
240 - #-DQT_FEATURE_use_gold_linker=off
241 - #-DQT_FEATURE_use_lld_linker=off
242 - -DQT_FEATURE_webengine_embedded_build=off
243 - -DQT_FEATURE_webengine_extensions=on
244 - #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
245 - -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
246 - -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
247 - #-DQT_FEATURE_webengine_jumbo_file_merge_limit
248 - -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
249 - -DQT_FEATURE_webengine_native_spellchecker=off
250 - -DQT_FEATURE_webengine_ozone_x11=on
251 - -DQT_FEATURE_webengine_pepper_plugins=on
252 - -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
253 - -DQT_FEATURE_webengine_printing_and_pdf=on
254 - -DQT_FEATURE_webengine_sanitizer=on
255 - -DQT_FEATURE_webengine_spellchecker=on
256 - -DQT_FEATURE_webengine_system_opus=on
257 - -DQT_FEATURE_webengine_system_libwebp=on
258 - -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
259 - -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
260 - -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
261 - -DQT_FEATURE_webengine_system_libevent=on
262 - -DQT_FEATURE_webengine_system_libpci=on
263 - -DQT_FEATURE_webengine_system_libpng=on
264 - -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
265 - -DQT_FEATURE_webengine_system_zlib=on
266 - -DQT_FEATURE_webengine_webchannel=on
267 - -DQT_FEATURE_webengine_webrtc=on
268 - -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
269 - #-DQT_FEATURE_xcb=off
270 - )
271 -
272 - qt6-build_src_configure
273 -}