wok-6.x view clutter-gtk/stuff/fix-gir.patch @ rev 10726
libtaz: Don't need to check /usr/bin/hg anymore. Best to get the tag 1.1.2 version. May need to delete the slitaz-dev-tools-1.1.2.tar.bz2 source on tank to make sure we have the tag version.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Sat May 28 20:44:37 2011 +0000 (2011-05-28) |
| parents | |
| children |
line source
1 From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
2 From: Emmanuele Bassi <ebassi@linux.intel.com>
3 Date: Tue, 28 Sep 2010 13:52:25 +0000
4 Subject: build: Add common CFLAGS to the introspection scanner
6 ---
7 diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
8 index 6e267b4..cec5cce 100644
9 --- a/clutter-gtk/Makefile.am
10 +++ b/clutter-gtk/Makefile.am
11 @@ -15,6 +15,8 @@ AM_CPPFLAGS = \
12 -DCLUTTER_DISABLE_DEPRECATED \
13 $(CLUTTER_GTK_DEBUG_CFLAGS)
15 +common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
16 +
17 # please, keep these lists sorted alphabetically
18 sources_c = \
19 $(srcdir)/gtk-clutter-embed.c \
20 @@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
21 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
22 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
23 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
24 -libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS)
25 +libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
27 cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
28 cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
29 @@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
30 $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
31 --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
32 --strip-prefix=GtkClutter \
33 - $(INCLUDES) $(AM_CPPFLAGS) \
34 + $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
35 --add-include-path=$(srcdir) --add-include=path=. \
36 --include=Clutter-1.0 \
37 --include=GdkPixbuf-2.0 \
38 --
39 cgit v0.8.3.1-30-gff3a
40 From 0d77c7c965dcebcec0dae6b6244c3a057b398b59 Mon Sep 17 00:00:00 2001
41 From: Emmanuele Bassi <ebassi@linux.intel.com>
42 Date: Tue, 28 Sep 2010 13:58:17 +0000
43 Subject: Add introspection annotations for gtk_clutter_init*
45 ---
46 diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
47 index 8cf4116..50bca6b 100644
48 --- a/clutter-gtk/gtk-clutter-util.c
49 +++ b/clutter-gtk/gtk-clutter-util.c
50 @@ -603,8 +603,9 @@ gtk_clutter_texture_set_from_icon_name (ClutterTexture *texture,
52 /**
53 * gtk_clutter_init:
54 - * @argc: pointer to the arguments count, or %NULL
55 - * @argv: pointer to the arguments vector, or %NULL
56 + * @argc: (inout): pointer to the arguments count, or %NULL
57 + * @argv: (array length=argc) (inout) (allow-none): pointer to the
58 + * arguments vector, or %NULL
59 *
60 * This function should be called instead of clutter_init() and
61 * gtk_init().
62 @@ -633,17 +634,18 @@ gtk_clutter_init (int *argc,
64 /**
65 * gtk_clutter_init_with_args:
66 - * @argc: a pointer to the number of command line arguments.
67 - * @argv: a pointer to the array of command line arguments.
68 - * @parameter_string: a string which is displayed in
69 - * the first line of <option>--help</option> output, after
70 - * <literal><replaceable>programname</replaceable> [OPTION...]</literal>
71 - * @entries: a %NULL-terminated array of #GOptionEntry<!-- -->s
72 - * describing the options of your program
73 - * @translation_domain: a translation domain to use for translating
74 - * the <option>--help</option> output for the options in @entries
75 - * with gettext(), or %NULL
76 - * @error: a return location for errors
77 + * @argc: (inout): a pointer to the number of command line arguments.
78 + * @argv: (array length=argc) (inout) (allow-none): a pointer to the array
79 + * of command line arguments.
80 + * @parameter_string: (allow-none): a string which is displayed in
81 + * the first line of <option>--help</option> output, after
82 + * <literal><replaceable>programname</replaceable> [OPTION...]</literal>
83 + * @entries: (allow-none): a %NULL-terminated array of #GOptionEntry<!-- -->s
84 + * describing the options of your program, or %NULL
85 + * @translation_domain: (allow-none): a translation domain to use for
86 + * translating the <option>--help</option> output for the options
87 + * in @entries with gettext(), or %NULL
88 + * @error: (allow-none): a return location for errors, or %NULL
89 *
90 * This function should be called instead of clutter_init() and
91 * gtk_init_with_args().
92 --
93 cgit v0.8.3.1-30-gff3a