Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/clutter-gtk/files: clutter-gtk-0.10.8-fix-introspection-build.patch
Date: Mon, 03 Jan 2011 23:28:51
Message-Id: 20110103232841.6B1A52005C@flycatcher.gentoo.org
1 eva 11/01/03 23:28:41
2
3 Added: clutter-gtk-0.10.8-fix-introspection-build.patch
4 Log:
5 Fix build with USE=introspection, bug #350061. Clean up old revisions.
6
7 (Portage version: 2.2.0_alpha12/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-libs/clutter-gtk/files/clutter-gtk-0.10.8-fix-introspection-build.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter-gtk/files/clutter-gtk-0.10.8-fix-introspection-build.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/clutter-gtk/files/clutter-gtk-0.10.8-fix-introspection-build.patch?rev=1.1&content-type=text/plain
14
15 Index: clutter-gtk-0.10.8-fix-introspection-build.patch
16 ===================================================================
17 From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
18 From: Emmanuele Bassi <ebassi@×××××××××××.com>
19 Date: Tue, 28 Sep 2010 13:52:25 +0000
20 Subject: build: Add common CFLAGS to the introspection scanner
21
22 ---
23 diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
24 index 6e267b4..cec5cce 100644
25 --- a/clutter-gtk/Makefile.am
26 +++ b/clutter-gtk/Makefile.am
27 @@ -15,6 +15,8 @@ AM_CPPFLAGS = \
28 -DCLUTTER_DISABLE_DEPRECATED \
29 $(CLUTTER_GTK_DEBUG_CFLAGS)
30
31 +common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
32 +
33 # please, keep these lists sorted alphabetically
34 sources_c = \
35 $(srcdir)/gtk-clutter-embed.c \
36 @@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
37 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
38 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
39 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
40 -libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS)
41 +libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
42
43 cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
44 cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
45 @@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
46 $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
47 --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
48 --strip-prefix=GtkClutter \
49 - $(INCLUDES) $(AM_CPPFLAGS) \
50 + $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
51 --add-include-path=$(srcdir) --add-include=path=. \
52 --include=Clutter-1.0 \
53 --include=GdkPixbuf-2.0 \
54 --
55 cgit v0.8.3.1-30-gff3a