diff options
| author | psykose <alice@ayaya.dev> | 2022-04-17 06:20:09 +0000 |
|---|---|---|
| committer | alice <alice@ayaya.dev> | 2022-04-17 07:45:24 +0000 |
| commit | 4106dbd91faff0dfcf3b07cce6d1aa0399c7c068 (patch) | |
| tree | 224bba82d94913dce110ce58bc7dd001661989af | |
| parent | c149d0cb8a46b48f858cd0aa0d1466309b107b4c (diff) | |
community/webkit2gtk: upgrade to 2.36.0
| -rw-r--r-- | community/webkit2gtk/APKBUILD | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD index b2a953f0080..d9f28aa6233 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.34.6 +pkgver=2.36.0 pkgrel=0 pkgdesc="Portable web rendering engine WebKit for GTK+" url="https://webkitgtk.org/" @@ -23,7 +23,6 @@ makedepends=" gst-plugins-base-dev gstreamer-dev gtk+3.0-dev - gtk-doc hyphen-dev icu-dev lcms2-dev @@ -36,6 +35,8 @@ makedepends=" libsecret-dev libsoup-dev libwebp-dev + libwpe-dev + libwpebackend-fdo-dev libxml2-dev libxslt-dev libxt-dev @@ -48,8 +49,6 @@ makedepends=" samurai sqlite-dev woff2-dev - libwpe-dev - libwpebackend-fdo-dev " replaces="webkit" options="!check" # upstream doesn't package them in release tarballs: Tools/Scripts/run-gtk-tests: Command not found @@ -58,6 +57,10 @@ source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz" builddir="$srcdir/webkitgtk-$pkgver" # secfixes: +# 2.36.0-r0: +# - CVE-2022-22624 +# - CVE-2022-22628 +# - CVE-2022-22629 # 2.34.6-r0: # - CVE-2022-22589 # - CVE-2022-22590 @@ -71,6 +74,7 @@ builddir="$srcdir/webkitgtk-$pkgver" # - CVE-2021-30953 # - CVE-2021-30954 # - CVE-2021-30984 +# - CVE-2022-22637 # - CVE-2022-22594 # 2.34.3-r0: # - CVE-2021-30887 @@ -269,54 +273,52 @@ builddir="$srcdir/webkitgtk-$pkgver" build() { local _archopt= case "$CARCH" in + x86) # 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) CXXFLAGS="$CXXFLAGS -U_FORTIFY_SOURCE" - _archopt="-DENABLE_JIT=OFF" - ;; - ppc64le|s390x) _archopt="-DENABLE_JIT=OFF";; + 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 # https://bugs.webkit.org/show_bug.cgi?id=199272 export CXXFLAGS="$CXXFLAGS -g1" - mkdir build - cd build # disable gold usage since it can't find pthreads with it enabled - cmake -GNinja \ + cmake -B build -G Ninja \ -DPORT=GTK \ - -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib \ -DENABLE_GLES2=ON \ -DENABLE_GTKDOC=OFF \ -DENABLE_GEOLOCATION=ON \ + -DENABLE_JOURNALD_LOG=OFF \ -DENABLE_SAMPLING_PROFILER=OFF \ -DENABLE_MINIBROWSER=ON \ -DUSE_WPE_RENDERER=ON \ -DUSE_WOFF2=ON \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DUSE_LD_GOLD=OFF \ - -DUSE_SYSTEMD=OFF \ -DUSE_SOUP2=ON \ - $_archopt \ - .. - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923476 - ninja JavaScriptCore-4-gir - ninja + $_archopt + cmake --build build } check() { - ninja -C "$builddir"/build check + ninja -C build check } package() { - DESTDIR="$pkgdir" ninja -C "$builddir"/build install + DESTDIR="$pkgdir" cmake --install build } sha512sums=" -57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343 webkitgtk-2.34.6.tar.xz +0926a792da295b8efa8c0fb80fbb0cb27c43bb86011317d076fbe5eef347f2bc02e8afc4c75699a5c6a14363f4abcbfa2d941fdddd6646a63c7679e2380080da webkitgtk-2.36.0.tar.xz " |