net-libs/webkit-gtk : version bump

3 files changed, 3 insertions, 43 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 6814f538..1169d39e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1 @@
-DIST webkitgtk-2.26.3.tar.xz 19331900 BLAKE2B 14c31b0f640b0f859a3c1eeda542f176f6c7981270c5be3225556eb4a1027a2511039cf0f33682faa93846c4ca5ed64158574a9b8a662a4a200b97cad28d5ed0 SHA512 9575c86ab5752c09841878cf55134e7de9a87200e55017859cd02affb1cadd58031a7b6f67a580e87a1dfe4fc830fed9774ba289e7244d3ead9eb9328e76d7c9
+DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
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
deleted file mode 100644
index 4549f171..00000000
--- a/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 874dceeafc08edc979093509dff3ee6a8b25c432 Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@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 <yurys@chromium.org> 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-r10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r10.ebuild
index fcd6ed79..8dfc04f6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.3-r10.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 CMAKE_MIN_VERSION=3.10
 
 inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs virtualx
@@ -164,8 +164,7 @@ 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
+	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }