summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-libs/webkit-gtk/Manifest2
-rw-r--r--net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch27
-rw-r--r--net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch31
-rw-r--r--net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch27
-rw-r--r--net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch39
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch53
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.26.3-r10.ebuild (renamed from net-libs/webkit-gtk/webkit-gtk-2.26.2-r10.ebuild)17
7 files changed, 102 insertions, 94 deletions
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 78ec8fb2..6814f538 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1 @@
-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.2-fix-arm-non-unified-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
new file mode 100644
index 00000000..0f095990
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
@@ -0,0 +1,27 @@
+Add missing headers required during non-unified build.
+
+Unified build happens to get them included by the other sources unified
+into same source file, thus didn't fail.
+
+diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
+--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
++++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
+@@ -30,6 +30,7 @@
+
+ #include "BuiltinNames.h"
+ #include "BytecodeGenerator.h"
++#include "BytecodeStructs.h"
+ #include "CallFrame.h"
+ #include "JIT.h"
+ #include "JSCInlines.h"
+diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -23,6 +23,7 @@
+ #include "MachineStackMarker.h"
+
+ #include "ConservativeRoots.h"
++#include "CPU.h"
+ #include "MachineContext.h"
+ #include <setjmp.h>
+ #include <stdlib.h>
diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
deleted file mode 100644
index 422c71a4..00000000
--- a/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0fb66b8787a857c5c51b7efdc950a6ecf930b6ee Mon Sep 17 00:00:00 2001
-From: "ross.kirsling@sony.com"
- <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Fri, 4 Oct 2019 20:25:56 +0000
-Subject: [PATCH] Unreviewed WinCairo build fix for r250717.
-
-* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
-(WebKit::LayerTreeHost::invalidate): Deleted.
-
-
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250743 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 1 -
- 1 files changed, 0 insertions(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-index 980513647ff..d214532d852 100644
---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-@@ -212,7 +212,6 @@ inline void LayerTreeHost::scheduleLayerFlush() { }
- inline void LayerTreeHost::cancelPendingLayerFlush() { }
- inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { }
- inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
--inline void LayerTreeHost::invalidate() { }
- inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
- inline void LayerTreeHost::forceRepaint() { }
- inline bool LayerTreeHost::forceRepaintAsync(CallbackID) { return false; }
---
-2.20.1
-
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 00000000..85328be1
--- /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 00000000..4549f171
--- /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"
+ <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/files/webkit-gtk-2.24.4-icu-65.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
deleted file mode 100644
index 475c9851..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-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<UChar32> 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<std::pair<AtomString, AtomString>> 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-r10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r10.ebuild
index 35126d1f..fcd6ed79 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2-r10.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r10.ebuild
@@ -15,9 +15,9 @@ 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 x86"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+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="
@@ -63,7 +63,7 @@ RDEPEND="
gnome-keyring? ( app-crypt/libsecret )
introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
dev-libs/libtasn1:=
- spell? ( >=app-text/enchant-0.22:= )
+ 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?]
@@ -103,7 +103,6 @@ DEPEND="${RDEPEND}
${PYTHON_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
dev-lang/ruby:2.5
>=sys-devel/bison-2.4.3
@@ -112,12 +111,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
>=dev-lang/perl-5.10
- virtual/rubygems
virtual/perl-Data-Dumper
virtual/perl-Carp
virtual/perl-JSON-PP
- doc? ( >=dev-util/gtk-doc-1.10 )
+ gtk-doc? ( >=dev-util/gtk-doc-1.10 )
geolocation? ( dev-util/gdbus-codegen )
"
# test? (
@@ -164,9 +162,10 @@ pkg_setup() {
}
src_prepare() {
- eapply "${FILESDIR}/${PN}-2.24.4-icu-65.patch" # bug 698596
eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
- eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch # bug 704236
+ 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
}
@@ -223,7 +222,7 @@ src_configure() {
-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-DENABLE_QUARTZ_TARGET=$(usex aqua)
-DENABLE_API_TESTS=$(usex test)
- -DENABLE_GTKDOC=$(usex doc)
+ -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)