commit: b6825b367eab5028b16c0907070129c85c71b767 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Fri Jan 31 18:07:29 2020 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Fri Jan 31 19:18:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6825b36
net-libs/webkit-gtk: security bump to 2.26.3, fix gtk-doc Move gtk-doc building from USE=doc to USE=gtk-doc, as the latter is the one to use now for when generating gtk-doc from scratch. Fix it with perl-based gtk-doc by stripping out some tags in the docs completely; this was already fixed upstream, but that fix seems dependent on newer gtk-doc handling the markdown quoting that got added. So remove the tags completely until we can depend on a newer gtk-doc that doesn't have trouble with the upstream way. Also a build fix for USE="wayland -opengl -gles2-only" (but remember: you shouldn't disable both opengl and gles2-only on any real desktop system). Bug: https://bugs.gentoo.org/706374 Bug: https://bugs.gentoo.org/704550 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> net-libs/webkit-gtk/Manifest | 1 + net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch | 27 ++ .../files/2.26.3-fix-noGL-wayland-build.patch | 39 +++ net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild | 287 +++++++++++++++++++++ 4 files changed, 354 insertions(+) diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index db8394225ff..b34080964f4 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,2 +1,3 @@ DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112 DIST webkitgtk-2.26.2.tar.xz 19330000 BLAKE2B c0142aa19572c96e3dff11251316a4527be0357cf101177e056dd40aa9b5346216a4dcc14071d9c1240c101bd03f2179559d0d2bd81308967aba8530208186e0 SHA512 98d47282fd8f766dbe4a74c1a3f618aaeeeed69bd0666ed4e8674ae562b634681b3bd18b0d428df6bfefbaa3e18eb4cfb2fb077f5be4fed34cbc81c8293ec33e +DIST webkitgtk-2.26.3.tar.xz 19331900 BLAKE2B 14c31b0f640b0f859a3c1eeda542f176f6c7981270c5be3225556eb4a1027a2511039cf0f33682faa93846c4ca5ed64158574a9b8a662a4a200b97cad28d5ed0 SHA512 9575c86ab5752c09841878cf55134e7de9a87200e55017859cd02affb1cadd58031a7b6f67a580e87a1dfe4fc830fed9774ba289e7244d3ead9eb9328e76d7c9 diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch new file mode 100644 index 00000000000..85328be1a5c --- /dev/null +++ b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch @@ -0,0 +1,27 @@ +Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix this, +but it looks like it's not enough with older perl-based gtk-doc. +Keep this extra patch only until we can't depend on a newer gtk-doc version, which +should be retested whether this patch is unnecessary then. + +Upstream extra reference for the above reference commit: +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp +index 023b14c33f4..657b1febf5d 100644 +--- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp ++++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp +@@ -1505,7 +1505,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass) + * WebKitSettings:enable-media: + * + * Enable or disable support for media playback on pages. This setting is enabled by +- * default. Disabling it means `<audio>`, `<track>` and `<video>` elements will have ++ * default. Disabling it means audio, track and video elements will have + * playback support disabled. + * + * Since: 2.26 +-- +2.20.1 + diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch b/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch new file mode 100644 index 00000000000..4549f1712e6 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch @@ -0,0 +1,39 @@ +From 874dceeafc08edc979093509dff3ee6a8b25c432 Mon Sep 17 00:00:00 2001 +From: "[email protected]" + <[email protected]@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Thu, 19 Sep 2019 02:34:49 +0000 +Subject: [PATCH] [GTK] Compilation errors when GL is disabled + https://bugs.webkit.org/show_bug.cgi?id=200223 + +Fix following compilation error when building with ENABLE_OPENGL=OFF +../../Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:123:51: error: use of undeclared identifier 'WaylandCompositor' +parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName(); + ^ +Patch by Yury Semikhatsky <[email protected]> on 2019-09-18 +Reviewed by Philippe Normand. + +* UIProcess/glib/WebProcessPoolGLib.cpp: +(WebKit::WebProcessPool::platformInitializeWebProcess): only make a call when using EGL, this matches +guards in WaylandCompositor.h. The condition was changed in r245807. + +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250077 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp +index 37ece2f4576..a380a25fa4b 100644 +--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp ++++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp +@@ -119,7 +119,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process + parameters.hostClientFileDescriptor = wpe_renderer_host_create_client(); + parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name()); + } +-#else ++#elif USE(EGL) + parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName(); + #endif + } +-- +2.20.1 + diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild new file mode 100644 index 00000000000..0a63fc77b7a --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild @@ -0,0 +1,287 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +CMAKE_MAKEFILE_GENERATOR="ninja" +PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +USE_RUBY="ruby24 ruby25 ruby26 ruby27" +CMAKE_MIN_VERSION=3.10 + +inherit check-reqs cmake-utils 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 ~ia64 ~ppc64 ~sparc ~x86" + +IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X" + +# gstreamer with opengl/gles2 needs egl +REQUIRED_USE=" + gles2-only? ( egl !opengl ) + gstreamer? ( opengl? ( 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.26 +# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) +wpe_depend=" + >=gui-libs/libwpe-1.3.0:1.0 + >=gui-libs/wpebackend-fdo-1.3.1: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-3.8.1-r1:= + 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.32.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?] + 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? ( + 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? ( + opengl? ( ${wpe_depend} ) + gles2-only? ( ${wpe_depend} ) + ) + + seccomp? ( + >=sys-apps/bubblewrap-0.3.1 + sys-libs/libseccomp + sys-apps/xdg-dbus-proxy + ) +" +unset wpe_depend +# paxctl needed for bug #407085 +# Need real bison, not yacc +DEPEND="${RDEPEND} + ${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.10 ) + geolocation? ( dev-util/gdbus-codegen ) +" +# 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 + + if ! use opengl && ! use gles2-only; then + ewarn + ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-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}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108 + eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194 + eapply "${FILESDIR}"/${PV}-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32 + eapply "${FILESDIR}"/${PV}-fix-noGL-wayland-build.patch + cmake-utils_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 "-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 --host-root "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=( + -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) + -DENABLE_QUARTZ_TARGET=$(usex aqua) + -DENABLE_API_TESTS=$(usex test) + -DENABLE_GTKDOC=$(usex gtk-doc) + -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) + $(cmake-utils_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) + -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland + $(cmake-utils_use_find_package egl EGL) + $(cmake-utils_use_find_package opengl OpenGL) + -DENABLE_X11_TARGET=$(usex X) + -DENABLE_OPENGL=${opengl_enabled} + -DENABLE_WEBGL=${opengl_enabled} + -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) + -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that + -DCMAKE_BUILD_TYPE=Release + -DPORT=GTK + ${ruby_interpreter} + ) + + # Allow it to use GOLD when possible as it has all the magic to + # detect when to use it and using gold for this concrete package has + # multiple advantages and is also the upstream default, bug #585788 +# if tc-ld-is-gold ; then +# mycmakeargs+=( -DUSE_LD_GOLD=ON ) +# else +# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) +# fi + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_test() { + # Prevents test failures on PaX systems + pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* + + cmake-utils_src_test +} + +src_install() { + cmake-utils_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" +}
