From db50a50eb9a0ff3b33599669b270b976899da9b7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 Feb 2020 16:21:10 +0000 Subject: net-libs/webkit-gtk : version bump --- net-libs/webkit-gtk/Manifest | 2 +- .../files/2.26.2-fix-arm-non-unified-build.patch | 27 ++ .../webkit-gtk/files/2.26.2-fix-noGL-build.patch | 31 --- net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch | 27 ++ .../files/2.26.3-fix-noGL-wayland-build.patch | 39 +++ .../files/webkit-gtk-2.24.4-icu-65.patch | 53 ---- net-libs/webkit-gtk/webkit-gtk-2.26.2-r10.ebuild | 281 --------------------- net-libs/webkit-gtk/webkit-gtk-2.26.3-r10.ebuild | 280 ++++++++++++++++++++ 8 files changed, 374 insertions(+), 366 deletions(-) create mode 100644 net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch delete mode 100644 net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch create mode 100644 net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch create mode 100644 net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch delete mode 100644 net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch delete mode 100644 net-libs/webkit-gtk/webkit-gtk-2.26.2-r10.ebuild create mode 100644 net-libs/webkit-gtk/webkit-gtk-2.26.3-r10.ebuild 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 + #include 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" - -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 `