From ea45049d7fdc03ce83d6ccf1cf2f9a903a5c5459 Mon Sep 17 00:00:00 2001 From: Jason Lethbridge Date: Tue, 24 Dec 2019 01:13:13 +1100 Subject: [PATCH] net-libs/webkit-gtk: bump to 2.26.2 with evolution patch bug #699156 --- mail-client/evolution/evolution-3.30.5.ebuild | 2 +- mail-client/evolution/evolution-3.32.4.ebuild | 2 +- mail-client/geary/geary-0.12.4.ebuild | 2 +- mail-client/geary/geary-3.32.0-r1.ebuild | 2 +- mail-client/geary/geary-3.34.2.ebuild | 2 +- ...webkit-gtk-2.26.2-eglmesaext-include.patch | 10 + ...ebkit-gtk-2.26.2-evolution-exception.patch | 23 ++ .../files/webkit-gtk-2.26.2-icu-65.patch | 53 ++++ net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 282 ++++++++++++++++++ 9 files changed, 373 insertions(+), 5 deletions(-) create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.26.2-eglmesaext-include.patch create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.26.2-evolution-exception.patch create mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.26.2-icu-65.patch create mode 100644 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild diff --git a/mail-client/evolution/evolution-3.30.5.ebuild b/mail-client/evolution/evolution-3.30.5.ebuild index 4fd7868ca23..06f1515e414 100644 --- a/mail-client/evolution/evolution-3.30.5.ebuild +++ b/mail-client/evolution/evolution-3.30.5.ebuild @@ -31,7 +31,7 @@ COMMON_DEPEND=" >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 - >=net-libs/webkit-gtk-2.16.0:4 + >=net-libs/webkit-gtk-2.26.2:4[evo] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 diff --git a/mail-client/evolution/evolution-3.32.4.ebuild b/mail-client/evolution/evolution-3.32.4.ebuild index f122a35d124..100a1df7484 100644 --- a/mail-client/evolution/evolution-3.32.4.ebuild +++ b/mail-client/evolution/evolution-3.32.4.ebuild @@ -31,7 +31,7 @@ COMMON_DEPEND=" >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 - >=net-libs/webkit-gtk-2.16.0:4 + >=net-libs/webkit-gtk-2.26.2:4[evo] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 diff --git a/mail-client/geary/geary-0.12.4.ebuild b/mail-client/geary/geary-0.12.4.ebuild index a19a5f7c62e..55d21b8d997 100644 --- a/mail-client/geary/geary-0.12.4.ebuild +++ b/mail-client/geary/geary-0.12.4.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86" DEPEND=" >=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.14.0:3[introspection] - >=net-libs/webkit-gtk-2.10.0:4=[introspection] + >=net-libs/webkit-gtk-2.26.2:4=[introspection,evo] app-text/iso-codes >=dev-db/sqlite-3.12:3 diff --git a/mail-client/geary/geary-3.32.0-r1.ebuild b/mail-client/geary/geary-3.32.0-r1.ebuild index dd806a26e5b..296611b1f80 100644 --- a/mail-client/geary/geary-3.32.0-r1.ebuild +++ b/mail-client/geary/geary-3.32.0-r1.ebuild @@ -22,7 +22,7 @@ KEYWORDS="~amd64" DEPEND=" >=dev-libs/glib-2.54:2 >=x11-libs/gtk+-3.22.26:3[introspection] - >=net-libs/webkit-gtk-2.20:4=[introspection] + >=net-libs/webkit-gtk-2.26.2:4=[introspection,evo] app-text/iso-codes >=dev-db/sqlite-3.12:3 diff --git a/mail-client/geary/geary-3.34.2.ebuild b/mail-client/geary/geary-3.34.2.ebuild index 2ba8bb3a81c..24cac227b43 100644 --- a/mail-client/geary/geary-3.34.2.ebuild +++ b/mail-client/geary/geary-3.34.2.ebuild @@ -24,7 +24,7 @@ DEPEND=" >=dev-libs/glib-2.54:2 >=gui-libs/libhandy-0.0.9:0.0= >=x11-libs/gtk+-3.22.26:3[introspection] - >=net-libs/webkit-gtk-2.20:4=[introspection] + >=net-libs/webkit-gtk-2.26.2:4=[introspection,evo] app-text/gspell[vala] app-text/iso-codes >=dev-db/sqlite-3.12:3 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-eglmesaext-include.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-eglmesaext-include.patch new file mode 100644 index 00000000000..9c277e719d8 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-eglmesaext-include.patch @@ -0,0 +1,10 @@ +--- webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-08-26 17:55:46.000000000 +0300 ++++ webkitgtk-2.24.4.orig/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 2019-11-04 23:33:44.146933810 +0300 +@@ -31,6 +31,7 @@ + #include "WebKitWaylandServerProtocol.h" + #include + #include ++#include + #include + #include + #include diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-evolution-exception.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-evolution-exception.patch new file mode 100644 index 00000000000..e29e6fdfc25 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-evolution-exception.patch @@ -0,0 +1,23 @@ +Index: webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +=================================================================== +--- webkitgtk.orig/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp ++++ webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +@@ -348,8 +348,16 @@ ALLOW_DEPRECATED_DECLARATIONS_END + configuration.setLocalStorageDirectory(FileSystem::stringFromFileSystemRepresentation(priv->localStorageDirectory.data())); + + const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS"); +- if (useSingleWebProcess && strcmp(useSingleWebProcess, "0")) +- configuration.setUsesSingleWebProcess(true); ++ if (useSingleWebProcess) { ++ if (strcmp(useSingleWebProcess, "0")) { ++ configuration.setUsesSingleWebProcess(true); ++ } ++ } else { ++ const char* prgname = g_get_prgname(); ++ if (!g_strcmp0(prgname, "evolution") || !g_strcmp0(prgname, "geary")) { ++ configuration.setUsesSingleWebProcess(true); ++ } ++ } + priv->processPool = WebProcessPool::create(configuration); + + if (!priv->websiteDataManager) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-icu-65.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-icu-65.patch new file mode 100644 index 00000000000..475c9851e63 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-icu-65.patch @@ -0,0 +1,53 @@ +From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Fri, 4 Oct 2019 22:17:11 +0200 +Subject: [PATCH] Add missing semicolons to fix build with icu 65.1 + +--- + Source/WTF/wtf/URLHelpers.cpp | 2 +- + Source/WebCore/dom/Document.cpp | 6 +++--- + 4 files changed, 25 insertions(+), 4 deletions(-) + +diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp +index 18e7f13cd61..c584f1a0cb7 100644 +--- a/Source/WTF/wtf/URLHelpers.cpp ++++ b/Source/WTF/wtf/URLHelpers.cpp +@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt + Optional previousCodePoint; + while (i < length) { + UChar32 c; +- U16_NEXT(buffer, i, length, c) ++ U16_NEXT(buffer, i, length, c); + UErrorCode error = U_ZERO_ERROR; + UScriptCode script = uscript_getScript(c, &error); + if (error != U_ZERO_ERROR) { +diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp +index 0fd0fa090bf..01f76850f3d 100644 +--- a/Source/WebCore/dom/Document.cpp ++++ b/Source/WebCore/dom/Document.cpp +@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -5019,7 +5019,7 @@ ExceptionOr> Document::parseQualifiedName(cons + + for (unsigned i = 0; i < length; ) { + UChar32 c; +- U16_NEXT(qualifiedName, i, length, c) ++ U16_NEXT(qualifiedName, i, length, c); + if (c == ':') { + if (sawColon) + return Exception { InvalidCharacterError }; +-- +2.23.0 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild new file mode 100644 index 00000000000..8793d0c4622 --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2019 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_5,3_6,3_7} ) +USE_RUBY="ruby24 ruby25 ruby26" + +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="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" + +IUSE="aqua coverage doc +egl +evo +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify +opengl spell wayland +webgl +X" + +# webgl needs gstreamer, bug #560612 +# gstreamer with opengl/gles2 needs egl +REQUIRED_USE=" + geolocation? ( introspection ) + gles2? ( egl !opengl ) + gstreamer? ( opengl? ( egl ) ) + webgl? ( gstreamer + || ( gles2 opengl ) ) + 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 OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) +# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) +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: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.48: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.8.0 + media-libs/libwebp:= + >=dev-libs/glib-2.40:2 + >=dev-libs/libxslt-1.1.7 + media-libs/woff2 + gnome-keyring? ( app-crypt/libsecret ) + geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) + 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?,gles2?,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= ) + + egl? ( media-libs/mesa[egl] ) + gles2? ( media-libs/mesa[gles2] ) + opengl? ( virtual/opengl ) + webgl? ( + x11-libs/libXcomposite + x11-libs/libXdamage ) +" + +# 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/gtk-doc-am-1.10 + >=dev-util/gperf-3.0.1 + >=sys-devel/bison-2.4.3 + || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 ) + sys-devel/gettext + virtual/pkgconfig + + >=dev-lang/perl-5.10 + virtual/perl-Data-Dumper + virtual/perl-Carp + virtual/perl-JSON-PP + + 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 ) ) + +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++11 ; then + die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" + fi + + if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then + die 'The active compiler needs to be gcc 4.9 (or newer)' + fi + fi + + if ! use opengl && ! use gles2; then + ewarn + ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) 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}/${P}-icu-65.patch" # bug 698596 + eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054 + if use evo; then + eapply "${FILESDIR}/${P}-evolution-exception.patch" # bug 699156 + fi + 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 + + # Multiple rendering bugs on youtube, github, etc without this, bug #547224 + append-flags $(test-flags -fno-strict-aliasing) + + # Ruby situation is a bit complicated. See bug 513888 + local rubyimpl + local ruby_interpreter="" + for rubyimpl in ${USE_RUBY}; do + if has_version "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? + # + # FTL_JIT requires llvm + # + # opengl needs to be explicetly handled, bug #576634 + + local opengl_enabled + if use opengl || use gles2; then + opengl_enabled=ON + else + opengl_enabled=OFF + fi + + local mycmakeargs=( + -DENABLE_BUBBLEWRAP_SANDBOX=OFF # TODO: Possibly make into a useflag + -DENABLE_QUARTZ_TARGET=$(usex aqua) + -DENABLE_API_TESTS=$(usex test) + -DENABLE_GTKDOC=$(usex doc) + -DENABLE_GEOLOCATION=$(usex geolocation) + $(cmake-utils_use_find_package gles2 OpenGLES2) + -DENABLE_GLES2=$(usex gles2) + -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 + -DUSE_WPE_RENDERER=OFF # TODO: Possibly make into a useflag + -DENABLE_SPELLCHECK=$(usex spell) + -DENABLE_WAYLAND_TARGET=$(usex wayland) + -DENABLE_WEBGL=$(usex webgl) + $(cmake-utils_use_find_package egl EGL) + $(cmake-utils_use_find_package opengl OpenGL) + -DENABLE_X11_TARGET=$(usex X) + -DENABLE_OPENGL=${opengl_enabled} + -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" +} -- 2.24.1