From dc529f72ced262b2d73514c8b67d49f7fdbf530c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 14 Mar 2019 01:01:25 +0000
Subject: [PATCH] extra/webkit2gtk to 2.24.0-1

---
 extra/webkit2gtk/PKGBUILD | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/extra/webkit2gtk/PKGBUILD b/extra/webkit2gtk/PKGBUILD
index 2122decb1..793bd57ae 100644
--- a/extra/webkit2gtk/PKGBUILD
+++ b/extra/webkit2gtk/PKGBUILD
@@ -7,45 +7,42 @@
 highmem=1
 
 pkgname=webkit2gtk
-pkgver=2.22.7
+pkgver=2.24.0
 pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=(x86_64)
 url="https://webkitgtk.org/"
 license=(custom)
-depends=(libxt libxslt enchant gst-plugins-base-libs libsecret libwebp
+depends=(libxt libxslt enchant gst-plugins-base-libs libsecret libwebp openjpeg2
          harfbuzz-icu gtk3 libnotify hyphen woff2)
-makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2
-             ninja geoclue)
-optdepends=('gtk2: Netscape plugin support'
-            'geoclue: Geolocation support'
-            'gst-plugins-base: free media decoding'
+makedepends=(gperf gobject-introspection ruby gtk-doc cmake python geoclue)
+optdepends=('geoclue: Geolocation support'
             'gst-plugins-good: media decoding'
+            'gst-plugins-bad: media decoding'
             'gst-libav: nonfree media decoding')
 source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc})
-sha256sums=('4be6f7d605cd0a690fd26e8aa83b089a33ad9d419148eafcfb60580dd2af30ff'
+sha256sums=('2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407'
             'SKIP')
 validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3'
               '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B')
 
 prepare() {
   cd webkitgtk-$pkgver
-  sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
 }
 
 build() {
   # do not use LLINT assembly for v5/v6
   [[ $CARCH == "arm" || $CARCH == "armv6h" ]] && CONFIG="-DENABLE_JIT=OFF"
 
-  cmake -Hwebkitgtk-$pkgver -Bbuild -GNinja \
+  cmake -Hwebkitgtk-$pkgver -Bbuild \
     -DPORT=GTK \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
     -DENABLE_GTKDOC=ON \
+    -DENABLE_PLUGIN_PROCESS_GTK2=OFF \
     -DLIBEXEC_INSTALL_DIR=/usr/lib \
     -DLIB_INSTALL_DIR=/usr/lib \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
     $CONFIG
   cmake --build build
 }