[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, October 26, 2017 @ 18:53:31
  Author: arojas
Revision: 308514

Backport fixes for trojita layout

Modified:
  qt5-webkit/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-26 18:45:47 UTC (rev 308513)
+++ PKGBUILD	2017-10-26 18:53:31 UTC (rev 308514)
@@ -6,7 +6,7 @@
 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)
@@ -18,9 +18,14 @@
 replaces=(qt5-webkit-ng)
 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)
+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")
 sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a'
-            'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720')
+            'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720'
+            'bd22bd7842d5ad1cb1f5a4b6acb2674509732274d5f9dc51943144dff76996ae'
+            'b42b70fd2a4a36b0ff48fc4e0dc386b3dda373e6fec18f3be9f5e2d3b04e0aa3')
 
 prepare() {
   mkdir -p build
@@ -28,6 +33,9 @@
 # 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
 }
 
 build() {