[gnome-builder] build: temporarily bundle meson

[Christian Hergert <chergert src gnome org>]

commit 6ae1e7b7849fba35329b70c09063385353a7079c
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 10 01:33:47 2018 -0800

    build: temporarily bundle meson
    
    Just until the builds finish. This let's us get a bundle out
    quicker though.

 build-aux/flatpak/meson-no-lib64.patch   |   12 ++++++++++++
 build-aux/flatpak/org.gnome.Builder.json |   19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/build-aux/flatpak/meson-no-lib64.patch b/build-aux/flatpak/meson-no-lib64.patch
new file mode 100644
index 0000000..7a86e1d
--- /dev/null
+++ b/build-aux/flatpak/meson-no-lib64.patch
@@ -0,0 +1,12 @@
+diff -up meson-0.42.0/mesonbuild/mesonlib.py.lib64 meson-0.42.0/mesonbuild/mesonlib.py
+--- meson-0.42.0/mesonbuild/mesonlib.py.lib64  2017-09-14 16:01:33.812927457 +0200
++++ meson-0.42.0/mesonbuild/mesonlib.py        2017-09-14 16:02:17.575331515 +0200
+@@ -334,7 +334,7 @@ def default_libdir():
+                 return 'lib/' + archpath
+         except Exception:
+             pass
+-    if os.path.isdir('/usr/lib64') and not os.path.islink('/usr/lib64'):
++    if os.path.isdir('/usr/lib64') and not os.path.islink('/usr/lib64') and False: # We disable lib64 in 
the freedesktop sdk
+         return 'lib64'
+     return 'lib'
+ 
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 3190977..31bb3af 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -637,6 +637,25 @@
             ]
         },
         {
+            "name": "meson",
+            "buildsystem": "simple",
+            "build-commands": [
+                "python3 setup.py install --prefix=/app"
+            ],
+            "ensure-writable": ["/lib/python*/site-packages/easy-install.pth"],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": 
"https://pypi.python.org/packages/c0/98/bcbda7862f8ca18dbdaa57b9c51cf7333cdc59b48278ed279217cd6ad8ff/meson-0.44.0.tar.gz";,
+                    "sha256": "16d3481ae9e3a8a2eee06f4963d682e4080503743e0ed8dcee24efc563baf8e6"
+                },
+                {
+                    "type": "patch",
+                    "path": "meson-no-lib64.patch"
+                }
+            ]
+        },
+        {
             "name": "gnome-builder",
             "buildsystem": "meson",
             "builddir": true,