gentoo auto-resync : 18:05:2023 - 22:13:50

5 files changed, 1 insertions, 326 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 68587ba6ea9e..dd3c8e33a2c5 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,12 +1,8 @@
-AUX 2.38.3-gcc-13.patch 775 BLAKE2B 53d5c23f612ec6d9cb96f5c6d33e1a029120a2ca82d5e3833f910cf637cfe9cda0404f8bfd06601bbb04c36fefd77a1017ec764adba12b3fda0b3f6eed36168e SHA512 c83a769456c02991309c97cb9cb88e0e6335a22cf2c0fd30c3565740c9de316bb5c0e44768485193e28ec692ba3f0f0c0bb01c0e5ab62167a0540c8b1b1e8916
-AUX 2.38.5-gcc-13.patch 1128 BLAKE2B 1ca6050cda18720060a90eedba3561d12b4af9d19093effef469a20ecaa1040cd5634621b63962e8a430a02d18800913a3af35e51b424c37cc233640f306f6ed SHA512 f83c027e015888f7852e86f4266a8db9a7dc94cbda82c0ded1e38a0306a047e02a5a4993c9573e6e1617aaaebb3830206336b01863d726cfa685415e689f1104
 AUX 2.40.0-respect-RUBY.patch 1447 BLAKE2B 2212d15e50362004349245ee75285d96951d2ca8d15a30b8a4b6707bea93ea0e12a5993ec88848085e4ec71ac835b5d87a18f26240e014a4cf3812ef2c8096f9 SHA512 430bad9af15922cb9e4b879694a5759f8e30c56b75b7d90d91ef96dabb94ae023dd80a87d436bef3d13bb3a0c7b971af9639f654a587886413e4ed5f355ccb51
 AUX 2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch 1140 BLAKE2B 55fcb2cbcad9fd62f77b5b00b1b85641fd3e99558d0729e3b42c2070d760db9ea5059d04303d8abfefdf2a9f554ca81ab9362c6f3a4a0730b1b1aeccfff468bc SHA512 02de018aed6fead34522febb04709aa347636c5cc7e344628249c4a9d81d9add49c6f844d0468a088781a9929adedd74cb1d0a921d01eb4f7841ad14994f7464
 AUX 2.40.1-gcc-13.patch 850 BLAKE2B fb972f818990265d8640d1c13b4bbb0eee10c81a023feb551e9bba40172564ee10167bec64b7684af564c96e43c5002d24ec3830717df7fd72532dd0d9bd65c5 SHA512 57f37285e295e0e74d7704564fc85e7b5857d938a88f5ab53742e818151125b60c4e76e0d2eae185294795de3b5e8a1c6af4606110bb4f1a3a726bf5ac1236db
-DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46 SHA512 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef
 DIST webkitgtk-2.40.1.tar.xz 39599544 BLAKE2B b50c983eafdb215e62e1509873691bc3f932c8b5daf0ceeaefc041d3bc6c5ff804f25af5f761837a3f37df07c1c598f5984e40b116e70a3523d508d13594dc4d SHA512 e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c
-EBUILD webkit-gtk-2.38.5-r500.ebuild 8296 BLAKE2B e142376bedabf9231ad58fae1fee6f5055efb98d5aa7a759b81cf62412d0d76a18fb757604f17ec4cf249f7ece0932242942107e6fdd5415071eec716da6e2e2 SHA512 34b7dd7fdffba05df598a8c7b54ee4cfc5cdbae370775ec23d78e4d64b49fa0891874722feace8d2649d94a77cdf4e63da87e27178b0dba9885ab04092b8c33e
 EBUILD webkit-gtk-2.40.1-r410.ebuild 8030 BLAKE2B ee467dfd5ce6f705486b06b16083dcd7653db507965b7234bc9f2a9149972089e8d66802ada90c625256af53acadfbd7a1c648586005e7821a2e6c5c1dde5bf3 SHA512 e39a94c5e6afd41f77ac5fda8bef1564c482439045889830dfeda29a3aa066c2e02396ee6f6057c634c3c445de3a20f37dd0222609b779786aaed904ba21d5ee
 EBUILD webkit-gtk-2.40.1-r600.ebuild 7909 BLAKE2B 2e8c22850cf8cd1c9e8c8c040b161d290394ace2790cb24d106ad23a0ff85e2c0d36089f7a18ec22a9388e820ea46bb9f74223cc57364cebfb6739d1514a6a6a SHA512 b450774370f501b8790a4f58b07bbf24dd28650257cf55aa8e8ee0f24768f9051bd81726d90594f051c5bf67e9d858c6aaffb1bce9ec8c23dc4c459d9756fb13
 EBUILD webkit-gtk-2.40.1.ebuild 7756 BLAKE2B a4ca1a9aed73893ac75c78b4a21fc1e23802fe04e38d8f7fce2af747aa8586485f54397f99d785b4498f176641c4640a9066c37ea2321a82c9313497edaf646c SHA512 33d75aa7a06079fa45e64115cda7ac3610b36f522af7301859fae491bd994f3078786a18fcdb93ef1a5451c061fe0ce53fc0f0cbdab0a4f46895c5dc85e00966
