[gexiv2/wip/0.12: 6/12] Fix GIR header and Vala .vapi completeness in Meson

[Jens Georg <jensgeorg src gnome org>]

commit d4b55f20ba6b90b56cb84fd5272f59b4853b8bac
Author: Corentin Noël <corentin elementary io>
Date:   Thu Jan 11 16:11:17 2018 +0100

    Fix GIR header and Vala .vapi completeness in Meson
    
    https://bugzilla.gnome.org/show_bug.cgi?id=792431

 Makefile.am               |    1 +
 gexiv2/meson.build        |    5 ++++-
 vapi/GExiv2-0.10.metadata |    6 ------
 vapi/meson.build          |    5 +++--
 4 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eadfccb..0d59e38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -183,6 +183,7 @@ INTROSPECTION_SCANNER_ARGS = \
                             --symbol-prefix=@PACKAGE_NAME@             \
                             --add-include-path=$(BUILD_DIR) \
                             --pkg-export=gexiv2 \
+                            --c-include=gexiv2/gexiv2.h \
                             $(WARN_SCANNERFLAGS)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(BUILD_DIR)
 
diff --git a/gexiv2/meson.build b/gexiv2/meson.build
index 9338601..aeca227 100644
--- a/gexiv2/meson.build
+++ b/gexiv2/meson.build
@@ -66,6 +66,8 @@ gexiv2 = library('gexiv2',
                  dependencies : [gobject, exiv2],
                  install : true)
 
+pc_deps = ['glib-2.0', 'gobject-2.0']
+
 pkg.generate(
     description : 'GObject bindings for exiv2',
     libraries : gexiv2,
@@ -73,7 +75,7 @@ pkg.generate(
     name : 'GExiv2',
     filebase : 'gexiv2',
     requires_private : 'exiv2',
-    requires : ['glib-2.0', 'gobject-2.0']
+    requires : pc_deps
     )
 
 # set unconditionally
@@ -95,5 +97,6 @@ if introspection_available
       identifier_prefix : 'GExiv2',
       export_packages : 'gexiv2',
       includes : ['GObject-2.0'],
+      header : 'gexiv2/gexiv2.h',
       install : true)
 endif
diff --git a/vapi/GExiv2-0.10.metadata b/vapi/GExiv2-0.10.metadata
index 33557cc..1df0618 100644
--- a/vapi/GExiv2-0.10.metadata
+++ b/vapi/GExiv2-0.10.metadata
@@ -1,9 +1,3 @@
-GExiv2 cheader_filename="gexiv2/gexiv2.h"
-
 Metadata
     .from_app1_segment skip
     .open_buf skip
-    .free skip
-
-PreviewImage
-    .free skip
diff --git a/vapi/meson.build b/vapi/meson.build
index a71303a..04c2c5e 100644
--- a/vapi/meson.build
+++ b/vapi/meson.build
@@ -1,3 +1,4 @@
 vapi = gnome.generate_vapi('gexiv2',
-                           sources : gir.get(0),
-                           install : true)
+                           sources : [gir.get(0) , 'gexiv2-custom.vala'],
+                           install : true,
+                           packages: pc_deps)