commit: da95c117b6e4fc6729bb374edd6a1bf1aab23849 parent f36c9a8af1136c07953b8bd3d0d6234677458d20 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Mon, 12 Jul 2021 16:46:48 +0200 net-libs/webkit-gtk: Clean version bump, 2.32.2, 2.33.2Diffstat:
| M | net-libs/webkit-gtk/Manifest | 5 | ++--- |
| D | net-libs/webkit-gtk/webkit-gtk-2.32.0.ebuild | 308 | ------------------------------------------------------------------------------- |
| R | net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild -> net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild | 0 | |
| R | net-libs/webkit-gtk/webkit-gtk-2.33.1.ebuild -> net-libs/webkit-gtk/webkit-gtk-2.33.2.ebuild | 0 |
4 files changed, 2 insertions(+), 311 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest @@ -1,3 +1,2 @@ -DIST webkitgtk-2.32.0.tar.xz 23315936 BLAKE2B a0d6c70d5fdc7d7cdcf00e505a1f067b879b905b0926ae85e6e7162dc336981fb488c3eb1c35fdc1de39b4f9f574c089f6f38e708a04e965f9df2236aef7c677 SHA512 4832a4614be24481028ca8a6480a8e6cfacd8e22f5ba9f936703c09944550056f06f75ccf8fffa7dee3f5a1d11ab1870841407745be2e61ebad6557a0934db15 -DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863 SHA512 ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843 -DIST webkitgtk-2.33.1.tar.xz 24638856 BLAKE2B e84f8e6c2b914a1b753afd202849d99cd409efadb162f2647fd9d58d35a525daaa6aa2d7e43f448c0f9c815af4769c35d29db4795e42b7f0eda7717e6283b91e SHA512 7e62dd332d67d92dcaaceff616a78881c5b79475aaf990d2329691182554011281494e0216212d67adad907365807bcf11c60f6a492bd164555ec379386cb293 +DIST webkitgtk-2.32.2.tar.xz 23321888 BLAKE2B 1201ca423b90a7ba9e7613407e170d367b7b6e11219134dbefb774349b7752f5b498a168594addcb5d6f0d8a7977d3b946fd546583789d6c74cd8d7faf3823f1 SHA512 ca131fef749e5d882cebcf71b4f865511a43fb60b41c917a8a98876dde108a71888e986e40217ff12a43fb395c147e7b6c7a262bc353269498f1dba33e3905f8 +DIST webkitgtk-2.33.2.tar.xz 24688880 BLAKE2B 717df46963c6ac11d2b1cf593aa8c0a867e0ed1e7a004067e829ecaf47a189332bdbf5034ecaebd6c97c1d05a1272f000907dbe137e635430c343c29dd1ef969 SHA512 0c1cdf17b1ded3c026ccea2fe3780aa7bafd705aa574e44e5c5960e1c98a06756277289ab5fea5879429b95ffe7d58bea828d2897f253404d56efccc5cea1781 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.0.ebuild @@ -1,308 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CMAKE_MAKEFILE_GENERATOR="ninja" -PYTHON_COMPAT=( python3_{7..8} ) -USE_RUBY="ruby24 ruby25 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 ~x86" - -IUSE="aqua debug +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify media-source +opengl seccomp spell systemd wayland +X" - -# gstreamer with opengl/gles2 needs egl -REQUIRED_USE=" - geolocation? ( introspection ) - gles2-only? ( egl !opengl ) - gstreamer? ( opengl? ( egl ) ) - wayland? ( egl ) - media-source? ( gstreamer ) - || ( aqua wayland X ) -" - -# 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 -" -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-60.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.44.0:2 - >=dev-libs/libxslt-1.1.7 - media-libs/woff2 - gnome-keyring? ( app-crypt/libsecret ) - introspection? ( >=dev-libs/gobject-introspection-1.59.0:= ) - dev-libs/libtasn1:= - spell? ( >=app-text/enchant-0.22:= ) - gstreamer? ( - >=media-libs/gstreamer-1.14:1.0 - >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,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[X?] - ) - - media-source? ( >=media-libs/gstreamer-1.16: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= ) - - egl? ( media-libs/mesa[egl] ) - gles2-only? ( media-libs/mesa[gles2] ) - opengl? ( virtual/opengl ) - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 - opengl? ( ${wpe_depend} ) - gles2-only? ( ${wpe_depend} ) - ) - 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 ) -" -unset wpe_depend - -BDEPEND="${RUBY_DEPS}" - -# paxctl needed for bug #407085 -# Need real bison, not yacc -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.10 - >=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 - sys-apps/paxctl - -" -RDEPEND="${RDEPEND} - geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) -" -RESTRICT="test" -# tests are b0rk, PYTHON_USEDEP is as well -# test? ( -# dev-python/pygobject:3[${PYTHON_USEDEP}] -# 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 - - 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() { - 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.28.2-opengl-without-X-fixes.patch - cmake_src_prepare - gnome2_src_prepare -} - -src_configure() { - if use debug; then - CMAKE_BUILD_TYPE="Debug" - fi - - # gtk-doc fails to generate docs when ld.lld is used, force binutils - if use gtk-doc; then - export CC_LD="ld" - export LD="ld" - fi - - # 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 "-Wl,--no-keep-memory" - fi - - # We try to use gold when possible for this package -# if ! tc-ld-is-gold ; then -# append-ldflags "-Wl,--reduce-memory-overheads" -# 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? - # - # 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=( - # begin PRIVATE options - -DENABLE_API_TESTS=$(usex test) - -DSHOULD_INSTALL_JS_SHELL=$(usex examples) - -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) - -DENABLE_GAMEPAD=$(usex gamepad) - # end PRIVATE options - -DUSE_SYSTEMD=$(usex systemd) - -DENABLE_WEBDRIVER=OFF - -DENABLE_WEB_CRYPTO=OFF - # -DENABLE_TOUCH_EVENTS=OFF - # -DENABLE_DRAG_SUPPORT=OFF - -DENABLE_MINIBROWSER=$(usex examples) - -DENABLE_QUARTZ_TARGET=$(usex aqua) - -DENABLE_GTKDOC=$(usex gtk-doc) - $(cmake_use_find_package gles2-only OpenGLES2) - -DENABLE_GLES2=$(usex gles2-only) - -DENABLE_VIDEO=$(usex gstreamer) - -DENABLE_WEB_AUDIO=$(usex gstreamer) - -DENABLE_INTROSPECTION=$(usex introspection) - -DUSE_LIBNOTIFY=$(usex libnotify) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_WOFF2=ON - -DENABLE_SPELLCHECK=$(usex spell) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - $(cmake_use_find_package egl EGL) - $(cmake_use_find_package opengl OpenGL) - -DENABLE_X11_TARGET=$(usex X) - -DENABLE_WEBGL=${opengl_enabled} - -DUSE_WPE_RENDERER=${use_wpe_renderer} - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DENABLE_MEDIA_SOURCE=$(usex media-source) - -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DUSE_LD_GOLD=ON - -DUSE_GTK4=OFF - -DPORT=GTK - ${ruby_interpreter} - ) - - # https://bugs.gentoo.org/761238 - append-cppflags -DNDEBUG - - 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.32.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild diff --git a/net-libs/webkit-gtk/webkit-gtk-2.33.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.33.2.ebuild