[polari] flatpak: Drop config-opts for polari

[Florian Müllner <fmuellner src gnome org>]

commit 19bc5480a48cb4233f7ce026b81880dc634f1c11
Author: Florian Müllner <fmuellner gnome org>
Date:   Mon Mar 13 23:42:47 2017 +0100

    flatpak: Drop config-opts for polari
    
    The runtime ships a single library in /usr/lib64, which is enough for
    meson to use lib64 as default libdir. While nothing breaks with polari
    installing to /app/lib64, it's quite ugly to split 64-bit libs like
    that. That's why for consistency, we pass the --libdir option to meson,
    and everything works out fine ... except that builder picks up the
    options, but not the buildsystem, which fails as autotools' libdir
    option expects an absolute path.
    
    Meh. However we can still make flatpak-builder's meson builds use the
    libdir we want without breaking builder's autotools build by patching
    meson itself to never default to lib64 ...

 .../mesonlib-Use-lib-as-default-libdir.patch       |   27 ++++++++++++++++++++
 org.gnome.Polari.json                              |    5 +++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/build-aux/flatpak/mesonlib-Use-lib-as-default-libdir.patch 
b/build-aux/flatpak/mesonlib-Use-lib-as-default-libdir.patch
new file mode 100644
index 0000000..fc14ad3
--- /dev/null
+++ b/build-aux/flatpak/mesonlib-Use-lib-as-default-libdir.patch
@@ -0,0 +1,27 @@
+From d954e80418d2bd10e657c665031b3c38b30fbd35 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner gnome org>
+Date: Mon, 13 Mar 2017 23:35:56 +0100
+Subject: [PATCH] mesonlib: Use 'lib' as default libdir
+
+Everything except for the linker installs to /usr/lib, so that's
+what we want to use for aesthetic reasons as well.
+---
+ mesonbuild/mesonlib.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
+index 551bda2e..3917d03f 100644
+--- a/mesonbuild/mesonlib.py
++++ b/mesonbuild/mesonlib.py
+@@ -222,8 +222,6 @@ def default_libdir():
+                 return 'lib/' + archpath
+         except Exception:
+             pass
+-    if os.path.isdir('/usr/lib64') and not os.path.islink('/usr/lib64'):
+-        return 'lib64'
+     return 'lib'
+ 
+ def default_libexecdir():
+-- 
+2.12.0
+
diff --git a/org.gnome.Polari.json b/org.gnome.Polari.json
index 86c8d94..3574e5b 100644
--- a/org.gnome.Polari.json
+++ b/org.gnome.Polari.json
@@ -68,6 +68,10 @@
                     "sha256": "dcb05349b32427924fa2a258a5e23e40e09c1bf9dd09919198c3a2ae1c38ba53"
                 },
                 {
+                    "type": "patch",
+                    "path": "build-aux/flatpak/mesonlib-Use-lib-as-default-libdir.patch"
+                },
+                {
                     "type": "file",
                     "path": "build-aux/flatpak/setuptools-makefile",
                     "dest-filename": "Makefile"
@@ -136,7 +140,6 @@
             "name": "polari",
             "buildsystem": "meson",
             "builddir": true,
-            "config-opts": ["--libdir=lib"],
             "sources": [
                 {
                     "type": "git",