public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
Date: Sun,  2 Apr 2023 00:57:14 +0000 (UTC)	[thread overview]
Message-ID: <1680397012.3ba91fb323c1738fc03ac3fef0a44d5e15e7c8f0.mattst88@gentoo> (raw)

commit:     3ba91fb323c1738fc03ac3fef0a44d5e15e7c8f0
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  2 00:32:57 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 00:56:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba91fb3

net-libs/webkit-gtk: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                       |   1 -
 ...TK-Fix-build-failure-in-ClipboardGtk4.cpp.patch |  31 ---
 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild  | 264 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild  | 260 --------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild       | 254 --------------------
 5 files changed, 810 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e31e3149fc77..fcaa8c079336 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.38.3.tar.xz 33003928 BLAKE2B ae2ab019a765e91110e12277954bea9ae16fd898f854f58e665d273bcbd9ca43ee3219eea7ba0fb5716b17b8efdfeeb395c5976b38848562be95ea372b9b70bc SHA512 1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce
 DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46 SHA512 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef
 DIST webkitgtk-2.40.0.tar.xz 40042140 BLAKE2B 4f26d893da99c7aed18594a844b1f91e32178a1bdd236e0cdd21683ed095ab2196f37c13f749e69b22b72146b98fca2a27778948aabde336d17c4d40dcf0cdc1 SHA512 550dafb31d71edf984d6b7636366f839d31f6b244b87f83c6efe7af17efe3f2f63268d2c39a6a3c474afadf2b30df868efaefcf38197b30cc6b11c63de7d2ddc

diff --git a/net-libs/webkit-gtk/files/2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch b/net-libs/webkit-gtk/files/2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch
deleted file mode 100644
index e5b032df8659..000000000000
--- a/net-libs/webkit-gtk/files/2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/882609
-https://github.com/WebKit/WebKit/pull/7036
-
-From b6b8028ff267470b593e5763b285283295d6e855 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Thu, 1 Dec 2022 14:30:55 -0600
-Subject: [PATCH] [GTK] Fix build failure in ClipboardGtk4.cpp
- https://bugs.gentoo.org/882609
-
-Reviewed by Michael Catanzaro
-
-* Source/WebKit/UIProcess/gtk/ClipboardGtk4.cpp:
----
- Source/WebKit/UIProcess/gtk/ClipboardGtk4.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebKit/UIProcess/gtk/ClipboardGtk4.cpp b/Source/WebKit/UIProcess/gtk/ClipboardGtk4.cpp
-index 4fd9616c5f7f..c6faa02957c7 100644
---- a/Source/WebKit/UIProcess/gtk/ClipboardGtk4.cpp
-+++ b/Source/WebKit/UIProcess/gtk/ClipboardGtk4.cpp
-@@ -34,6 +34,7 @@
- #include <WebCore/SharedBuffer.h>
- #include <gtk/gtk.h>
- #include <wtf/glib/GRefPtr.h>
-+#include <wtf/glib/GUniquePtr.h>
- 
- namespace WebKit {
- 
--- 
-2.37.4
-

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
deleted file mode 100644
index 832846147756..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ /dev/null
@@ -1,264 +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="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-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?]
-	>=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
-	gnome-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
-}
-
-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=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		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"
-
-	# 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=OFF
-		-DENABLE_WEBDRIVER=ON
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-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
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-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"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
deleted file mode 100644
index 10d2bed4b909..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
+++ /dev/null
@@ -1,260 +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 gnome-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
-	gnome-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.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch
-	eapply "${FILESDIR}"/2.38.3-gcc-13.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=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		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"
-
-	# 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 gnome-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"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
deleted file mode 100644
index ed2b492313cf..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ /dev/null
@@ -1,254 +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="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-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
-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?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	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=
-	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
-	gnome-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 )
-"
-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
-}
-
-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=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		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"
-
-	# 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=OFF
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-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"
-}


             reply	other threads:[~2023-04-02  0:57 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-02  0:57 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-11 23:33 [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ Sam James
2024-10-27 12:47 Michael Orlitzky
2024-07-21  8:19 Pacho Ramos
2024-03-21  2:45 Sam James
2024-01-03 21:59 Mart Raudsepp
2023-12-24 15:54 Mart Raudsepp
2023-10-18 20:19 Mart Raudsepp
2023-05-30 17:16 Matt Turner
2023-05-18 14:41 Matt Turner
2023-04-05 23:21 Sam James
2023-03-30 16:38 Sam James
2022-12-04 19:42 Matt Turner
2022-09-13 17:56 Matt Turner
2022-04-20  2:33 Matt Turner
2022-01-10 23:48 Mart Raudsepp
2022-01-02 22:46 Mart Raudsepp
2021-08-04 22:36 Matt Turner
2021-02-20  9:44 Mart Raudsepp
2020-07-30 21:18 Mart Raudsepp
2020-05-12 15:53 Mart Raudsepp
2020-05-09 20:40 Mart Raudsepp
2020-02-17 21:54 Mart Raudsepp
2020-02-05 13:06 Mart Raudsepp
2020-01-02 16:47 Mart Raudsepp
2018-08-16 21:33 Mart Raudsepp
2017-06-01 13:30 Mart Raudsepp
2017-05-10 10:40 Mart Raudsepp
2017-04-08 22:00 Mart Raudsepp
2016-07-03 15:38 Pacho Ramos
2016-05-29 10:06 Pacho Ramos
2015-11-15 21:03 Pacho Ramos
2015-11-07 11:12 Pacho Ramos
2015-11-07 11:07 Pacho Ramos
2015-08-24  5:59 Jeroen Roovers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1680397012.3ba91fb323c1738fc03ac3fef0a44d5e15e7c8f0.mattst88@gentoo \
    --to=mattst88@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox