net-libs/webkit-gtk : version bump

4 files changed, 36 insertions, 166 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a5f9d874..e7864a39 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1 @@
-DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
+DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
diff --git a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
deleted file mode 100644
index 7feb2fac..00000000
--- a/net-libs/webkit-gtk/files/2.28.2-opengl-without-X-fixes.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=208907
-
-From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 9 May 2020 23:11:52 +0300
-Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
- some build configurations
-
----
- Source/WebCore/platform/graphics/GLContext.cpp             | 5 ++++-
- Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
-index b217988b990..1ba0eb8a482 100644
---- a/Source/WebCore/platform/graphics/GLContext.cpp
-+++ b/Source/WebCore/platform/graphics/GLContext.cpp
-@@ -28,6 +28,9 @@
- 
- #if USE(GLX)
- #include "GLContextGLX.h"
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
- #include "OpenGLShims.h"
- #endif
- 
-@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext()
- 
- static bool initializeOpenGLShimsIfNeeded()
- {
--#if USE(OPENGL_ES) || USE(LIBEPOXY)
-+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
-     return true;
- #else
-     static bool initialized = false;
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-index 3515be452b2..82cce70f14b 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-@@ -64,7 +64,10 @@
- 
- #if USE(GLX)
- #include <GL/glx.h>
--#include <WebCore/OpenGLShims.h>
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
-+#include "WebCore/OpenGLShims.h"
- #endif
- 
- #if USE(GSTREAMER)
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
deleted file mode 100644
index a4cf86f3..00000000
--- a/net-libs/webkit-gtk/files/2.34.1-opengl-without-X-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=208907
-
-From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 9 May 2020 23:11:52 +0300
-Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
- some build configurations
-
----
- Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-index 3515be452b2..82cce70f14b 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
-@@ -64,7 +64,10 @@
- 
- #if USE(GLX)
- #include <GL/glx.h>
--#include <WebCore/OpenGLShims.h>
-+#endif
-+
-+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
-+#include "WebCore/OpenGLShims.h"
- #endif
- 
- #if USE(GSTREAMER)
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.1-r100.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7-r1.ebuild
index 2e7cf6d9..d0b295cd 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.1-r100.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.7-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
 
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs virtualx
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 toolchain-funcs cmake
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -13,14 +14,14 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
-IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +opengl seccomp spell systemd wayland +X"
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 
 # gstreamer with opengl/gles2 needs egl
 REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
+	gles2-only? ( egl )
+	gstreamer? ( egl )
 	wayland? ( egl )
 	|| ( aqua wayland X )
 "
@@ -29,15 +30,9 @@ REQUIRED_USE="
 # https://bugs.webkit.org/show_bug.cgi?id=148210
 RESTRICT="test"
 
-# Aqua support in gtk3 is untested
 # Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
 # Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
 # >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
 # TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
 RDEPEND="
 	>=x11-libs/cairo-1.16.0:=[X?]
@@ -47,7 +42,7 @@ RDEPEND="
 	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
 	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
 	>=dev-libs/icu-61.2:=
-	virtual/jpeg:0=
+	media-libs/libjpeg-turbo:0=
 	>=net-libs/libsoup-2.54:2.4[introspection?]
 	>=dev-libs/libxml2-2.8.0:2
 	>=media-libs/libpng-1.4:0=
@@ -64,18 +59,21 @@ RDEPEND="
 	dev-libs/libtasn1:=
 	spell? ( >=app-text/enchant-0.22:2 )
 	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
 		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
 
 	X? (
 		x11-libs/libX11
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
 		x11-libs/libXrender
-		x11-libs/libXt )
+		x11-libs/libXt
+	)
 
 	libnotify? ( x11-libs/libnotify )
 	dev-libs/hyphen
@@ -85,12 +83,12 @@ RDEPEND="
 
 	egl? ( media-libs/mesa[egl(+)] )
 	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
+	!gles2-only? ( virtual/opengl )
 	wayland? (
 		dev-libs/wayland
 		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
 	)
 
 	seccomp? (
@@ -102,16 +100,15 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:= )
 	gamepad? ( >=dev-libs/libmanette-0.2.4 )
 "
-unset wpe_depend
 DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
 # Need real bison, not yacc
 BDEPEND="
 	${PYTHON_DEPS}
 	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
 	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
 	dev-lang/ruby:2.7
+	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3
 	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
 	sys-devel/gettext
@@ -123,16 +120,11 @@ BDEPEND="
 	virtual/perl-JSON-PP
 
 	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
 "
 #	test? (
 #		dev-python/pygobject:3[python_targets_python2_7]
 #		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
+#	)
 
 S="${WORKDIR}/${MY_P}"
 
@@ -149,16 +141,6 @@ pkg_pretend() {
 			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
 		fi
 	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
 }
 
 pkg_setup() {
@@ -170,7 +152,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}"/2.34.1-opengl-without-X-fixes.patch
 	cmake_src_prepare
 	gnome2_src_prepare
 }
@@ -195,7 +176,7 @@ src_configure() {
 	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
 	# --no-keep-memory doesn't work on ia64, bug #502492
 	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
 	fi
 
 	# Ruby situation is a bit complicated. See bug 513888
@@ -207,21 +188,11 @@ src_configure() {
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
 
-	# opengl needs to be explicetly handled, bug #576634
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
 	local mycmakeargs=(
 		${ruby_interpreter}
 		$(cmake_use_find_package gles2-only OpenGLES2)
 		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
 		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
 		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
 		-DPORT=GTK
@@ -229,36 +200,36 @@ src_configure() {
 		-DENABLE_API_TESTS=$(usex test)
 		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
 		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
 		-DENABLE_MINIBROWSER=$(usex examples)
 		-DENABLE_SPELLCHECK=$(usex spell)
 		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
 		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=${opengl_enabled}
-		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
 		-DENABLE_WEBGL2=OFF
 		-DENABLE_WEB_AUDIO=$(usex gstreamer)
 		# Source/cmake/OptionsGTK.cmake
 		-DENABLE_GLES2=$(usex gles2-only)
 		-DENABLE_GTKDOC=$(usex gtk-doc)
 		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
 		-DENABLE_QUARTZ_TARGET=$(usex aqua)
 		-DENABLE_WAYLAND_TARGET=$(usex wayland)
 		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
 		-DUSE_AVIF=$(usex avif)
 		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
 		-DUSE_LCMS=$(usex lcms)
 		-DUSE_LIBHYPHEN=ON
 		-DUSE_LIBNOTIFY=$(usex libnotify)
 		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DUSE_OPENGL_OR_ES=ON
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_SOUP2=ON
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
 		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
 	)
 
 	# https://bugs.gentoo.org/761238
@@ -267,21 +238,6 @@ src_configure() {
 	WK_USE_CCACHE=NO cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
 }