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

[Antonio Rojas]

    Date: Wednesday, June 14, 2017 @ 16:44:17
  Author: arojas
Revision: 298823

Fix i686 build

Added:
  qt5-webkit-ng/trunk/qt5-webkit-ng-i686-linking.patch
  qt5-webkit-ng/trunk/qt5-webkit-ng-no-expansion-to-defined.patch
Modified:
  qt5-webkit-ng/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |   14 +++++++++-----
 qt5-webkit-ng-i686-linking.patch            |   14 ++++++++++++++
 qt5-webkit-ng-no-expansion-to-defined.patch |   12 ++++++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-14 16:22:40 UTC (rev 298822)
+++ PKGBUILD	2017-06-14 16:44:17 UTC (rev 298823)
@@ -4,7 +4,7 @@
 _qtver=5.212.0
 pkgver=${_qtver/-/}
 pkgrel=1
-arch=(x86_64)
+arch=(x86_64 i686)
 url='https://github.com/annulen/webkit/wiki'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API (maintained fork)'
@@ -14,11 +14,14 @@
 conflicts=(qt5-webkit)
 provides=(qt5-webkit)
 source=("https://github.com/annulen/webkit/archive/qtwebkit-$pkgver-alpha.tar.gz"
-        qt5-webkit-icu59.patch qt5-webkit-ng-gcc7.patch qt5-webkit-ng-functional.patch)
+        qt5-webkit-icu59.patch qt5-webkit-ng-gcc7.patch qt5-webkit-ng-functional.patch
+        qt5-webkit-ng-no-expansion-to-defined.patch qt5-webkit-ng-i686-linking.patch)
 sha256sums=('bf8637ad44efd781893c60a932256f435f538bea63333a7f438b897500044d98'
             'e1306e696ad7125fa00083aa966be0ea6fe6de555c9e1d119957f208f258edfe'
             '58ecbd8708f5afe4e974fdcd6c1f32fea61ccc55dc9bb711768f2d0da6963fb8'
-            'c85344edcc23930c0190b2f8ec3847bf8bdbbf7f1d4fa877c502e354e5f4233e')
+            'c85344edcc23930c0190b2f8ec3847bf8bdbbf7f1d4fa877c502e354e5f4233e'
+            '8f46bca6d2cb99701cfd82302da0a5c19ce09c73c5ed625a27b77e0d0146c0b4'
+            '2b494dcd22db8d50b3b4ddbc73639f089041681575fbc435e600788e7e2a6525')
 
 prepare() {
   mkdir -p build
@@ -29,8 +32,9 @@
 # Fix build with GCC 7
   patch -p1 -i ../qt5-webkit-ng-gcc7.patch
   patch -p1 -i ../qt5-webkit-ng-functional.patch
-
-  sed -e 's|-Wundef|-Wundef -Wno-expansion-to-defined|' -i Source/cmake/WebKitHelpers.cmake
+  patch -p1 -i ../qt5-webkit-ng-no-expansion-to-defined.patch
+# Fix i686 linking
+  patch -p1 -i ../qt5-webkit-ng-i686-linking.patch
 }
 
 build() {

Added: qt5-webkit-ng-i686-linking.patch
===================================================================
--- qt5-webkit-ng-i686-linking.patch	                        (rev 0)
+++ qt5-webkit-ng-i686-linking.patch	2017-06-14 16:44:17 UTC (rev 298823)
@@ -0,0 +1,14 @@
+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 {
+ 
+

Added: qt5-webkit-ng-no-expansion-to-defined.patch
===================================================================
--- qt5-webkit-ng-no-expansion-to-defined.patch	                        (rev 0)
+++ qt5-webkit-ng-no-expansion-to-defined.patch	2017-06-14 16:44:17 UTC (rev 298823)
@@ -0,0 +1,12 @@
+diff -up webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake
+--- webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7	2017-02-21 09:57:13.168916004 +0100
++++ webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake	2017-02-21 09:58:12.811563156 +0100
+@@ -41,6 +41,8 @@ if (COMPILER_IS_GCC_OR_CLANG)
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
+ endif ()
+ 
+ if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")