From 366e0f9cd7773433ba14cc531119bca3b9879a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6tz=20Waschk?= Date: Mon, 17 Aug 2009 14:12:21 +0100 Subject: [PATCH] Update Clutter to use G-I 0.6.4 Following bug #1762, the syntax of g-ir-scanner was changed in gobject-introspection, so Clutter does not build anymore with 0.6.4. See the bugzilla bug: http://bugzilla.gnome.org/show_bug.cgi?id=591669 GObject-Introspection now uses a different mechanism to extract the SONAME when building the gir file and it needs the libtool archive as option. Signed-off-by: Emmanuele Bassi --- README | 2 +- clutter/Makefile.am | 2 +- clutter/cogl/Makefile.am | 2 +- clutter/json/Makefile.am | 2 +- configure.ac | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index df09259ab..fb600e026 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ If you are building the API reference you will also need: If you are building the Introspection data you will also need: - * GObject-Introspection >= 0.6.3 + * GObject-Introspection >= 0.6.4 The official website is: diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 5dcff52f5..942257846 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -266,7 +266,7 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_ --include=PangoCairo-1.0 \ --include=Cogl-@CLUTTER_API_VERSION@ \ $(json_gir_include) \ - --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \ + --library=libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la \ --libtool="$(top_builddir)/libtool" \ --pkg gobject-2.0 \ --pkg pango \ diff --git a/clutter/cogl/Makefile.am b/clutter/cogl/Makefile.am index afc2022f0..62998a6f8 100644 --- a/clutter/cogl/Makefile.am +++ b/clutter/cogl/Makefile.am @@ -75,7 +75,7 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la --c-include='cogl/cogl.h' \ --include=GL-1.0 \ --include=GObject-2.0 \ - --library=clutter-cogl \ + --library=libclutter-cogl.la \ --libtool="$(top_builddir)/libtool" \ --pkg gobject-2.0 \ --output $@ \ diff --git a/clutter/json/Makefile.am b/clutter/json/Makefile.am index 2481b6696..0ad94650e 100644 --- a/clutter/json/Makefile.am +++ b/clutter/json/Makefile.am @@ -44,7 +44,7 @@ ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json. $(INCLUDES) \ --add-include-path=$(srcdir) --add-include-path=. \ --include=GObject-2.0 \ - --library=clutter-json \ + --library=libclutter-json.la \ --libtool="$(top_builddir)/libtool" \ --pkg gobject-2.0 \ --output $@ \ diff --git a/configure.ac b/configure.ac index 7141d5ca6..e25560ef6 100644 --- a/configure.ac +++ b/configure.ac @@ -697,7 +697,7 @@ AC_SUBST(MAINTAINER_CFLAGS) dnl === GObject-Introspection check =========================================== -GOBJECT_INTROSPECTION_CHECK([0.6.3]) +GOBJECT_INTROSPECTION_CHECK([0.6.4]) dnl === GTK Doc check =========================================================