isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-18 06:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Clutter to use G-I 0.6.4

Browse Source 
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 <ebassi@linux.intel.com>
This commit is contained in:
Götz Waschk 2009-08-17 14:12:21 +01:00 committed by Emmanuele Bassi
parent 53cb86d94b
commit 366e0f9cd7
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -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: 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: The official website is:

2
clutter/Makefile.am
View File

@ -266,7 +266,7 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_
--include=PangoCairo-1.0 \ --include=PangoCairo-1.0 \
--include=Cogl-@CLUTTER_API_VERSION@ \ --include=Cogl-@CLUTTER_API_VERSION@ \
$(json_gir_include) \ $(json_gir_include) \
--library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \ --library=libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gobject-2.0 \ --pkg gobject-2.0 \
--pkg pango \ --pkg pango \

2
clutter/cogl/Makefile.am
View File

@ -75,7 +75,7 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la
--c-include='cogl/cogl.h' \ --c-include='cogl/cogl.h' \
--include=GL-1.0 \ --include=GL-1.0 \
--include=GObject-2.0 \ --include=GObject-2.0 \
--library=clutter-cogl \ --library=libclutter-cogl.la \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gobject-2.0 \ --pkg gobject-2.0 \
--output $@ \ --output $@ \

2
clutter/json/Makefile.am
View File

@ -44,7 +44,7 @@ ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json.
$(INCLUDES) \ $(INCLUDES) \
--add-include-path=$(srcdir) --add-include-path=. \ --add-include-path=$(srcdir) --add-include-path=. \
--include=GObject-2.0 \ --include=GObject-2.0 \
--library=clutter-json \ --library=libclutter-json.la \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gobject-2.0 \ --pkg gobject-2.0 \
--output $@ \ --output $@ \

2
configure.ac
View File

@ -697,7 +697,7 @@ AC_SUBST(MAINTAINER_CFLAGS)
dnl === GObject-Introspection check =========================================== dnl === GObject-Introspection check ===========================================
GOBJECT_INTROSPECTION_CHECK([0.6.3]) GOBJECT_INTROSPECTION_CHECK([0.6.4])
dnl === GTK Doc check ========================================================= dnl === GTK Doc check =========================================================