[libsoup] Revert "Adding Vala bindings build upstream"



commit 7fa8478ef8d9e00b30519df149330ce581fb2632
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Feb 12 17:42:51 2015 +0000

    Revert "Adding Vala bindings build upstream"
    
    This reverts commit c3eb2f884d9cd141b9df0c41e8c362fce68e5664.
    
    The generated VAPI is different from the one provided by Vala package so
    that i breaks gnome-boxes build by declaring Buffer.data as 'void*'
    instead of 'uint8[]'.
    
    Besides this commit was pushed without permission from maintainer.

 configure.ac              |    6 --
 libsoup/Makefile.am       |   12 +---
 libsoup/Soup-2.4.metadata |    4 -
 m4/vapigen.m4             |  177 ---------------------------------------------
 4 files changed, 1 insertions(+), 198 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e8e2ca4..eb3e29c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,6 @@ dnl *******************************************
 m4_define([soup_major_version], [2])
 m4_define([soup_minor_version], [49])
 m4_define([soup_micro_version], [1])
-AC_CONFIG_MACRO_DIR([m4])
-m4_include(m4/vapigen.m4)
 
 AC_PREREQ(2.63)
 
AC_INIT([libsoup],[soup_major_version.soup_minor_version.soup_micro_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup])
@@ -164,10 +162,6 @@ dnl *** gobject-introspection ***
 dnl *****************************
 GOBJECT_INTROSPECTION_CHECK([0.9.5])
 
-if test "x$found_introspection" = "xyes"; then
-  VAPIGEN_CHECK()
-fi
-
 AC_MSG_CHECKING([for glib-networking (glib TLS implementation)])
 save_CFLAGS="$CFLAGS"
 save_LIBS="$LIBS"
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 65ce5e9..431c99e 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST =
-CLEANFILES =
 
 include $(GLIB_MAKEFILE)
 
@@ -266,15 +265,6 @@ Soup_2_4_gir_FILES = \
 
 INTROSPECTION_GIRS += Soup-2.4.gir
 
-if ENABLE_VAPIGEN
-libsoup-2.4.vapi: Soup-2.4.gir
-       $(VAPIGEN) --metadatadir=$(top_srcdir)/libsoup --pkg gio-2.0 --library=libsoup-2.4 $^
-
-vapidir=$(VAPIDIR)
-vapi_DATA=libsoup-2.4.vapi
-CLEANFILES += $(vapi_DATA)
-endif
-
 if BUILD_LIBSOUP_GNOME
 
 # GNOME extensions
@@ -302,7 +292,7 @@ gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
 
 endif
 


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