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

[Antonio Rojas]

    Date: Friday, June 16, 2017 @ 21:15:05
  Author: arojas
Revision: 298909

Update to 5.212.0-alpha2

Modified:
  qt5-webkit/trunk/PKGBUILD
Deleted:
  qt5-webkit/trunk/qt5-webkit-gcc7.patch
  qt5-webkit/trunk/qt5-webkit-i686-linking.patch

-------------------------------+
 PKGBUILD                      |   24 ++++--------------------
 qt5-webkit-gcc7.patch         |   12 ------------
 qt5-webkit-i686-linking.patch |   14 --------------
 3 files changed, 4 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-16 19:33:49 UTC (rev 298908)
+++ PKGBUILD	2017-06-16 21:15:05 UTC (rev 298909)
@@ -4,9 +4,9 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-webkit
-_qtver=5.212.0-alpha
+_qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)
@@ -18,27 +18,11 @@
 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-functional.patch::"https://github.com/qt/qtwebkit/commit/c119ecc7.patch"
-        qt5-webkit-no-expansion-to-defined.patch::"https://github.com/annulen/webkit/commit/a4d1f641.patch"
-        qt5-webkit-gcc7.patch qt5-webkit-i686-linking.patch)
-sha256sums=('f70fea4623a0f1df6ec535358f9c431d6ead9c04742a85258aaabcd0805d2719'
-            'e9dd2a6d5682a788666b8a1dd078e079f8460a512096fb0381b48226e95e3d1f'
-            '60eafaf42e5cd81805b74c29564b6504092d69bf0083c728d113af9d1740b3c1'
-            '58ecbd8708f5afe4e974fdcd6c1f32fea61ccc55dc9bb711768f2d0da6963fb8'
-            '2b494dcd22db8d50b3b4ddbc73639f089041681575fbc435e600788e7e2a6525')
+source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz")
+sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a')
 
 prepare() {
   mkdir -p build
-
-  cd qtwebkit-$_qtver
-# Fix build with GCC 7
-  sed -e '/ChangeLog/d' -i ../*.patch
-  patch -p1 -i ../qt5-webkit-gcc7.patch
-  patch -p1 -i ../qt5-webkit-functional.patch
-  patch -p1 -i ../qt5-webkit-no-expansion-to-defined.patch
-# Fix i686 linking
-  patch -p1 -i ../qt5-webkit-i686-linking.patch
 }
 
 build() {

Deleted: qt5-webkit-gcc7.patch
===================================================================
--- qt5-webkit-gcc7.patch	2017-06-16 19:33:49 UTC (rev 298908)
+++ qt5-webkit-gcc7.patch	2017-06-16 21:15:05 UTC (rev 298909)
@@ -1,12 +0,0 @@
-Index: /trunk/Source/JavaScriptCore/runtime/JSArrayBufferView.h
-===================================================================
---- trunk/Source/JavaScriptCore/runtime/JSArrayBufferView.h	(revision 211433)
-+++ trunk/Source/JavaScriptCore/runtime/JSArrayBufferView.h	(revision 211434)
-@@ -168,5 +168,5 @@
-     void neuter();
-     
--    void* vector()
-+    void* vector() const
-     {
-         return m_vector.getPredicated(
-             this,

Deleted: qt5-webkit-i686-linking.patch
===================================================================
--- qt5-webkit-i686-linking.patch	2017-06-16 19:33:49 UTC (rev 298908)
+++ qt5-webkit-i686-linking.patch	2017-06-16 21:15:05 UTC (rev 298909)
@@ -1,14 +0,0 @@
-diff --git a/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp 
-b/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
-index bf99dbc8718..5c038c502bc 100644
---- a/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
-+++ b/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
-@@ -35,6 +35,7 @@
- #include "JSObject.h"
- #include "JSTypedArrayViewPrototype.h"
- #include "JSTypedArrays.h"
-+#include "TypedArrayInlines.h"
- 
- namespace JSC {
- 
-