[gobject-introspection] Skip gobject/gvaluecollector.h when constructing GObject GIR

[Philip Chimento <pchimento src gnome org>]

commit 90a330117d2a6fed8ba284e963baf7f107199953
Author: Tomasz Miąsko <tomasz miasko gmail com>
Date:   Wed Mar 14 00:00:00 2018 +0000

    Skip gobject/gvaluecollector.h when constructing GObject GIR
    
    API from gobject/gvaluecollector.h is not intended for introspected use.
    Skip it when scanning headers. This effectively hides the definition of
    GTypeCValue and VALUE_COLLECT_FORMAT_MAX_LENGTH constant.

 Makefile-gir.am | 3 ++-
 gir/meson.build | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/Makefile-gir.am b/Makefile-gir.am
index 2cd73586..3753d1a2 100644
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -117,7 +117,8 @@ GObject_2_0_gir_CFLAGS = \
             -I$(GOBJECT_INCLUDEDIR) \
             -I$(GOBJECT_LIBDIR)/glib-2.0/include
 GObject_2_0_gir_FILES = \
-       $(filter-out $(GOBJECT_INCLUDEDIR)/gobject/glib-types.h, $(wildcard 
$(GOBJECT_INCLUDEDIR)/gobject/*.h)) \
+       $(filter-out $(GOBJECT_INCLUDEDIR)/gobject/glib-types.h 
$(GOBJECT_INCLUDEDIR)/gobject/gvaluecollector.h, \
+               $(wildcard $(GOBJECT_INCLUDEDIR)/gobject/*.h)) \
        gir/gobject-2.0.c
 
 BUILT_GIRSOURCES += GObject-2.0.gir
diff --git a/gir/meson.build b/gir/meson.build
index 1cb514a1..338c61ce 100644
--- a/gir/meson.build
+++ b/gir/meson.build
@@ -220,7 +220,7 @@ endif
 
 foreach h : gobject_headers
   hstr = '@0@'.format(h)
-  if not hstr.endswith('autocleanups.h') and not hstr.endswith('glib-types.h')
+  if not hstr.endswith('autocleanups.h') and not hstr.endswith('glib-types.h') and not 
hstr.endswith('gvaluecollector.h')
     gobject_files += h
   endif
 endforeach