Diff webkit-gtk-2.44.4-r411 with a webkit-gtk-2.50.4-r410

/usr/portage/net-libs/webkit-gtk/webkit-gtk-2.50.4-r410.ebuild 2025-12-26 10:18:09.576175223 +0300
3 3

  
4 4
EAPI=8
5 5
PYTHON_REQ_USE="xml(+)"
6
PYTHON_COMPAT=( python3_{11..12} )
7
USE_RUBY="ruby31 ruby32 ruby33"
6
PYTHON_COMPAT=( python3_{11..14} )
7
USE_RUBY="ruby31 ruby32 ruby33 ruby34"
8 8

  
9 9
inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
10 10

  
......
17 17

  
18 18
LICENSE="LGPL-2+ BSD"
19 19
SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
20
KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
20
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~sparc ~x86"
21 21

  
22 22
IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
23 23
REQUIRED_USE="|| ( aqua wayland X )"
......
26 26
# https://bugs.webkit.org/show_bug.cgi?id=215986
27 27
RESTRICT="test"
28 28

  
29
# Dependencies found at Source/cmake/OptionsGTK.cmake
30
# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
31
# media-libs/mesa dep is for libgbm
32
# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
33
# TODO: gst-plugins-base[X] is only needed when build configuration ends up
34
#       with GLX set, but that's a bit automagic too to fix
35
# Softblocking webkit-gtk-2.38:4 as at that time WebKitWebDriver migrated to SLOT=4.1; currently it is found in SLOT=6
29
# Dependencies can be found in Source/cmake/OptionsGTK.cmake.
30
#
31
# * Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream.
32
#
33
# * media-libs/mesa dep is for libgbm
34
#
35
# * >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
36
#
37
# * TODO: gst-plugins-base[X] is only needed when build configuration ends up
38
#         with GLX set, but that's a bit automagic too to fix
39
#
40
# * Cairo is only needed on big-endian systems, where Skia is not officially
41
#   supported (the build system will choose a backend for you). We could probably
42
#   hard-code a list of BE arches here, to avoid the extra dependency? But I am
43
#   holding out hope that this might actually get fixed before we need to do that.
44
#
45
# * dev-util/sysprof-capture is disabled because it was a new dependency in 2.46
46
#   and we don't need any more new problems.
47
#
36 48
RDEPEND="
37
	>=x11-libs/cairo-1.16.0[X?]
38
	>=media-libs/fontconfig-2.13.0:1.0
39
	>=media-libs/freetype-2.9.0:2
40
	>=dev-libs/libgcrypt-1.7.0:0=
49
	app-accessibility/at-spi2-core:2
50
	dev-db/sqlite:3
51
	dev-libs/glib:2
52
	dev-libs/hyphen
53
	dev-libs/icu:=
54
	dev-libs/libgcrypt:0=
41 55
	dev-libs/libtasn1:=
42
	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
43
	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
44
	>=dev-libs/icu-61.2:=
56
	dev-libs/libxml2:2=
57
	dev-libs/libxslt
58
	media-libs/fontconfig:1.0
59
	media-libs/freetype:2
60
	media-libs/harfbuzz:=[icu(+)]
45 61
	media-libs/libjpeg-turbo:0=
46
	>=media-libs/libepoxy-1.5.4[egl(+)]
47
	>=net-libs/libsoup-3.0.8:3.0[introspection?]
48
	>=dev-libs/libxml2-2.8.0:2=
49
	>=media-libs/libpng-1.4:0=
50
	dev-db/sqlite:3
51
	virtual/zlib:=
62
	media-libs/libepoxy[egl(+)]
63
	media-libs/libglvnd
64
	media-libs/libpng:0=
52 65
	media-libs/libwebp:=
53
	>=app-accessibility/at-spi2-core-2.46.0:2
54

  
55
	>=dev-libs/glib-2.70.0:2
56
	>=dev-libs/libxslt-1.1.7
66
	media-libs/mesa
67
	media-libs/svt-av1
57 68
	media-libs/woff2
58
	keyring? ( app-crypt/libsecret )
59
	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
69
	net-libs/libsoup:3.0[introspection?]
70
	virtual/zlib:=
71
	x11-libs/cairo[X?]
72
	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]
60 73
	x11-libs/libdrm
61
	media-libs/mesa
62
	spell? ( >=app-text/enchant-0.22:2 )
74
	avif? ( media-libs/libavif:= )
75
	gamepad? ( dev-libs/libmanette )
63 76
	gstreamer? (
64
		>=media-libs/gstreamer-1.20:1.0
65
		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
66
		media-libs/gst-plugins-base:1.0[opengl]
67
		>=media-plugins/gst-plugins-opus-1.20:1.0
68
		>=media-libs/gst-plugins-bad-1.20:1.0
77
		media-libs/gstreamer:1.0
78
		media-libs/gst-plugins-base:1.0[egl,opengl,X?]
79
		media-plugins/gst-plugins-opus:1.0
80
		media-libs/gst-plugins-bad:1.0
69 81
	)
70

  
71
	X? ( x11-libs/libX11 )
72

  
73
	dev-libs/hyphen
74
	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
75
	avif? ( >=media-libs/libavif-0.9.0:= )
