[gnome-sdk-images/gnome-3-20] webkitgtk4: Use straight cmake and support arm & i386

[Tristan Van Berkom <tvb src gnome org>]

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

    webkitgtk4: Use straight cmake and support arm & i386
    
    When building for i386 on an x86_64 system, or building for arm
    on an aarch64 system, one must specify -DCMAKE_SYSTEM_PROCESSOR
    to ensure that webkitgtk build scripts select the correct assembly
    code paths.
    
    Note: when building the "i386" arch, we specify i586 as the system
    processor because the compiler in the base runtime is actually
    i586-unknown-linux-gnu.

 org.gnome.Sdk.json.in |   39 +++++++++++++++++++++++++++++------
 webkitgtk-configure   |   53 -------------------------------------------------
 2 files changed, 32 insertions(+), 60 deletions(-)
---
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index 5497272..f06bd80 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -640,11 +640,41 @@
         },
         {
             "name": "webkitgtk4",
+            "cmake": true,
             "build-options" : {
                 "cflags": "-O2 -g1",
-                "cxxflags": "-O2 -g1"
+                "cxxflags": "-O2 -g1",
+                "arch" : {
+                    "i386" : {
+                        "config-opts" : [
+                            "-DCMAKE_SYSTEM_PROCESSOR=i586"
+                        ]
+                    },
+                   "arm" : {
+                        "config-opts" : [
+                            "-DCMAKE_SYSTEM_PROCESSOR=arm"
+                       ]
+                   }
+                }
             },
-            "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.12.0.tar.xz";,
@@ -654,11 +684,6 @@
                     "type": "patch",
                     "path": "webkitgtk-cmake-buildapi.patch"
                 }
-                {
-                    "type": "file",
-                    "path": "webkitgtk-configure",
-                    "dest-filename": "configure"
-                }
             ]
         },
         {