wok-next annotate clutter-gtk/stuff/fix-gir.patch @ rev 13380

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