This commit is contained in:
Gerben Jan Dijkman 2021-04-15 19:59:01 +02:00
parent 690e62ac60
commit d6fe16d241
9 changed files with 537 additions and 0 deletions

View File

@ -0,0 +1 @@
DIST gnome-online-accounts-3.39.92.tar.xz 860808 BLAKE2B 7783222514bc223c09e70570d628ae4a4636d3a3133d33fab3524ded5776951181f0496f9b9226bf6fab0d015ed8ff8fdb016fb63fe8cf38edb21c90a8140505 SHA512 b93d8aaf848ea581dda80c13912cf87e1a7eb95faa8a983cf919d2732b798a7a95059246f530caad15a89172428577eb43a1100a74ae8a72eae72bed9570bc16

View File

@ -0,0 +1,80 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
GNOME2_LA_PUNT="yes"
VALA_USE_DEPEND="vapigen"
inherit gnome2 vala
DESCRIPTION="GNOME framework for accessing online accounts"
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
LICENSE="LGPL-2+"
SLOT="0/1"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
IUSE="debug gnome +introspection kerberos +vala"
REQUIRED_USE="vala? ( introspection )"
# pango used in goaeditablelabel
# libsoup used in goaoauthprovider
# goa kerberos provider is incompatible with app-crypt/heimdal, see
# https://bugzilla.gnome.org/show_bug.cgi?id=692250
# json-glib-0.16 needed for bug #485092
RDEPEND="
>=dev-libs/glib-2.52:2
>=app-crypt/libsecret-0.5
>=dev-libs/json-glib-0.16
dev-libs/libxml2:2
>=net-libs/libsoup-2.42:2.4
net-libs/rest:0.7
>=net-libs/webkit-gtk-2.12.0
>=x11-libs/gtk+-3.19.12:3
x11-libs/pango
introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
kerberos? (
app-crypt/gcr:0=[gtk]
app-crypt/mit-krb5 )
"
# goa-daemon can launch gnome-control-center
PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
DEPEND="${RDEPEND}
vala? ( $(vala_depend) )
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.30.0
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
dev-libs/gobject-introspection-common
gnome-base/gnome-common
"
src_prepare() {
use vala && vala_src_prepare
gnome2_src_prepare
}
src_configure() {
# TODO: Give users a way to set the G/FB/Windows Live secrets
gnome2_src_configure \
--disable-static \
--enable-backend \
--enable-documentation \
--enable-exchange \
--enable-facebook \
--enable-flickr \
--enable-foursquare \
--enable-imap-smtp \
--enable-lastfm \
--enable-media-server \
--enable-owncloud \
--enable-windows-live \
$(usex debug --enable-debug=yes ' ') \
$(use_enable kerberos) \
$(use_enable kerberos fedora) \
$(use_enable introspection) \
$(use_enable vala)
}

View File

@ -0,0 +1 @@
DIST webkitgtk-2.32.0.tar.xz 23315936 BLAKE2B a0d6c70d5fdc7d7cdcf00e505a1f067b879b905b0926ae85e6e7162dc336981fb488c3eb1c35fdc1de39b4f9f574c089f6f38e708a04e965f9df2236aef7c677 SHA512 4832a4614be24481028ca8a6480a8e6cfacd8e22f5ba9f936703c09944550056f06f75ccf8fffa7dee3f5a1d11ab1870841407745be2e61ebad6557a0934db15

View File

@ -0,0 +1,34 @@
From d553de92ed238278f51b93a2c90af7d3ff7a2da2 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Tue, 12 May 2020 15:28:45 +0300
Subject: [PATCH] Try to fix an apparent non-unified build error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp: In member function WTF::RefPtr<WebKit::InjectedBundleNodeHandle>
WebKit::InjectedBundleHitTestResult::urlElementHandle() const:
Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:57:78: error: no matching function for call to
WebKit::InjectedBundleNodeHandle::getOrCreate(WebCore::Element*)
57 | return InjectedBundleNodeHandle::getOrCreate(m_hitTestResult.URLElement());
| ^
In file included from Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:29
---
.../WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
index df8e55df1f0..26f045bd3fc 100644
--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
+++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
@@ -32,6 +32,7 @@
#include "WebImage.h"
#include <WebCore/BitmapImage.h>
#include <WebCore/Document.h>
+#include <WebCore/Element.h>
#include <WebCore/Frame.h>
#include <WebCore/FrameLoader.h>
#include <WebCore/FrameView.h>
--
2.20.1