82
	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
83
	jpegxl? ( media-libs/libjxl:= )
84
	keyring? ( app-crypt/libsecret )
76 85
	lcms? ( media-libs/lcms:2 )
77

  
78
	media-libs/libglvnd
79
	wayland? (
80
		>=dev-libs/wayland-1.20
81
		>=dev-libs/wayland-protocols-1.24
82
	)
83

  
84 86
	seccomp? (
85
		>=sys-apps/bubblewrap-0.3.1
87
		sys-apps/bubblewrap
86 88
		sys-libs/libseccomp
87 89
		sys-apps/xdg-dbus-proxy
88 90
	)
89

  
91
	spell? ( app-text/enchant:2 )
90 92
	systemd? ( sys-apps/systemd:= )
91
	gamepad? ( >=dev-libs/libmanette-0.2.4 )
93
	X? ( x11-libs/libX11 )
94
	wayland? (
95
		dev-libs/wayland
96
		dev-libs/wayland-protocols
97
	)
92 98
"
93 99
DEPEND="${RDEPEND}"
94 100
# Need real bison, not yacc
95 101
BDEPEND="
96 102
	${PYTHON_DEPS}
97 103
	${RUBY_DEPS}
98
	>=app-accessibility/at-spi2-core-2.5.3
104
	app-accessibility/at-spi2-core
105
	dev-lang/perl
99 106
	dev-util/gdbus-codegen
100 107
	dev-util/glib-utils
101
	>=dev-util/gperf-3.0.1
108
	dev-util/gperf
102 109
	dev-util/unifdef
103
	>=sys-devel/bison-2.4.3
104
	|| ( >=sys-devel/gcc-7.3 >=llvm-core/clang-5 )
110
	sys-devel/bison
105 111
	sys-devel/gettext
106 112
	virtual/pkgconfig
107

  
108
	>=dev-lang/perl-5.10
109

  
110 113
	wayland? ( dev-util/wayland-scanner )
111 114
"
112 115

  
......
141 144
	cmake_src_prepare
142 145
	gnome2_src_prepare
143 146

  
144
	# Fix USE=-jumbo-build on all arches
145
	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
146

  
147
	# https://bugs.gentoo.org/943213
148
	eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
147
	# https://bugs.gentoo.org/938162, see also mycmakeargs
148
	eapply "${FILESDIR}"/2.48.3-fix-ftbfs-riscv64.patch
149 149

  
150 150
	# We don't want -Werror for gobject-introspection (bug #947761)
151 151
	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die
......
190 190

  
191 191
	# TODO: Check Web Audio support
192 192
	# should somehow let user select between them?
193

  
194 193
	local mycmakeargs=(
195 194
		-DPython_EXECUTABLE="${PYTHON}"
196 195
		${ruby_interpreter}
......
201 200
		# Source/cmake/WebKitFeatures.cmake
202 201
		-DENABLE_API_TESTS=OFF
203 202
		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
203
		-DENABLE_DRAG_SUPPORT=ON
204 204
		-DENABLE_GAMEPAD=$(usex gamepad)
205
		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
205 206
		-DENABLE_MINIBROWSER=$(usex examples)
206 207
		-DENABLE_PDFJS=$(usex pdf)
207
		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
208
		-DENABLE_SPEECH_SYNTHESIS=OFF
208 209
		-DENABLE_SPELLCHECK=$(usex spell)
210
		-DENABLE_TOUCH_EVENTS=ON
209 211
		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
210 212
		-DENABLE_VIDEO=$(usex gstreamer)
211
		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
212
		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
213
		-DENABLE_WEB_AUDIO=$(usex gstreamer)
213 214
		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
214
		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
215
		-DENABLE_WEBDRIVER=OFF
215 216
		-DENABLE_WEBGL=ON
216
		-DENABLE_WEB_AUDIO=$(usex gstreamer)
217 217
		-DUSE_AVIF=$(usex avif)
218
		# Source/cmake/GStreamerDependencies.cmake
219
		-DENABLE_MEDIA_TELEMETRY=OFF
220
		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
218 221
		# Source/cmake/OptionsGTK.cmake
219 222
		-DENABLE_DOCUMENTATION=OFF
220 223
		-DENABLE_INTROSPECTION=$(usex introspection)
......
231 234
		-DUSE_LIBHYPHEN=ON
232 235
		-DUSE_LIBSECRET=$(usex keyring)
233 236
		-DUSE_SOUP2=OFF
237
		-DUSE_SYSPROF_CAPTURE=OFF
234 238
		-DUSE_WOFF2=ON
235 239
	)
236 240

  
237
	# Temporary workaround for bug 938162 (upstream bug 271371).
238
	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
241
	# Temporary workaround for bug 938162 (upstream bug 271371)
242
	# in concert with our Debian patch. The idea to enable C_LOOP
243
	# is also stolen from Debian's build.
244
	use riscv && mycmakeargs+=(
245
		-DENABLE_WEBASSEMBLY=OFF
246
		-DENABLE_JIT=OFF
247
		-DENABLE_C_LOOP=ON
248
	)
239 249

  
240 250
	# https://bugs.gentoo.org/761238
241 251
	append-cppflags -DNDEBUG
Thank you!