-MISC metadata.xml 756 BLAKE2B ac278b1ed9ad7d7dcce220e686ef4c67c79f7d4c25e43e0fedaad14925eb03c74140e49a4e86d2146d6d467f14a737fb2ff1e90b506ab4d43b79d3462d58cb24 SHA512 584ce6c8dc66e3e3b3677dbffe8b2a58bb81146f3dc8eaf830597781f03580e0b94620322834b6e558ac9fcb06b3eda02645803f63d78e88104ecc0950c6f369
+MISC metadata.xml 709 BLAKE2B 270bd59a793199307b37c8899bdec1438c4576a6221926af6a81ae612e31269ba128b571e184ccf245cb6e82d73b2365adfa33a31cb79857dc2d0502b8fd1614 SHA512 37fa190e40b0b3fc2838ac39f7ee5915547b412692894ffdb72cc91e69236accdb3570f8d20b057fbd4db9d0b4e8d1cee638bce0720ceadd95cfec1ef8b53581
diff --git a/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch b/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch
deleted file mode 100644
index 860f27824ca4..000000000000
--- a/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/892495
-https://github.com/WebKit/WebKit/commit/d318bb461f040b90453bc4e100dcf967243ecd98
-
-From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Mon, 16 Jan 2023 16:55:26 -0800
-Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in
- ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689
-
-Unreviewed build fix.
-
-* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h:
-
-Canonical link: https://commits.webkit.org/258968@main
---- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
-+++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
-@@ -12,6 +12,7 @@
- 
- #include <algorithm>
- #include <array>
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-
diff --git a/net-libs/webkit-gtk/files/2.38.5-gcc-13.patch b/net-libs/webkit-gtk/files/2.38.5-gcc-13.patch
deleted file mode 100644
index 461e7a41afe5..000000000000
--- a/net-libs/webkit-gtk/files/2.38.5-gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/903554
-https://github.com/WebKit/WebKit/pull/11910
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109247
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109307
-
-From 0aa2fbaeb7cd103cda9907f8fa2248cd2209b22f Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska@suse.cz>
-Date: Fri, 24 Mar 2023 10:11:51 +0100
-Subject: [PATCH] gcc13: fix rejected code by using of an explicit ctor
-
-The following code is invalid based on the analysis here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109247#c5
---- a/Source/WebCore/platform/graphics/SourceBrush.cpp
-+++ b/Source/WebCore/platform/graphics/SourceBrush.cpp
-@@ -65,12 +65,12 @@
- 
- void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform)
- {
--    m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
-+    m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
- }
- 
- void SourceBrush::setPattern(Ref<Pattern>&& pattern)
- {
--    m_brush = { WTFMove(pattern) };
-+    m_brush = Brush { WTFMove(pattern) };
- }
- 
- WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)
-
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index cd0721b7c3f8..072951572c35 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="avif">Enable support for AVIF images via <pkg>media-libs/libavif</pkg></flag>
-    <flag name="egl">Enable EGL support</flag>
     <flag name="examples">Install the MiniBrowser example application</flag>
     <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
     <flag name="jumbo-build">Combine source files to speed up build process</flag>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
deleted file mode 100644
index 3dcd479580aa..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# 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)
-# 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
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=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] )
-		!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
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
-	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
-	eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# 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 $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(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
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-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_DOCUMENTATION=OFF
-		-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_AVIF=$(usex avif)
-		-DUSE_GTK4=ON # wbkit2gtk-5.0
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}