View File

@ -0,0 +1,53 @@
From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Sat, 9 May 2020 23:11:52 +0300
Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
some build configurations
---
Source/WebCore/platform/graphics/GLContext.cpp | 5 ++++-
Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
index b217988b990..1ba0eb8a482 100644
--- a/Source/WebCore/platform/graphics/GLContext.cpp
+++ b/Source/WebCore/platform/graphics/GLContext.cpp
@@ -28,6 +28,9 @@
#if USE(GLX)
#include "GLContextGLX.h"
+#endif
+
+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
#include "OpenGLShims.h"
#endif
@@ -57,7 +60,7 @@ inline ThreadGlobalGLContext* currentContext()
static bool initializeOpenGLShimsIfNeeded()
{
-#if USE(OPENGL_ES) || USE(LIBEPOXY)
+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
return true;
#else
static bool initialized = false;
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
index 3515be452b2..82cce70f14b 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
@@ -64,7 +64,10 @@
#if USE(GLX)
#include <GL/glx.h>
-#include <WebCore/OpenGLShims.h>
+#endif
+
+#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
+#include "WebCore/OpenGLShims.h"
#endif
#if USE(GSTREAMER)
--
2.20.1

View File

@ -0,0 +1,31 @@
From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Sat, 11 Jul 2020 15:28:05 +0300
Subject: [PATCH] Try to fix another apparent non-unified build error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42: required from here
/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: error: invalid application of sizeof to incomplete type WebCore::ImageBuffer
79 | static_assert(sizeof(_Tp)>0,
| ^~~~~~~~~~~
---
Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
index 55d9e34df61..12a7a83cc61 100644
--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
@@ -19,6 +19,7 @@
#pragma once
+#include "ImageBuffer.h"
#include "RenderSVGResourceContainer.h"
#include "SVGClipPathElement.h"
#include "SVGUnitTypes.h"
--
2.20.1

View File

@ -0,0 +1,27 @@
From 25cf4db5575192fd306b7a74d496d1e10d8cfd3e Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Fri, 27 Nov 2020 22:47:30 +0200
Subject: [PATCH] [X11] Fix build with disabled OpenGL
The added PlatformDisplayX11::visual() method requires symbols from
X11/Xutil.h, which wasn't added as an explicit include with only
EGL headers indirectly pulled it in with standard build options.
---
Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
index 8fe3d3e92c88..2b2805446aad 100644
--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
@@ -30,6 +30,7 @@
#if PLATFORM(X11)
#include <X11/Xlib.h>
+#include <X11/Xutil.h>
#include <X11/extensions/Xcomposite.h>
#if PLATFORM(GTK)
#include <X11/extensions/Xdamage.h>
--
2.20.1

View File

@ -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 <EGL/egl.h>
#include <EGL/eglext.h>
+#include <EGL/eglmesaext.h>
#include <WebCore/GLContext.h>
#include <WebCore/PlatformDisplayWayland.h>
#include <WebCore/Region.h>

View File

@ -0,0 +1,300 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
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 ppc64 ~sparc x86"
IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd 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.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
"
# 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-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.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?,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? (
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
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
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}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
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 "-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=(
-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_use_find_package gles2-only OpenGLES2)
-DENABLE_GLES2=$(usex gles2-only)
-DENABLE_MINIBROWSER=$(usex examples)
-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)
-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-DENABLE_GAMEPAD=$(usex gamepad)
-DENABLE_WAYLAND_TARGET=$(usex wayland)
-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
$(cmake_use_find_package egl EGL)
$(cmake_use_find_package opengl OpenGL)
-DENABLE_X11_TARGET=$(usex X)
-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
-DENABLE_WEBGL=${opengl_enabled}
-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-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
${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
# 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"
}