Diff qtwebengine-6.11.0 with a qtwebengine-6.9999

/usr/portage/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild 2026-05-04 19:17:04.870431842 +0300
9 9

  
10 10
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
11 11
SRC_URI+="
12
	https://distfiles.gentoo.org/pub/dev/ionen@gentoo.org/${PN}-6.11-patchset-2.tar.xz
12
	https://distfiles.gentoo.org/pub/dev/ionen@gentoo.org/${PN}-6.11-patchset-3.tar.xz
13 13
"
14 14

  
15 15
if [[ ${QT6_BUILD_TYPE} == release ]]; then
......
45 45
	media-libs/libpng:=
46 46
	media-libs/libwebp:=
47 47
	media-libs/mesa[gbm(+)]
48
	>=media-libs/openh264-2.4:=
48 49
	media-libs/openjpeg:2=
49 50
	media-libs/opus
50 51
	media-libs/tiff:=
......
108 109

  
109 110
PATCHES+=(
110 111
	# add extras as needed here, may merge in set if carries across versions
111
	"${FILESDIR}"/${PN}-6.10.2-clang-22.patch
112 112
	"${FILESDIR}"/${PN}-6.10.3-climits.patch
113 113
)
114 114

  
......
132 132
	local CHECKREQS_DISK_USR=400M
133 133

  
134 134
	if ! has distcc ${FEATURES}; then #830661
135
		# assume ~2GB per job or 1.5GB if clang, possible with less
136
		# depending on free memory and *FLAGS, but prefer being safe as
137
		# users having OOM issues with qtwebengine been rather common
138
		tc-is-clang && : 15 || : 20
135
		# on average this does not use *that* much ram but then poor
136
		# luck may lead to several 3.9+GB jobs happening at same time
137
		# (less of an issue for users with 32+GB ram given they have
138
		# room to handle a few spikes), try to find a balance but it
139
		# won't be right for everyone (CHECKREQS_DONOTHING=1 to ignore)
140
		tc-is-clang && : 17 || : 25 # clang:1.7GB/job, gcc:2.5GB/job
139 141
		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
140 142
	fi
141 143

  
......
198 200
		-DQT_FEATURE_webengine_extensions=ON
199 201
		# TODO: it may be possible to make x11 optional since 6.8+
200 202
		-DQT_FEATURE_webengine_ozone_x11=ON
203
		-DQT_FEATURE_webengine_pass_extra_flags=ON
201 204
		-DQT_FEATURE_webengine_pepper_plugins=ON
202 205
		-DQT_FEATURE_webengine_printing_and_pdf=ON
203 206
		-DQT_FEATURE_webengine_spellchecker=ON
......
213 216
		# this by default in 6.7.3+ (bug #913923)
214 217
		-DQT_FEATURE_webengine_system_re2=OFF
215 218

  
216
		# currently seems unused with our configuration, doesn't link and grep
217
		# seems(?) to imply no dlopen nor using bundled (TODO: check again)
218
		-DQT_FEATURE_webengine_system_openh264=OFF
219

  
220 219
		# system_libvpx=ON is intentionally ignored with USE=vaapi which leads
221 220
		# to using system's being less tested, prefer disabling for now until
222 221
		# vaapi can use it as well
......
227 226
		$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
228 227
			freetype gbm glib harfbuzz lcms2 libjpeg libopenjpeg2 \
229 228
			libpci libpng libtiff libudev libwebp libxml minizip \
230
			opus snappy zlib)
229
			openh264 opus snappy zlib)
231 230

  
232 231
		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
233 232
		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
......
276 275
	qt6-build_src_configure
277 276
}
278 277

  
279
src_compile() {
280
	cmake_src_compile
281

  
282
	# exact cause unknown, but >=qtwebengine-6.9.2 started to act as if
283
	# QtWebEngineProcess is marked USER_FACING despite not set anywhere
284
	# and this creates a user_facing_tool_links.txt with a broken symlink
285
	:> "${BUILD_DIR}"/user_facing_tool_links.txt || die
286
}
287

  
288 278
src_test() {
289 279
	if [[ ${EUID} == 0 ]]; then
290 280
		# almost every tests fail, so skip entirely
......
331 321
	[[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
332 322
		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
333 323

  
324
	# exact cause unknown, but >=qtwebengine-6.9.2 started to act as if
325
	# QtWebEngineProcess is marked USER_FACING despite not set anywhere
326
	# and this creates a user_facing_tool_links.txt with a broken symlink
327
	if [[ -L ${ED}/usr/bin/QtWebEngineProcess6 ]] &&
328
		[[ ! -e ${ED}/usr/bin/QtWebEngineProcess6 ]]
329
	then
330
		rm -- "${ED}"/usr/bin/QtWebEngineProcess6 || die
331
	else
332
		# eqawarn rather than die to avoid failing a long build over this
333
		eqawarn "QA Notice: symlink workaround may be obsolete"
334
	fi
335

  
334 336
	if use test; then
335 337
		local delete=( # sigh
336 338
			"${D}${QT6_ARCHDATADIR}"/metatypes/*testmockdelegates*
Thank you!