From 90acdf1925a85631591f5e84c51bcaaaff90077d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 27 Oct 2017 00:18:40 +0000
Subject: [PATCH] extra/qt5-webkit to 5.212.0alpha2-6

---
 extra/qt5-webkit/PKGBUILD | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/extra/qt5-webkit/PKGBUILD b/extra/qt5-webkit/PKGBUILD
index b6722d8ed..fac6e196a 100644
--- a/extra/qt5-webkit/PKGBUILD
+++ b/extra/qt5-webkit/PKGBUILD
@@ -12,7 +12,7 @@ highmem=1
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)
@@ -26,9 +26,13 @@ groups=(qt qt5)
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz"
         qt5-webkit-gcc7.patch
+        qt5-webkit-trojita-1.patch::"https://github.com/annulen/webkit/commit/6faf1121.patch"
+        qt5-webkit-trojita-2.patch::"https://github.com/annulen/webkit/commit/76420459.patch"
         atomic.patch)
 sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a'
             'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720'
+            'bd22bd7842d5ad1cb1f5a4b6acb2674509732274d5f9dc51943144dff76996ae'
+            'b42b70fd2a4a36b0ff48fc4e0dc386b3dda373e6fec18f3be9f5e2d3b04e0aa3'
             '23fbd785daf116c71b3ce87d40860f0a6c56ab1065ee98ec41634626ca961129')
 
 prepare() {
@@ -37,6 +41,9 @@ prepare() {
 # Fix crashes with GCC7 https://bugs.webkit.org/show_bug.cgi?id=173407
   cd qtwebkit-$_qtver
   patch -p1 -i ../qt5-webkit-gcc7.patch
+# Fix layout issues in trojita https://github.com/annulen/webkit/issues/511
+  patch -p1 -i ../qt5-webkit-trojita-1.patch
+  patch -p1 -i ../qt5-webkit-trojita-2.patch
   if [[ $CARCH == "arm" || $CARCH == "armv6h" ]]; then
     patch -p0 -i ../atomic.patch
   fi