aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-11-24 14:31:09 +0100
committerRasmus Thomsen <oss@cogitri.dev>2020-11-24 16:26:19 +0000
commit98b16a027f2e7fd79ad212577ff548a2dabc9045 (patch)
tree2427015c9d4a7f0344720bfb7ed342c9fa9b52f9
parent77e786238cb7998304cfd8fe07f2a27fc6a2a72e (diff)
downloadaports-98b16a027f2e7fd79ad212577ff548a2dabc9045.tar.gz
aports-98b16a027f2e7fd79ad212577ff548a2dabc9045.tar.bz2
aports-98b16a027f2e7fd79ad212577ff548a2dabc9045.tar.xz
community/webkit2gtk: upgrade to 2.30.3
fixes #12133
-rw-r--r--community/webkit2gtk/APKBUILD15
-rw-r--r--community/webkit2gtk/use-versioned-libwpe.patch13
2 files changed, 7 insertions, 21 deletions
diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD
index 360b5c80e4..678a56ab0f 100644
--- a/community/webkit2gtk/APKBUILD
+++ b/community/webkit2gtk/APKBUILD
@@ -3,11 +3,11 @@
# Contributor: Jiri Horner <laeqten@gmail.com>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=webkit2gtk
-pkgver=2.28.4
+pkgver=2.30.3
pkgrel=0
pkgdesc="Portable web rendering engine WebKit for GTK+"
url="https://webkitgtk.org/"
-arch="all"
+arch="all !mips !mips64"
license="LGPL-2.0-or-later AND BSD-2-Clause"
depends="bubblewrap xdg-dbus-proxy dbus:org.freedesktop.Secrets"
makedepends="
@@ -42,7 +42,7 @@ makedepends="
openjpeg-tools
pango-dev
paxmark
- python2
+ python3
ruby
samurai
sqlite-dev
@@ -59,7 +59,6 @@ source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz
musl-fixes.patch
fix-openjpeg.patch
lower-stack-usage.patch
- use-versioned-libwpe.patch
"
builddir="$srcdir/webkitgtk-$pkgver"
@@ -193,7 +192,7 @@ build() {
# disable _FORTIFY_SOURCE to work around:
# cc1plus: out of memory allocating 65536 bytes after a total of 3131101184 bytes
x86) CXXFLAGS="$CXXFLAGS -U_FORTIFY_SOURCE";;
- armhf|armv7|ppc64le|s390x) _archopt="-DENABLE_JIT=OFF";;
+ armhf|ppc64le|s390x) _archopt="-DENABLE_JIT=OFF";;
esac
# reduce memory usage on 32 bit
@@ -217,6 +216,7 @@ build() {
-DUSE_WOFF2=ON \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DUSE_LD_GOLD=OFF \
+ -DUSE_SYSTEMD=OFF \
$_archopt \
..
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923476
@@ -234,9 +234,8 @@ package() {
paxmark -m "$pkgdir"/usr/libexec/webkit2gtk-4.0/WebKitWebProcess
}
-sha512sums="227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1 webkitgtk-2.28.4.tar.xz
+sha512sums="cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf webkitgtk-2.30.3.tar.xz
e1537b9937af1cb936669d405993a52204cb9968b8b3161cb12a3f3f1343c260088c9490fcd7a7deeab6dbabdb5f7ce7e6cb2f857b9f0a4205aba6db2b11fb20 fix-fast-memory-disabled.patch
4c0093e4a38c8ceb3ac92b94539ec1417241814a84abd157442f53f710ecbaf9c2345e258b8ad86d5e0908cacbfca6cad28dedd11c127756b65428f359ba9fcc musl-fixes.patch
c517c012f5630ef6be5be7d9592c5e042a070f849a141859edefa7984acb98dbd0d718fe6613cd35ba3b7d8530beebcc7408fd077cd914ed335c5e524e9e746a fix-openjpeg.patch
-7d883fc35d0c6bfaa6bff8e9dbcaeaa9b7d7322852e874d8acc78d41a5aad5595650ec62444048e43aa349471cb16e5aed29e684207fc8d3421030e878ba1fa9 lower-stack-usage.patch
-82540900a7117e56336fd320692bf4201047a1473050ff3722ba89623551d50925d9e3dde816ed38bfe2145397362ad7eec50332cb53822250c71eea65ec51f0 use-versioned-libwpe.patch"
+7d883fc35d0c6bfaa6bff8e9dbcaeaa9b7d7322852e874d8acc78d41a5aad5595650ec62444048e43aa349471cb16e5aed29e684207fc8d3421030e878ba1fa9 lower-stack-usage.patch"
diff --git a/community/webkit2gtk/use-versioned-libwpe.patch b/community/webkit2gtk/use-versioned-libwpe.patch
deleted file mode 100644
index 347e992b1e..0000000000
--- a/community/webkit2gtk/use-versioned-libwpe.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-index 180f392a..85639a11 100644
---- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-@@ -115,7 +115,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
- #if PLATFORM(WAYLAND)
- if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) {
- #if USE(WPE_RENDERER)
-- wpe_loader_init("libWPEBackend-fdo-1.0.so");
-+ wpe_loader_init("libWPEBackend-fdo-1.0.so.1");
- if (wpe_fdo_initialize_for_egl_display(WebCore::PlatformDisplay::sharedDisplay().eglDisplay())) {
- parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
- parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());