[gnome-sdk-images] Update to base to freedesktop 1.6

[Alexander Larsson <alexl src gnome org>]

commit 5e9b5fa88fc25e5f0647ee004d51b1ef28d5c0fa
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Mar 8 00:38:54 2017 +0100

    Update to base to freedesktop 1.6

 Makefile                            |    2 +-
 org.gnome.Sdk.json.in               |    3 ++-
 pycairo-1.10.0-pickle-python3.patch |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/Makefile b/Makefile
index 6f42b01..98995fe 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ REPO   ?= repo
 # SDK_RUNTIME_VERSION: The org.freedesktop.BaseSdk and platform version to build against
 #
 SDK_BRANCH=master
-SDK_RUNTIME_VERSION=1.4
+SDK_RUNTIME_VERSION=1.6
 
 # Canned recipe for generating metadata
 SUBST_FILES=org.gnome.Sdk.json os-release issue issue.net org.gnome.Platform.appdata.xml 
org.gnome.Sdk.appdata.xml
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index 2b4d9f4..307e28c 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -798,7 +798,8 @@
                     "path": "cairo-waf-use-python-config-as-shell-script.patch"
                 },
                 {
-                    "type": "file",
+                    "type": "patch",
+                    "strip-components": 0,
                     "path": "pycairo-1.10.0-pickle-python3.patch"
                 },
                 {
diff --git a/pycairo-1.10.0-pickle-python3.patch b/pycairo-1.10.0-pickle-python3.patch
index 3da1c5f..85c5215 100644
--- a/pycairo-1.10.0-pickle-python3.patch
+++ b/pycairo-1.10.0-pickle-python3.patch
@@ -1,6 +1,6 @@
 diff -up waflib/Build.py.orig pycairo-1.10.0/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Build.py
---- waflib/Build.py.orig       2015-11-03 19:40:47.691969757 +0100
-+++ waflib/Build.py    2015-11-03 19:41:07.888153441 +0100
+--- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Build.py.orig  2015-11-03 19:40:47.691969757 +0100
++++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Build.py       2015-11-03 19:41:07.888153441 +0100
 @@ -151,6 +151,7 @@ class BuildContext(Context.Context):
                                f.close()
                self.init_dirs()