From b6825b367eab5028b16c0907070129c85c71b767 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Fri, 31 Jan 2020 20:07:29 +0200 Subject: 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 --- .../files/2.26.3-fix-noGL-wayland-build.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch (limited to 'net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch') 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 000000000000..4549f1712e6c --- /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: "commit-queue@webkit.org" + +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 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 + -- cgit v1.2.3