commit 4f9396bd0c6a418d361241d229227edf8b5a3187
parent 6855e0e636ea15acb57744a85623ef7dd382e72a
Author: Cem Keylan <cem@ckyln.com>
Date: Thu, 23 Jan 2020 17:50:40 +0300
webkit2gtk: update and move to extra
Diffstat:
13 files changed, 59 insertions(+), 112 deletions(-)
diff --git a/extra/webkit2gtk/build b/extra/webkit2gtk/build
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+
+patch -p1 < fix-musl.patch
+
+# Remove gettext requirement.
+sed -i 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c
+sed -i '/po_files *.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt
+sed -i '/^GETTEXT_C/d' Source/WebCore/platform/gtk/po/CMakeLists.txt
+
+export DESTDIR="$1"
+
+cmake -B build \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=/usr/lib \
+ -DPORT=GTK \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
+ -DENABLE_GEOLOCATION=OFF \
+ -DENABLE_GLES2=ON \
+ -DENABLE_INTL=OFF \
+ -DENABLE_INTROSPECTION=OFF \
+ -DENABLE_MINIBROWSER=OFF \
+ -DENABLE_OPENGL=OFF \
+ -DENABLE_SPELLCHECK=OFF \
+ -DENABLE_VIDEO=OFF \
+ -DENABLE_WEBGL=OFF \
+ -DENABLE_WEB_AUDIO=OFF \
+ -DUSE_LIBHYPHEN=OFF \
+ -DUSE_LIBNOTIFY=OFF \
+ -DUSE_LIBSECRET=OFF \
+ -DUSE_OPENJPEG=OFF \
+ -DUSE_WOFF2=OFF \
+ -DUSE_WPE_RENDERER=OFF \
+ -DENABLE_WEB_CRYPTO=OFF \
+ -Wno-dev
+
+cmake --build build
+cmake --install build
diff --git a/extra/webkit2gtk/checksums b/extra/webkit2gtk/checksums
@@ -0,0 +1,2 @@
+add51153943cc11d90a7038d0ea5f6332281e6c0be0640f802a211b035f0e611 webkitgtk-2.26.3.tar.xz
+b83f933a8e2309a8845010b8839043dd98a147a74609c6f16f51fea5728ad746 fix-musl.patch
diff --git a/extra/webkit2gtk/depends b/extra/webkit2gtk/depends
@@ -0,0 +1,15 @@
+gtk+3
+glib-networking
+cairo
+cmake make
+gperf make
+harfbuzz-icu
+libXslt
+libgcrypt
+libsoup
+libwebp
+mesa
+perl make
+python make
+ruby make
+sqlite
diff --git a/testing/webkit2gtk/patches/fix-musl.patch b/extra/webkit2gtk/patches/fix-musl.patch
diff --git a/extra/webkit2gtk/sources b/extra/webkit2gtk/sources
@@ -0,0 +1,2 @@
+https://webkitgtk.org/releases/webkitgtk-2.26.3.tar.xz
+patches/fix-musl.patch
diff --git a/extra/webkit2gtk/version b/extra/webkit2gtk/version
@@ -0,0 +1 @@
+ 2.26.3 1
diff --git a/testing/webkit2gtk/build b/testing/webkit2gtk/build
@@ -1,41 +0,0 @@
-#!/bin/sh -e
-
-for patch in *.patch; do
- patch -p1 < "$patch"
-done
-
-# Remove gettext requirement.
-sed -i 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c
-sed -i '/po_files *.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt
-sed -i '/^GETTEXT_C/d' Source/WebCore/platform/gtk/po/CMakeLists.txt
-
-export DESTDIR="$1"
-
-cmake -B build \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=/usr/lib \
- -DPORT=GTK \
- -DCMAKE_SKIP_RPATH=ON \
- -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
- -DENABLE_GEOLOCATION=OFF \
- -DENABLE_GLES2=ON \
- -DENABLE_INTL=OFF \
- -DENABLE_INTROSPECTION=OFF \
- -DENABLE_MINIBROWSER=OFF \
- -DENABLE_OPENGL=OFF \
- -DENABLE_SPELLCHECK=OFF \
- -DENABLE_VIDEO=OFF \
- -DENABLE_WEBGL=OFF \
- -DENABLE_WEB_AUDIO=OFF \
- -DUSE_LIBHYPHEN=OFF \
- -DUSE_LIBNOTIFY=OFF \
- -DUSE_LIBSECRET=OFF \
- -DUSE_OPENJPEG=OFF \
- -DUSE_WOFF2=OFF \
- -DUSE_WPE_RENDERER=OFF \
- -DENABLE_WEB_CRYPTO=OFF \
- -Wno-dev
-
-cmake --build build
-cmake --install build
diff --git a/testing/webkit2gtk/checksums b/testing/webkit2gtk/checksums
@@ -1,4 +0,0 @@
-6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512 webkitgtk-2.26.2.tar.xz
-c1abca4dbce87661b1fc378a84d3e9ed233b2b81872dcaf1bf7d2a0de0bc4c35 u16-fix.patch
-b83f933a8e2309a8845010b8839043dd98a147a74609c6f16f51fea5728ad746 fix-musl.patch
-5ba3114a3137917e6a8dac67f167177bbe39ee66b057cc2efb7a628739bda9c7 nogl.patch
diff --git a/testing/webkit2gtk/depends b/testing/webkit2gtk/depends
@@ -1,15 +0,0 @@
-gtk+3
-glib-networking
-cairo
-cmake
-gperf
-harfbuzz-icu
-libXslt
-libgcrypt
-libsoup
-libwebp
-mesa
-perl make
-python
-ruby
-sqlite
diff --git a/testing/webkit2gtk/patches/nogl.patch b/testing/webkit2gtk/patches/nogl.patch
@@ -1,10 +0,0 @@
---- 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/patches/u16-fix.patch b/testing/webkit2gtk/patches/u16-fix.patch
@@ -1,37 +0,0 @@
---- webkitgtk-2.26.2/Source/WTF/wtf/URLHelpers.cpp
-+++ webkitgtk-2.26.2-patched/Source/WTF/wtf/URLHelpers.cpp
-@@ -301,7 +301,7 @@
- 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) {
---- webkitgtk-2.26.2/Source/WebCore/dom/Document.cpp
-+++ webkitgtk-2.26.2-patched/Source/WebCore/dom/Document.cpp
-@@ -4944,12 +4944,12 @@
- 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;
- }
-@@ -5009,7 +5009,7 @@
-
- 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 };
diff --git a/testing/webkit2gtk/sources b/testing/webkit2gtk/sources
@@ -1,4 +0,0 @@
-https://webkitgtk.org/releases/webkitgtk-2.26.2.tar.xz
-patches/u16-fix.patch
-patches/fix-musl.patch
-patches/nogl.patch
diff --git a/testing/webkit2gtk/version b/testing/webkit2gtk/version
@@ -1 +0,0 @@
- 2.26.2 1
