From 1859be22ab40aa982eae0da144e835289f0de210 Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Tue, 23 May 2017 22:51:08 +0200
Subject: [PATCH] multiple retries to fix webengine crashes, some patches added

added -fno-delete-null-pointer-checks in order to fix crashes on gcc6
---
 qt5-webengine/PKGBUILD | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/qt5-webengine/PKGBUILD b/qt5-webengine/PKGBUILD
index b123cc6e8..6281423df 100644
--- a/qt5-webengine/PKGBUILD
+++ b/qt5-webengine/PKGBUILD
@@ -2,20 +2,33 @@ source ../qt5.conf
 
 pkgname=qt5-webengine
 pkgver=${QSubVersion}
-pkgrel=1
+pkgrel=5
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='Provides support for web applications using the Chromium browser project'
-depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'libxtst' 'libxcursor' 'libpulse' 'pciutils' 'libxss' 'libvpx' 'opus'
-         'libevent' 'libsrtp' 'jsoncpp' 'libwebp' 'snappy' 'nss' 'libxml2' 'libxslt' 'protobuf' 'libproxy') # minizip
-makedepends=('python2' 'git' 'gperf')
+depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss' 'libvpx' 
+         'libevent' 'libsrtp' 'snappy' 'nss' 'protobuf' 'libxslt' 'libxdamage' 'minizip' 'ffmpeg')
+         # namcap note: libxdamage is needed for nvidia users
+makedepends=('python2' 'git' 'gperf' 'jsoncpp')
 groups=('qt5')
 options=('debug')
 source=( $(getSrc ${pkgname})
-        qtbug-58488.patch::"https://github.com/qt/qtwebengine/commit/7e7dd262.patch")
+        qtbug-58488.patch::"https://github.com/qt/qtwebengine/commit/7e7dd262.patch"
+        qtbug-58488.patch::"https://github.com/qt/qtwebengine/commit/7e7dd262.patch"
+        qtbug-58381.patch::"https://github.com/qt/qtwebengine/commit/8e147ed3.patch"
+        qtbug-58515.patch::"https://github.com/qt/qtwebengine/commit/a6c6665d.patch"
+        qtbug-58673.patch::"https://github.com/qt/qtwebengine/commit/90501711.patch"
+        qtbug-58362.patch::"https://github.com/qt/qtwebengine/commit/31374ba9.patch"
+        qtbug-57778.patch::"https://github.com/qt/qtwebengine/commit/5c2cbfcc.patch")
 md5sums=( $(getSum ${pkgname})
-         '3762cbdbc6a752e4d876e048e5e16de6')
+         '3762cbdbc6a752e4d876e048e5e16de6'
+         '3762cbdbc6a752e4d876e048e5e16de6'
+         '951ac7549fff82f9d1d11e9bf50556ba'
+         'd5da5608285ad764f37fe196f9afe5a1'
+         'c7b5acd58319d23d769c19f42323e8ec'
+         '663f8454990de96fad4c8c78bcd6f819'
+         '849ab18980b0523405f0282c83b4a54c')
 
 prepare() {
   mkdir -p build
@@ -28,13 +41,28 @@ prepare() {
 
   # Prevent drop-down popups form stealing focus https://bugreports.qt.io/browse/QTBUG-58488
   patch -p1 -i ../qtbug-58488.patch
+
+  # Backport some focus fixes
+  patch -p1 -i ../qtbug-58381.patch
+  patch -p1 -i ../qtbug-58515.patch
+  patch -p1 -i ../qtbug-58673.patch
+
+  # Fix IME support
+  patch -p1 -i ../qtbug-58362.patch
+
+  # Fix incorrectly overriding new and delete
+  patch -p1 -i ../qtbug-57778.patch
 }
 
 build() {
   cd build
 
   export PATH="$srcdir/bin:$PATH"
-  qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs ../$(getPkgName ${pkgname})
+
+  export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
+  export CXXFLAGS="${CXXFLAGS} -fno-delete-null-pointer-checks"
+
+  qmake-qt5 CONFIG+="proprietary-codecs" WEBENGINE_CONFIG+="use_proprietary_codecs use_system_ffmpeg" ../$(getPkgName ${pkgname})
   make
 }