[gnome-sdk-images/wip/tvb/aarch64: 8/8] webkitgtk4: Use straight cmake and support armv7a & i686

[Tristan Van Berkom <tvb src gnome org>]

commit 1f6cdfdbbfdbbfe910e1e45180b568059d85ed81
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date:   Thu May 5 12:30:24 2016 -0400

    webkitgtk4: Use straight cmake and support armv7a & i686
    
    When building for i686 on an x86_64 system, or building for armv7a
    on an aarch64 system, one must specify -DCMAKE_SYSTEM_PROCESSOR
    to ensure that webkitgtk build scripts select the correct assembly
    code paths.
    
    Additionally, and hopefully as a temporary measure we need to disable
    the JIT assembly optimizations on 32-bit arm. This is because we get
    the errors described in this report:
        https://bugs.webkit.org/show_bug.cgi?id=137194
    
    This should be a temporary measure, webkitgtk should build
    for armv7a and I suspect I need to try again with a different
    tuning of compiler.

 org.gnome.Sdk.json.in |   40 ++++++++++++++++++++++++++++++------
 webkitgtk-configure   |   53 -------------------------------------------------
 2 files changed, 33 insertions(+), 60 deletions(-)
---
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index 8c32d67..c6eb50d 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -616,11 +616,42 @@
         },
         {
             "name": "webkitgtk4",
+            "cmake": true,
             "build-options" : {
                 "cflags": "-O2 -g1",
-                "cxxflags": "-O2 -g1"
+                "cxxflags": "-O2 -g1",
+                "arch" : {
+                    "i686" : {
+                        "config-opts" : [
+                            "-DCMAKE_SYSTEM_PROCESSOR=i686"
+                        ]
+                    },
+                   "armv7a" : {
+                        "config-opts" : [
+                            "-DCMAKE_SYSTEM_PROCESSOR=arm",
+                            "-DENABLE_JIT:BOOL=OFF"
+                       ]
+                   }
+                }
             },
-            "sources": [
+            "config-opts": [
+               "-DPORT=GTK",
+               "-DCMAKE_BUILD_TYPE=Release",
+               "-DCMAKE_C_FLAGS_RELEASE:STRING=-DNDEBUG",
+               "-DCMAKE_CXX_FLAGS_RELEASE:STRING=-DNDEBUG",
+               "-DENABLE_ACCELERATED_2D_CANVAS=OFF",
+               "-DCMAKE_INSTALL_PREFIX:PATH=/usr",
+               "-DLIB_INSTALL_DIR:PATH=/usr/lib",
+               "-DSYSCONF_INSTALL_DIR:PATH=/usr/etc",
+               "-DSHARE_INSTALL_PREFIX:PATH=/usr/share",
+               "-DINCLUDE_INSTALL_DIR:PATH=/usr/include",
+               "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON",
+               "-DBUILD_SHARED_LIBS:BOOL=ON",
+               "-DENABLE_GTKDOC=OFF",
+               "-DENABLE_VIDEO=ON",
+               "-DENABLE_WEB_AUDIO=ON"
+           ],
+           "sources": [
                 {
                     "type": "archive",
                     "url": "http://www.webkitgtk.org/releases/webkitgtk-2.11.5.tar.xz";,
@@ -629,11 +660,6 @@
                 {
                     "type": "patch",
                     "path": "webkitgtk-cmake-buildapi.patch"
-                },
-                {
-                    "type": "file",
-                    "path": "webkitgtk-configure",
-                    "dest-filename": "configure"
                 }
             ]
         },