[gnome-builder] flatpak: Fix libgit2-glib pkgconfig file under meson 0.46.0

[Christian Hergert <chergert src gnome org>]

commit d14a8916221b0c59eea26cdd98dbd403fc2fc610
Author: albfan <albertofanjul gmail com>
Date:   Sat May 5 03:40:59 2018 +0200

    flatpak: Fix libgit2-glib pkgconfig file under meson 0.46.0

 build-aux/flatpak/fix-libgit2-glib-pc.patch | 18 ++++++++++++++++++
 build-aux/flatpak/org.gnome.Builder.json    |  4 ++++
 2 files changed, 22 insertions(+)
---
diff --git a/build-aux/flatpak/fix-libgit2-glib-pc.patch b/build-aux/flatpak/fix-libgit2-glib-pc.patch
new file mode 100644
index 000000000..413502d7e
--- /dev/null
+++ b/build-aux/flatpak/fix-libgit2-glib-pc.patch
@@ -0,0 +1,18 @@
+From: Roy Buitenhuis <roy buitenhuis94 gmail com>
+Subject: [PATCH] package-config generation bug, wrong format used in meson.build
+
+https://bugzilla.gnome.org/show_bug.cgi?id=795730
+
+diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
+index bab4f61..62a7eba 100644
+--- a/libgit2-glib/meson.build
++++ b/libgit2-glib/meson.build
+@@ -220,7 +220,7 @@ pkg.generate(
+   description: 'libgit2-glib, a a glib wrapper library around the libgit2 git access library.',
+   filebase: libgit2_glib_api_name,
+   subdirs: libgit2_glib_api_name,
+-  requires: 'libgit2 >= @0@, glib-2.0 >= @1@, gobject-2.0 >= @1@, gio-2.0 >= @1@'.format(git2_req, 
glib_req),
++  requires: ['libgit2 >= ' + git2_req, 'glib-2.0 >= ' + glib_req, 'gobject-2.0 >= ' + glib_req, 'gio-2.0 >= 
' + glib_req],
+   variables: 'exec_prefix=${prefix}',
+   extra_cflags: extra_args
+ )
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index f21b932f1..d392a9c10 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -513,6 +513,10 @@
                 {
                     "type" : "git",
                     "url" : "https://git.gnome.org/browse/libgit2-glib";
+                },
+                {
+                    "type" : "patch",
+                    "path" : "fix-libgit2-glib-pc.patch"
                 }
             ]
         },