[grilo] build-sys: fix gio-2.0 gir bindings errors



commit c760d284acad86bb6f60af711af7d079052832f7
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Tue Dec 9 08:03:25 2014 +0100

    build-sys: fix gio-2.0 gir bindings errors
    
    Use vala gio-2.0 definition to avoid the gir error:
    
    Gio-2.0.gir:79247.7-79251.24: error: `UnixSocketAddress' already
    contains a definition for `abstract'
    Gio-2.0.gir:79093.7-79095.21: note: previous definition of `abstract'
    was here
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741315

 bindings/vala/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 77947ac..abcef6b 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -7,7 +7,7 @@ VAPIGEN_VAPIS = grilo- GRL_MAJORMINOR@.vapi grilo-net- GRL_MAJORMINOR@.vapi
 
 grilo- GRL_MAJORMINOR@.vapi: $(top_builddir)/src/Grl- GRL_MAJORMINOR@.gir grilo- GRL_MAJORMINOR@-custom.vala 
grilo- GRL_MAJORMINOR@.deps Grl- GRL_MAJORMINOR@.metadata
 
-grilo_ GRL_MAJORMINOR_NORM@_vapi_DEPS =
+grilo_ GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0
 grilo_ GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir)
 grilo_ GRL_MAJORMINOR_NORM@_vapi_FILES = grilo- GRL_MAJORMINOR@-custom.vala $(top_builddir)/src/Grl- 
GRL_MAJORMINOR@.gir
 
@@ -15,7 +15,7 @@ EXTRA_DIST += grilo- GRL_MAJORMINOR@.metadata grilo- GRL_MAJORMINOR@.deps grilo-
 
 grilo-net- GRL_MAJORMINOR@.vapi:  $(top_builddir)/libs/net/GrlNet- GRL_MAJORMINOR@.gir grilo-net- 
GRL_MAJORMINOR@-custom.vala grilo-net- GRL_MAJORMINOR@.deps GrlNet- GRL_MAJORMINOR@.metadata
 
-grilo_net_ GRL_MAJORMINOR_NORM@_vapi_DEPS =
+grilo_net_ GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0
 grilo_net_ GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir)
 grilo_net_ GRL_MAJORMINOR_NORM@_vapi_FILES = grilo-net- GRL_MAJORMINOR@-custom.vala 
$(top_builddir)/libs/net/GrlNet- GRL_MAJORMINOR@.gir
 


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