[rhythmbox/gobject-introspection] fix vapi build, remove old python bindings, cheer slightly



commit 2d1cd582eee5a37d81a402bb98b45d706ca88c82
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Aug 4 14:17:56 2010 +1000

    fix vapi build, remove old python bindings, cheer slightly

 bindings/Makefile.am              |    6 +-
 bindings/gi/Makefile.am           |    2 +
 bindings/python/Makefile.am       |  116 --
 bindings/python/override_common.c |  317 ----
 bindings/python/override_common.h |   73 -
 bindings/python/rb.defs           | 3053 -------------------------------------
 bindings/python/rb.override       | 1716 ---------------------
 bindings/python/rhythmdb.defs     | 1312 ----------------
 bindings/python/rhythmdb.override |  818 ----------
 bindings/vala/Makefile.am         |    2 +-
 configure.ac                      |    3 +-
 11 files changed, 7 insertions(+), 7411 deletions(-)
---
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index a11efe4..db1641d 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = gi
 
-#if ENABLE_VALA
-#SUBDIRS += vala
-#endif
+if ENABLE_VALA
+SUBDIRS += vala
+endif
diff --git a/bindings/gi/Makefile.am b/bindings/gi/Makefile.am
index f3cf3fd..94ade83 100644
--- a/bindings/gi/Makefile.am
+++ b/bindings/gi/Makefile.am
@@ -125,12 +125,14 @@ RhythmDB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-$(GTK_MAJ_VER) Gst-0.10 lib
 RhythmDB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I../..
 RhythmDB_0_13_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
 RhythmDB_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(rhythmdb_introspection_sources))
+RhythmDB_0_13_gir_PACKAGES = rhythmbox
 
 RB-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la RhythmDB-0.13.gir
 RB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-$(GTK_MAJ_VER) Gst-0.10 libxml2-2.0 RhythmDB-0.13
 RB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I../..
 RB_0_13_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
 RB_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(rb_introspection_sources))
+RB_0_13_gir_PACKAGES = rhythmbox
 
 INTROSPECTION_GIRS += RhythmDB-0.13.gir RB-0.13.gir
 
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index d1967cc..82cbf3b 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -13,7 +13,7 @@ RB-0.13.vala.gir: $(top_builddir)/bindings/gi/RB-0.13.gir
 	mv $  tmp $@
 
 RhythmDB-0.13.vala.gir: $(top_builddir)/bindings/gi/RhythmDB-0.13.gir
-	sed -e 's/libxml2.NodePtr/Xml.Node/' -e 's/GdkPixbuf.Pixbuf/Gdk.Pixbuf/' -e 's/libxml2.Char/utf8/' < $< > $  tmp
+	sed -e 's/libxml2.NodePtr/Xml.Node/' -e 's/GdkPixbuf.Pixbuf/Gdk.Pixbuf/' -e 's/libxml2.Char/utf8/' -e 's/<alias.*//' < $< > $  tmp
 	mv $  tmp $@
 
 rhythmdb.vapi: RhythmDB-0.13.vala.gir
diff --git a/configure.ac b/configure.ac
index 2856927..7a0b8b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ LIBGPOD_REQS=0.6
 MUSICBRAINZ_REQS=2.1.0
 MUSICBRAINZ3_REQS=3.0.2
 TOTEM_PLPARSER_REQS=2.26.0
-VALA_REQS=0.1.0
+VALA_REQS=0.9.4
 AVAHI_REQS=0.6
 LIBSOUP_REQS=2.26.0
 GUDEV_REQS=143
@@ -926,7 +926,6 @@ plugins/replaygain/Makefile
 plugins/replaygain/replaygain/Makefile
 plugins/mpris/Makefile
 bindings/Makefile
-bindings/python/Makefile
 bindings/vala/Makefile
 bindings/gi/Makefile
 help/Makefile



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