[libgit2-glib/tintou/wip/vala-fix] Fix vapi name, add vapi generation in meson

[Corentin Noël <corentinnoel src gnome org>]

commit 53149a78cf241de7955e9eb5aeb7c37ba4720615
Author: Corentin Noël <corentin elementary io>
Date:   Sat Sep 2 15:21:21 2017 -0600

    Fix vapi name, add vapi generation in meson

 libgit2-glib/Makefile.am          |   18 +++++++++---------
 libgit2-glib/libgit2-glib.deps.in |    1 +
 libgit2-glib/meson.build          |   30 +++++++++++++++++++++---------
 meson.build                       |    2 +-
 4 files changed, 32 insertions(+), 19 deletions(-)
---
diff --git a/libgit2-glib/Makefile.am b/libgit2-glib/Makefile.am
index 04f195d..bc5a840 100644
--- a/libgit2-glib/Makefile.am
+++ b/libgit2-glib/Makefile.am
@@ -247,21 +247,21 @@ if HAVE_INTROSPECTION
 if ENABLE_VAPIGEN
 include $(VAPIGEN_MAKEFILE)
 
-ggit-1.0.vapi: Ggit-1.0.gir
+libgit2-glib-1.0.vapi: Ggit-1.0.gir
 
-VAPIGEN_VAPIS = ggit-1.0.vapi
+VAPIGEN_VAPIS = libgit2-glib-1.0.vapi
 
-ggit_1_0_vapi_DEPS = gio-2.0
-ggit_1_0_vapi_METADATADIRS = $(top_srcdir)
-ggit_1_0_vapi_FILES = Ggit-1.0.gir
+libgit2_glib_1_0_vapi_DEPS = gio-2.0
+libgit2_glib_1_0_vapi_METADATADIRS = $(top_srcdir)
+libgit2_glib_1_0_vapi_FILES = Ggit-1.0.gir
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(VAPIGEN_VAPIS) ggit-1.0.deps
+vapi_DATA = $(VAPIGEN_VAPIS) libgit2-glib-1.0.deps
 
-ggit-1.0.deps:
-       $(AM_V_GEN) echo $(ggit_1_0_vapi_DEPS) | tr ' ' '\n' > $@
+libgit2-glib-1.0.deps:
+       $(AM_V_GEN) echo $(libgit2_glib_1_0_vapi_DEPS) | tr ' ' '\n' > $@
 
-CLEANFILES += $(VAPIGEN_VAPIS) ggit-1.0.deps
+CLEANFILES += $(VAPIGEN_VAPIS) libgit2-glib-1.0.deps
 
 endif # ENABLE_VAPIGEN
 
diff --git a/libgit2-glib/libgit2-glib.deps.in b/libgit2-glib/libgit2-glib.deps.in
new file mode 100644
index 0000000..70a6bd9
--- /dev/null
+++ b/libgit2-glib/libgit2-glib.deps.in
@@ -0,0 +1 @@
+@vala_deps@
diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
index d399eb1..ebb12c1 100644
--- a/libgit2-glib/meson.build
+++ b/libgit2-glib/meson.build
@@ -201,13 +201,25 @@ if build_gir
     '--identifier-prefix=Ggit',
     '--c-include=ggit.h'
   ]
-  gnome.generate_gir(libgit2_glib,
-                     sources: headers + sources,
-                     namespace: 'Ggit',
-                     nsversion: libgit2_glib_api_version,
-                     identifier_prefix: 'Ggit',
-                     symbol_prefix: 'ggit',
-                     includes: [ 'GObject-2.0', 'GLib-2.0', 'Gio-2.0' ],
-                     install: true,
-                     extra_args: gir_extra_args)
+  gir_target = gnome.generate_gir(libgit2_glib,
+                                  sources: headers + sources,
+                                  namespace: 'Ggit',
+                                  nsversion: libgit2_glib_api_version,
+                                  identifier_prefix: 'Ggit',
+                                  symbol_prefix: 'ggit',
+                                  includes: [ 'GObject-2.0', 'GLib-2.0', 'Gio-2.0' ],
+                                  install: true,
+                                  extra_args: gir_extra_args)
+  vala_conf = configuration_data()
+  vala_deps = 'gio-2.0'
+  vala_conf.set('vala_deps', vala_deps)
+  configure_file(input: 'libgit2-glib.deps.in',
+                 output: 'libgit2-glib-@0@.deps'.format(libgit2_glib_api_version),
+                 install_dir: join_paths(libgit2_glib_datadir, 'vala', 'vapi'),
+                 install: true,
+                 configuration: vala_conf)
+  gnome.generate_vapi('libgit2-glib-@0@'.format(libgit2_glib_api_version),
+                      install: true,
+                      packages: vala_deps,
+                      sources: gir_target[0])
 endif
diff --git a/meson.build b/meson.build
index 8386f05..81cb530 100644
--- a/meson.build
+++ b/meson.build
@@ -157,7 +157,7 @@ extra_args= []
 core_inc = include_directories('.')
 
 # Required dependencies
-git2_req = '0.25.0'
+git2_req = '0.24.0'
 glib_req = '2.44.0'
 conf.set('GIT2_REQUIRED', git2_req)
 conf.set('GLIB_REQUIRED', glib_req)