[gimp] libgimp: Make sure GIR includes the right header

[Niels De Graef <nielsdg src gnome org>]

commit 2f94513df434e66318ea0512e72fc3fc27d8e848
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Tue Aug 20 18:20:01 2019 +0200

    libgimp: Make sure GIR includes the right header
    
    When using GIR-based bindings that will eventually include the header
    files (like Vala), we need to make sure to tell the gir-scanner what
    file that is. Otherwise tools like `vapigen` have to make an educated
    guess (which will be wrong).

 libgimp/Makefile.am | 3 +++
 libgimp/meson.build | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 2c3bffd175..d05f09d8aa 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -331,6 +331,9 @@ Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_FILES =  \
        $(libgimpthumb_introspectable)                                  \
        $(libgimpwidgets_introspectable)
 
+Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_SCANNERFLAGS = \
+       --c-include="libgimp/gimp.h"
+
 INTROSPECTION_GIRS += Gimp-@GIMP_API_VERSION@.gir
 
 girdir = $(datadir)/gir-1.0
diff --git a/libgimp/meson.build b/libgimp/meson.build
index dfc7c20063..272578ec40 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -376,7 +376,7 @@ else
     namespace: 'Gimp',
     identifier_prefix: 'Gimp',
     # symbol_prefix: 'gimp',
-    header: 'gimp-3.0/libgimp/gimp.h',
+    header: 'libgimp/gimp.h',
 
     extra_args: [
       '-DGIMP_COMPILATION',