aboutsummaryrefslogtreecommitdiffstats
path: root/community/webkit2gtk/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'community/webkit2gtk/APKBUILD')
-rw-r--r--community/webkit2gtk/APKBUILD74
1 files changed, 48 insertions, 26 deletions
diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD
index ce57ab2be5..eddcba2132 100644
--- a/community/webkit2gtk/APKBUILD
+++ b/community/webkit2gtk/APKBUILD
@@ -1,13 +1,14 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
# Contributor: Jiri Horner <laeqten@gmail.com>
# Maintainer: Jiri Horner <laeqten@gmail.com>
pkgname=webkit2gtk
-pkgver=2.22.7
+pkgver=2.24.3
pkgrel=0
pkgdesc="Portable web rendering engine WebKit for GTK+"
url="https://webkitgtk.org/"
arch="all"
-license="LGPL-2.0-or-later BSD-2-Clause"
+license="LGPL-2.0-or-later AND BSD-2-Clause"
options="!check" # 2.20.3-r1 no idea why gtest is removed in prepare
makedepends="
bison
@@ -35,6 +36,9 @@ makedepends="
libxslt-dev
libxt-dev
mesa-dev
+ ninja
+ openjpeg-dev
+ openjpeg-tools
pango-dev
paxmark
python2
@@ -42,15 +46,28 @@ makedepends="
sqlite-dev
"
replaces="webkit"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+options="!check" # upstream doesn't package them in release tarballs: Tools/Scripts/run-gtk-tests: Command not found
+subpackages="$pkgname-dev $pkgname-lang"
source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz
fix-fast-memory-disabled.patch
- fix_armv6l.patch
musl-fixes.patch
+ fix-openjpeg.patch
"
builddir="$srcdir/webkitgtk-$pkgver"
# secfixes:
+# 2.24.1-r0:
+# - CVE-2019-6251
+# - CVE-2019-8506
+# - CVE-2019-8524
+# - CVE-2019-8535
+# - CVE-2019-8536
+# - CVE-2019-8544
+# - CVE-2019-8551
+# - CVE-2019-8558
+# - CVE-2019-8559
+# - CVE-2019-8563
+# - CVE-2019-11070
# 2.22.7-r0:
# - CVE-2018-4437
# - CVE-2019-6212
@@ -81,48 +98,53 @@ builddir="$srcdir/webkitgtk-$pkgver"
# - CVE-2017-2371
# - CVE-2017-2373
-prepare() {
- default_prepare
- cd "$builddir"
- rm -r Source/ThirdParty/gtest/
-}
-
build() {
local _archopt=
case "$CARCH" in
- armhf) _archopt="-DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF -DUSE_SYSMEM_MALLOC=ON";;
- aarch64) _archopt="-DUSE_LD_GOLD=OFF";;
- ppc64le) _archopt="-DENABLE_JIT=OFF -DUSE_SYSMTE_MALLOC=ON";;
- s390x) _archopt="-DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF -DUSE_SYSMEM_MALLOC=ON";;
+ # 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";;
esac
- cd "$builddir"
+ # reduce memory usage on 32 bit
+ # https://bugs.webkit.org/show_bug.cgi?id=199272
+ export CXXFLAGS="$CXXFLAGS -g1"
+
mkdir build
cd build
- cmake -DPORT=GTK \
- -DCMAKE_BUILD_TYPE=Release \
+ cmake -GNinja \
+ -DPORT=GTK \
+ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_INSTALL_DIR=/usr/lib \
-DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \
- -DENABLE_GTKDOC=ON \
+ -DENABLE_GTKDOC=OFF \
-DENABLE_GEOLOCATION=OFF \
-DENABLE_PLUGIN_PROCESS_GTK2=OFF \
-DENABLE_SAMPLING_PROFILER=OFF \
- -DUSE_WOFF2=OFF\
+ -DENABLE_MINIBROWSER=ON \
+ -DUSE_WOFF2=OFF \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
$_archopt \
..
- make
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923476
+ ninja JavaScriptCore-4-gir
+ ninja
+}
+
+check() {
+ ninja -C "$builddir"/build check
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C "$builddir"/build install
# needed for JIT
paxmark -m "$pkgdir"/usr/lib/webkit2gtk-4.0/WebKitWebProcess
}
-sha512sums="c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126 webkitgtk-2.22.7.tar.xz
-9d7de4755c21d2573103dde326bb86ba37d54032627cb1bd362138906ac1d6a1dc48d4e548f29e29dc507831bae833ac5a8d2cf7fdb3d6a9d5bd5fb06f222b00 fix-fast-memory-disabled.patch
-f8fad1450d87f1cb195818cddb8a2307616916612e4676a4d71a20d58864d1c153550e4465a128e04f136c437518a4b90f1fa685ef6519fa8054637760635c72 fix_armv6l.patch
-922957ae400853bcfd5bff2c4e5b98a8351227a0b3b759dc34913ea5c8437e852899467a293cd2fb7a67f65022c4e99506f2be3c54fbcd74f038eb98ac02189e musl-fixes.patch"
+sha512sums="b358bb11f7df477e5b3d6a12e2e6b41cb4e6a7274e34ce6299bf0c56044ffc7db5a834e9abf5c71d992ef41d194d30171b8be406420ffc54fe766cc811afb79f webkitgtk-2.24.3.tar.xz
+e1537b9937af1cb936669d405993a52204cb9968b8b3161cb12a3f3f1343c260088c9490fcd7a7deeab6dbabdb5f7ce7e6cb2f857b9f0a4205aba6db2b11fb20 fix-fast-memory-disabled.patch
+d0d5e37822644cab071e33d325affd1ce5948b414f6f54d695e6b4a7bffadecd25c0df6dc1cb63e70127499f5a8da43b02286a3518b2488b5da32c622df45d97 musl-fixes.patch
+c517c012f5630ef6be5be7d9592c5e042a070f849a141859edefa7984acb98dbd0d718fe6613cd35ba3b7d8530beebcc7408fd077cd914ed335c5e524e9e746a fix-openjpeg.patch"