From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- net-libs/webkit-gtk/Manifest | 10 +- net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch | 70 ------ .../webkit-gtk/files/2.34.3-non-jumbo-fix.patch | 31 --- net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild | 272 --------------------- net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild | 250 ------------------- net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +- net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild | 249 +++++++++++++++++++ 7 files changed, 253 insertions(+), 631 deletions(-) delete mode 100644 net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch delete mode 100644 net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch delete mode 100644 net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild delete mode 100644 net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild create mode 100644 net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild (limited to 'net-libs/webkit-gtk') diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index fb73ea67ae71..65323a42e5d9 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,9 +1,5 @@ -AUX 2.34.3-jumbo-fix.patch 2430 BLAKE2B 0896f652262284cee74bec5f84f9bf8a88884f8c4182cbbc72dc59de5778856807772ecc92b9eb75c40eb021b0732ef81435e8894b46c8c10d833474e8c077c6 SHA512 c131daff77815eda541a376dc8904cffe7a75d9eb00fdf07ae872072aaa09493c2d01ae94122a0e6f43bdd8c8ba9aceb01821fb56b803c1b5f894d0e08abad53 -AUX 2.34.3-non-jumbo-fix.patch 1056 BLAKE2B 4d229c01fbfae518725bb802c0fd907a1dc8bd4edd41be2b48075471f31ec84b6f9bae1b97294f46a42ba77a081e3705be3ad49177de28791a495f19ddb4f51e SHA512 1ace5a3c1e775f258c67c59987a0c84ebc7cadd007cc0b79b282712b354cdaf9eb4dd6ef75b85b234ad3b16079ac8dbf2890921165854fc2da51f79cbd5f0e79 -DIST webkitgtk-2.34.6.tar.xz 24393340 BLAKE2B 7ab93a81f6c74ff712ddb057cbba758978b978323098071e9e35e3aa8efab4c747b8375e10a302185a82b0e89d822c89d199d2d4092c4acd9a423c1f6696c2ab SHA512 57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343 -DIST webkitgtk-2.36.0.tar.xz 26900828 BLAKE2B d965c9a0f3ff03d55baba840af7fe0cb3288eaa982f1444aa14a499542d89766815954b9e62b5d39d9536074d59e42d1c0798c5e1d88974f070c239ef1d8eae5 SHA512 0926a792da295b8efa8c0fb80fbb0cb27c43bb86011317d076fbe5eef347f2bc02e8afc4c75699a5c6a14363f4abcbfa2d941fdddd6646a63c7679e2380080da DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4 -EBUILD webkit-gtk-2.34.6.ebuild 8305 BLAKE2B 91dd8daf78dfb6c0e13ba15ae4d04d9f175f49e11527664a77e3873b158c1cc339439a650329e7586f95dce33851e33eef3057121e421475451ea02b6526dd9b SHA512 5ff2636f5b2da4da3b8923da85bd34317b2efa75586d7b40ee8644c81af6b1c57338209a22edf9194477d15307630ca92706385c60eeb72e6bfb9b048ee7fccb -EBUILD webkit-gtk-2.36.0-r1.ebuild 7436 BLAKE2B 7b291dc8f2da2960aa656562835153a3f63112c7cc2dfec0bdb36b782d12ceed98b5a7bd1c1af7abab543dd315cc2c13bdab0190d75d4759f1508ced4d2929c8 SHA512 3972b6a536d91460372ab70b17391dbc2c404b3ecbd37147882734681a0065f146c9368ea79a73867027f15f46b3ddfaed4a9121612966284d31679f46276555 -EBUILD webkit-gtk-2.36.1.ebuild 7438 BLAKE2B 8ef44f37123bc75b72f4ebedbb8fe1697719343b0c4c4f783f960a068da6c7c1c34b5df6a26713031582466a8b03bb666323f095b77e89a9e336181d86d0fe75 SHA512 234c2f4205b898e2cf21a564676c99f5fd402f98732949e7203f6fe92cceb416e043f9a33e6dbeb9abf1f7547aa0030bd20162d259d72da843998331609aaafd +DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692 +EBUILD webkit-gtk-2.36.1.ebuild 7442 BLAKE2B e573bec3b57464a80aec549ad4759418d8a8a0f4ce812e510c8f17ca45bb760d41c0634c63c3973c328e7d4ce4275f01dfac4f77463d3170061f530f44ec0e26 SHA512 2acd23be1757f6e40f6be3e39d9bcc1c4a8ee885a4d621a2775d4ed6befc94d9755e7bd397300af0fc96177c4b3739740c3160532a747c384088013be30811ac +EBUILD webkit-gtk-2.36.3.ebuild 7410 BLAKE2B eb95c068b7c42dbb49d031be9a7bf6a8635d5126a0052b2215cbc4e6c44192ab754627b006dedd2d85a637749eba96f33366075b9af2a5322e460b88a955d846 SHA512 684c6085cb9dfe377e0870292b6c31461c1a4a733aceff2637ffbaec21479b7a71091d570940005f2daa2f1253dd4908200ce4486188fa4895a2402f9aaf8663 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe diff --git a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch deleted file mode 100644 index 97c5c0c8e4b6..000000000000 --- a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch +++ /dev/null @@ -1,70 +0,0 @@ -From b60c2e4d1770660280d97cae9e82f3040ab97229 Mon Sep 17 00:00:00 2001 -From: "philn@webkit.org" - -Date: Sat, 11 Sep 2021 11:34:42 +0000 -Subject: [PATCH] [GLIB] MediaSession is not enabled - https://bugs.webkit.org/show_bug.cgi?id=217991 - -leio: Extracted to include only the side-effect of fixing unity builds on -some machine configurations. -Thanks-To gen2dev ---- - Source/WebCore/platform/PlatformScreen.h | 6 ++++++ - Source/WebCore/platform/graphics/ImageFrame.h | 6 ++++++ - Source/WebCore/platform/graphics/ImageOrientation.h | 6 ++++++ - 3 files changed, 18 insertions(+) - -diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h -index d3f12a6538b8..d47d193e8bee 100644 ---- a/Source/WebCore/platform/PlatformScreen.h -+++ b/Source/WebCore/platform/PlatformScreen.h -@@ -48,6 +48,12 @@ OBJC_CLASS UIScreen; - typedef struct CGColorSpace *CGColorSpaceRef; - #endif - -+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values. -+// As a workaround, we explicitly undef them here. -+#if defined(None) -+#undef None -+#endif -+ - namespace WebCore { - - class DestinationColorSpace; -diff --git a/Source/WebCore/platform/graphics/ImageFrame.h b/Source/WebCore/platform/graphics/ImageFrame.h -index 9843aac40eb4..92e1d4486c5f 100644 ---- a/Source/WebCore/platform/graphics/ImageFrame.h -+++ b/Source/WebCore/platform/graphics/ImageFrame.h -@@ -33,6 +33,12 @@ - #include "NativeImage.h" - #include - -+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values. -+// As a workaround, we explicitly undef them here. -+#if defined(None) -+#undef None -+#endif -+ - namespace WebCore { - - class ImageFrame { -diff --git a/Source/WebCore/platform/graphics/ImageOrientation.h b/Source/WebCore/platform/graphics/ImageOrientation.h -index d990a3dc555f..5de271e52352 100644 ---- a/Source/WebCore/platform/graphics/ImageOrientation.h -+++ b/Source/WebCore/platform/graphics/ImageOrientation.h -@@ -30,6 +30,12 @@ - #include "FloatSize.h" - #include - -+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values. -+// As a workaround, we explicitly undef them here. -+#if defined(None) -+#undef None -+#endif -+ - namespace WebCore { - - struct ImageOrientation { --- -2.32.0 - diff --git a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch deleted file mode 100644 index 74790d9f6cef..000000000000 --- a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f8efe9f2d128a897c0b2a054bf05200cb842d9b2 Mon Sep 17 00:00:00 2001 -From: "don.olmstead@sony.com" - -Date: Sun, 3 Oct 2021 23:00:17 +0000 -Subject: [PATCH] Non-unified build fixes, early October 2021 edition - https://bugs.webkit.org/show_bug.cgi?id=231143 - -Unreviewed non-unified build fixes. ---- -leio: Trimmed to what's relevant to webkitgtk-2.34 branch -gyakovlev: removed TextTrackClient.h include addition - - Source/WebCore/inspector/agents/InspectorCanvasAgent.h | 2 ++ - 1 files changed, 2 insertions(+) - -diff --git a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h -index 7f1012aa2a24..4c7c23995276 100644 ---- a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h -+++ b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h -@@ -44,6 +44,8 @@ class InjectedScriptManager; - namespace WebCore { - - class CanvasRenderingContext; -+class Frame; -+ - #if ENABLE(WEBGL) - class InspectorShaderProgram; - class WebGLProgram; --- -2.32.0 - diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild deleted file mode 100644 index 6c420cdeac2f..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..10} ) -USE_RUBY="ruby26 ruby27 ruby30" - -inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx - -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 +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd 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" - -# 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) -# 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:= - virtual/jpeg: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 - >=dev-libs/atk-2.16.0 - 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.14:1.0 - >=media-libs/gst-plugins-base-1.14: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.14.4-r1:1.0 - >=media-libs/gst-plugins-bad-1.14:1.0 ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt ) - - libnotify? ( x11-libs/libnotify ) - 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}" -# paxctl needed for bug #407085 -# Need real bison, not yacc -BDEPEND=" - ${PYTHON_DEPS} - ${RUBY_DEPS} - >=app-accessibility/at-spi2-core-2.5.3 - 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 - - 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}" - -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() { - eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch - eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638 - cmake_src_prepare - gnome2_src_prepare -} - -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=( - ${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_GEOLOCATION=$(usex geolocation) # 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=ON - # 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_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_QUARTZ_TARGET=$(usex aqua) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DENABLE_X11_TARGET=$(usex X) - -DUSE_AVIF=$(usex avif) - -DUSE_GTK4=OFF - -DUSE_LCMS=$(usex lcms) - -DUSE_LIBHYPHEN=ON - -DUSE_LIBNOTIFY=$(usex libnotify) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -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=$(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_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" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild deleted file mode 100644 index d7f285d8177b..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..10} ) -USE_RUBY="ruby27 ruby30 ruby31" - -inherit check-reqs flag-o-matic gnome2 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 ~ppc64 ~riscv ~x86" - -IUSE="aqua avif +egl examples gamepad +geolocation 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 ) - 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:= - virtual/jpeg: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 - >=dev-libs/atk-2.16.0 - 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.14:1.0 - >=media-libs/gst-plugins-base-1.14: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.14.4-r1:1.0 - >=media-libs/gst-plugins-bad-1.14:1.0 - ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt - ) - - libnotify? ( x11-libs/libnotify ) - 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/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 - - 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 -# ) -RDEPEND="${RDEPEND} - geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) -" - -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 -} - -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=( - ${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_GEOLOCATION=$(usex geolocation) # 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=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=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 -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild index 913bbc5c3726..bb28e81e3161 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild @@ -15,7 +15,7 @@ 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 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 seccomp spell systemd test wayland X" diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild new file mode 100644 index 000000000000..7cf7405ca3fc --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild @@ -0,0 +1,249 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{8..11} ) +USE_RUBY="ruby27 ruby30 ruby31" + +inherit check-reqs flag-o-matic gnome2 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 +geolocation 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 ) + 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 + >=dev-libs/atk-2.16.0 + 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 + ) + + libnotify? ( x11-libs/libnotify ) + 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 + + gtk-doc? ( >=dev-util/gtk-doc-1.32 ) +" +# test? ( +# dev-python/pygobject:3[python_targets_python2_7] +# x11-themes/hicolor-icon-theme +# ) +RDEPEND="${RDEPEND} + geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) +" + +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 +} + +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=( + ${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_GEOLOCATION=$(usex geolocation) # 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=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=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 +} -- cgit v1.2.3