aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2022-07-05 18:37:50 +0000
committeralice <alice@ayaya.dev>2022-07-05 19:13:55 +0000
commit6a50759d298662e45aad397790f7b83c8f56cb8d (patch)
treeced0b1a86cfd9056a24dae32ece3615b7c17708b
parent88cf60d64e85749a3c9492ce5291ca279e18e6a6 (diff)
downloadaports-6a50759d298662e45aad397790f7b83c8f56cb8d.tar.gz
aports-6a50759d298662e45aad397790f7b83c8f56cb8d.tar.bz2
aports-6a50759d298662e45aad397790f7b83c8f56cb8d.tar.xz
community/webkit2gtk: upgrade to 2.36.4
-rw-r--r--community/webkit2gtk/APKBUILD25
1 files changed, 10 insertions, 15 deletions
diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD
index 0f99cdf4e8..5d913dbe19 100644
--- a/community/webkit2gtk/APKBUILD
+++ b/community/webkit2gtk/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Jiri Horner <laeqten@gmail.com>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=webkit2gtk
-pkgver=2.36.3
+pkgver=2.36.4
pkgrel=0
pkgdesc="Portable web rendering engine WebKit for GTK+"
url="https://webkitgtk.org/"
@@ -57,6 +57,9 @@ source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz"
builddir="$srcdir/webkitgtk-$pkgver"
# secfixes:
+# 2.36.4-r0:
+# - CVE-2022-22677
+# - CVE-2022-22710
# 2.36.1-r0:
# - CVE-2022-30293
# - CVE-2022-30294
@@ -274,27 +277,20 @@ builddir="$srcdir/webkitgtk-$pkgver"
# - CVE-2017-2373
build() {
- local _archopt=
+ # TODO: both of the below memory issues are solved with clang, but
+ # clang fails to build armv7 only due to some NEON related thing.
case "$CARCH" in
- x86)
+ armhf|x86)
# disable _FORTIFY_SOURCE to work around:
# cc1plus: out of memory allocating 65536 bytes after a total of 3131101184 bytes
CXXFLAGS="$CXXFLAGS -U_FORTIFY_SOURCE"
;;
- armhf)
- CXXFLAGS="$CXXFLAGS -U_FORTIFY_SOURCE"
- _archopt="-DENABLE_JIT=OFF"
- ;;
- ppc64le|s390x)
- _archopt="-DENABLE_JIT=OFF"
- ;;
esac
- # reduce memory usage on 32 bit
+ # reduce memory usage on 32 bit (with dbg symbols)
# https://bugs.webkit.org/show_bug.cgi?id=199272
export CXXFLAGS="$CXXFLAGS -g1"
- # disable gold usage since it can't find pthreads with it enabled
cmake -B build -G Ninja \
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
@@ -309,8 +305,7 @@ build() {
-DENABLE_MINIBROWSER=ON \
-DUSE_WPE_RENDERER=ON \
-DUSE_WOFF2=ON \
- -DUSE_SOUP2=ON \
- $_archopt
+ -DUSE_SOUP2=ON
cmake --build build
}
@@ -323,5 +318,5 @@ package() {
}
sha512sums="
-dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692 webkitgtk-2.36.3.tar.xz
+c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2 webkitgtk-2.36.4.tar.xz
"