From 2ca39beaac4d9c689638471d57e9824f9f016c1f Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Wed, 15 Jan 2020 19:02:33 +0300 Subject: webkit2gtk: builds now --- testing/webkit2gtk/build | 4 +++- testing/webkit2gtk/checksums | 1 + testing/webkit2gtk/patches/nogl.patch | 10 ++++++++++ testing/webkit2gtk/sources | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 testing/webkit2gtk/patches/nogl.patch (limited to 'testing') diff --git a/testing/webkit2gtk/build b/testing/webkit2gtk/build index 99377bef..2e593ab6 100755 --- a/testing/webkit2gtk/build +++ b/testing/webkit2gtk/build @@ -2,13 +2,15 @@ patch -p1 < u16-fix.patch patch -p0 < fix-musl.patch +patch -p1 < nogl.patch mkdir build cd build +CFLAGS="${CFLAGS} -Wno-expansion-to-defined" \ +CXXFLAGS="${CXXFLAGS} -Wno-expansion-to-defined" \ cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_ACCESSIBILITY=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ -DPORT=GTK \ diff --git a/testing/webkit2gtk/checksums b/testing/webkit2gtk/checksums index e4c6b508..9687e7ed 100644 --- a/testing/webkit2gtk/checksums +++ b/testing/webkit2gtk/checksums @@ -1,3 +1,4 @@ 6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512 webkitgtk-2.26.2.tar.xz c1abca4dbce87661b1fc378a84d3e9ed233b2b81872dcaf1bf7d2a0de0bc4c35 u16-fix.patch 7c0b0b8c63981b30d26893fd5aa0a226312b7d8b90b0a6e2100348c7d111a79e fix-musl.patch +5ba3114a3137917e6a8dac67f167177bbe39ee66b057cc2efb7a628739bda9c7 nogl.patch diff --git a/testing/webkit2gtk/patches/nogl.patch b/testing/webkit2gtk/patches/nogl.patch new file mode 100644 index 00000000..72e5a53b --- /dev/null +++ b/testing/webkit2gtk/patches/nogl.patch @@ -0,0 +1,10 @@ +--- webkitgtk-2.26.2/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h ++++ webkitgtk-2.26.2-patched/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h +@@ -212,7 +212,6 @@ + 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; } diff --git a/testing/webkit2gtk/sources b/testing/webkit2gtk/sources index 6962286f..5453bf36 100644 --- a/testing/webkit2gtk/sources +++ b/testing/webkit2gtk/sources @@ -1,3 +1,4 @@ https://webkitgtk.org/releases/webkitgtk-2.26.2.tar.xz patches/u16-fix.patch patches/fix-musl.patch +patches/nogl.patch -- cgit v1.2.3