From 70a84204e3443c648cfa8dabab23663361c69469 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Wed, 8 Jun 2022 16:47:06 -0400
Subject: [webkitgtk]: upgrade to v2.36.3

---
 nonprism/webkit2gtk/PKGBUILD | 57 ++++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 23 deletions(-)

(limited to 'nonprism/webkit2gtk/PKGBUILD')

diff --git a/nonprism/webkit2gtk/PKGBUILD b/nonprism/webkit2gtk/PKGBUILD
index b90927799..57b6f39d5 100644
--- a/nonprism/webkit2gtk/PKGBUILD
+++ b/nonprism/webkit2gtk/PKGBUILD
@@ -14,8 +14,8 @@
 
 
 pkgname=webkit2gtk
-pkgver=2.32.0
-pkgrel=2
+pkgver=2.36.3
+pkgrel=1
 pkgrel+=.nonprism1
 pkgdesc="Web content engine for GTK"
 pkgdesc+=", without geoclue2 support"
@@ -31,40 +31,48 @@ depends=(cairo fontconfig freetype2 libgcrypt glib2 gtk3 harfbuzz harfbuzz-icu
          gst-plugins-base-libs libmanette)
 makedepends=(cmake ninja gtk-doc python ruby gobject-introspection
              wayland-protocols systemd gst-plugins-bad gperf)
-#makedepends=(${makedepends[@]/geoclue/})
 optdepends=('gst-plugins-good: media decoding'
             'gst-plugins-bad: media decoding'
             'gst-libav: nonfree media decoding')
-source=($url/releases/webkitgtk-$pkgver.tar.xz{,.asc}
-        unhide-deprecated-api.patch)
-source_i686=(webkitgtk-2.24.2-no-sse2.patch)
-sha256sums=('9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0'
-            'SKIP'
-            '48ee7bee0b50776c8153c20b96854bd5086e0a7d04e621fd57ea7fc6c690c3a2')
-sha256sums_i686=('e95391eceeb29d0ebc57d6b867afd7cd95ed92683edeb28c6a7a5048b5a9b85b')
+options=(debug)
+source=($url/releases/webkitgtk-$pkgver.tar.xz{,.asc})
+source_i686=(webkitgtk-2.36.3-no-sse2.arch32.patch)
+sha256sums=('732fcf8c4ec644b8ed28b46ebbd7c1ebab9d9e0afea9bdf5e5d12786afc478d1'
+            'SKIP')
+sha256sums_i686=('58a724b7f1092a9049186a3b8c61689c31558b6c2b587c827cec04219397adac')
 validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3'  # Carlos Garcia Campos <cgarcia@igalia.com>
               '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') # Adrián Pérez de Castro <aperez@igalia.com>
 
+
 prepare() {
   cd webkitgtk-$pkgver
   case "$CARCH" in
-    i686)
-      # disable SSE2 on 486 and 686
-      source+=('webkitgtk-2.24.2-no-sse2.patch')
-      sha256sums+=('e95391eceeb29d0ebc57d6b867afd7cd95ed92683edeb28c6a7a5048b5a9b85b')
-      options+=(!debug)
-      patch -p1 < ../webkitgtk-2.24.2-no-sse2.patch
-      ;;
-  esac
+  i686)
+    options+=(!debug)
 
-  # Use deprecated API for ubrk_safeClone until ICU 69 is officially supported
-  patch -Np1 -i ../unhide-deprecated-api.patch
+    # disable SSE2 on 486 and 686
+    echo "applying webkitgtk-2.36.3-no-sse2.arch32.patch"
+    patch -Rp1 -i "$srcdir"/webkitgtk-2.36.3-no-sse2.arch32.patch
+    ;;
+  esac
 }
 
 build() {
-#  CFLAGS+=" $CPPFLAGS"
-#  CXXFLAGS+=" $CPPFLAGS"
+  # Produce minimal debug info: 4.3 GB of debug data makes the
+  # build too slow and is too much to package for debuginfod
+  CFLAGS+=' -g1'
+  CXXFLAGS+=' -g1'
+
   local parabola_options=( -DENABLE_GEOLOCATION=OFF )
+  case "$CARCH" in
+  i686)
+    # linker runs out of memory on 32-bit
+    LDFLAGS+=" -Wl,--no-keep-memory"
+
+    # do not build JIT code on non-pentium4 (breaks in micro-optimizations)
+    parabola_options+=( -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF )
+    ;;
+  esac
 
   cmake -S webkitgtk-$pkgver -B build -G Ninja \
     ${parabola_options[@]} \
@@ -74,7 +82,8 @@ build() {
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DCMAKE_SKIP_RPATH=ON \
-    -DENABLE_GTKDOC=ON \
+    -DUSE_SOUP2=ON \
+    -DENABLE_GTKDOC=OFF \
     -DENABLE_MINIBROWSER=ON
   cmake --build build
 }
@@ -86,6 +95,8 @@ package() {
 
   DESTDIR="$pkgdir" cmake --install build
 
+  rm -r "$pkgdir/usr/bin"
+
   cd webkitgtk-$pkgver
   find Source -name 'COPYING*' -or -name 'LICENSE*' -print0 | sort -z |
     while IFS= read -d $'\0' -r _f; do
-- 
cgit v1.2.3