[gobject-introspection] gir: skip glib-enumtypes.h for GObject-2.0. See #267



commit 8d1aa1e9286ca561810ebad8127ba267203bf9b0
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sun Mar 3 13:12:35 2019 +0100

    gir: skip glib-enumtypes.h for GObject-2.0. See #267
    
    The newly added GTypes in glib!481 result in g-i generating an enum type
    in GLib-2.0 and a GType based one in GObject-2.0.
    
    This makes problems for the dlang bindings (see #267) so skip them for now.
    
    Ideally we should include it in GLib-2.0 like we do with glib-types.h.

 Makefile-gir.am | 2 +-
 gir/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/Makefile-gir.am b/Makefile-gir.am
index 36c8dc60..b59b0a6b 100644
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -117,7 +117,7 @@ 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 
$(GOBJECT_INCLUDEDIR)/gobject/gvaluecollector.h, \
+       $(filter-out $(GOBJECT_INCLUDEDIR)/gobject/glib-types.h 
$(GOBJECT_INCLUDEDIR)/gobject/gvaluecollector.h (GOBJECT_INCLUDEDIR)/gobject/glib-enumtypes.h, \
                $(wildcard $(GOBJECT_INCLUDEDIR)/gobject/*.h)) \
        gir/gobject-2.0.c
 
diff --git a/gir/meson.build b/gir/meson.build
index 6b372b74..3d021bce 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') and not 
hstr.endswith('gvaluecollector.h')
+  if not hstr.endswith('autocleanups.h') and not hstr.endswith('glib-types.h') and not 
hstr.endswith('gvaluecollector.h') and not hstr.endswith('glib-enumtypes.h')
     gobject_files += h
   endif
 endforeach


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]