wok diff clutter-gtk/stuff/fix-gir.patch @ rev 21794

updated firefox-official packages (67.0.3 -> 68.0)
author Hans-G?nter Theisgen
date Wed Aug 07 15:28:16 2019 +0100 (2019-08-07)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/clutter-gtk/stuff/fix-gir.patch	Wed Aug 07 15:28:16 2019 +0100
     1.3 @@ -0,0 +1,93 @@
     1.4 +From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
     1.5 +From: Emmanuele Bassi <ebassi@linux.intel.com>
     1.6 +Date: Tue, 28 Sep 2010 13:52:25 +0000
     1.7 +Subject: build: Add common CFLAGS to the introspection scanner
     1.8 +
     1.9 +---
    1.10 +diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
    1.11 +index 6e267b4..cec5cce 100644
    1.12 +--- a/clutter-gtk/Makefile.am
    1.13 ++++ b/clutter-gtk/Makefile.am
    1.14 +@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
    1.15 + 	-DCLUTTER_DISABLE_DEPRECATED		\
    1.16 + 	$(CLUTTER_GTK_DEBUG_CFLAGS)
    1.17 + 
    1.18 ++common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
    1.19 ++
    1.20 + # please, keep these lists sorted alphabetically
    1.21 + sources_c = \
    1.22 + 	$(srcdir)/gtk-clutter-embed.c 		\
    1.23 +@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
    1.24 + libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
    1.25 + libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
    1.26 + libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
    1.27 +-libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) 
    1.28 ++libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
    1.29 + 
    1.30 + cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
    1.31 + cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
    1.32 +@@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
    1.33 + 	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
    1.34 + 		--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
    1.35 + 		--strip-prefix=GtkClutter \
    1.36 +-		$(INCLUDES) $(AM_CPPFLAGS) \
    1.37 ++		$(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
    1.38 + 		--add-include-path=$(srcdir) --add-include=path=. \
    1.39 + 		--include=Clutter-1.0 \
    1.40 + 		--include=GdkPixbuf-2.0 \
    1.41 +--
    1.42 +cgit v0.8.3.1-30-gff3a
    1.43 +From 0d77c7c965dcebcec0dae6b6244c3a057b398b59 Mon Sep 17 00:00:00 2001
    1.44 +From: Emmanuele Bassi <ebassi@linux.intel.com>
    1.45 +Date: Tue, 28 Sep 2010 13:58:17 +0000
    1.46 +Subject: Add introspection annotations for gtk_clutter_init*
    1.47 +
    1.48 +---
    1.49 +diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
    1.50 +index 8cf4116..50bca6b 100644
    1.51 +--- a/clutter-gtk/gtk-clutter-util.c
    1.52 ++++ b/clutter-gtk/gtk-clutter-util.c
    1.53 +@@ -603,8 +603,9 @@ gtk_clutter_texture_set_from_icon_name (ClutterTexture *texture,
    1.54 + 
    1.55 + /**
    1.56 +  * gtk_clutter_init:
    1.57 +- * @argc: pointer to the arguments count, or %NULL
    1.58 +- * @argv: pointer to the arguments vector, or %NULL
    1.59 ++ * @argc: (inout): pointer to the arguments count, or %NULL
    1.60 ++ * @argv: (array length=argc) (inout) (allow-none): pointer to the
    1.61 ++ *   arguments vector, or %NULL
    1.62 +  *
    1.63 +  * This function should be called instead of clutter_init() and
    1.64 +  * gtk_init().
    1.65 +@@ -633,17 +634,18 @@ gtk_clutter_init (int    *argc,
    1.66 + 
    1.67 + /**
    1.68 +  * gtk_clutter_init_with_args:
    1.69 +- * @argc: a pointer to the number of command line arguments.
    1.70 +- * @argv: a pointer to the array of command line arguments.
    1.71 +- * @parameter_string: a string which is displayed in
    1.72 +- *    the first line of <option>--help</option> output, after
    1.73 +- *    <literal><replaceable>programname</replaceable> [OPTION...]</literal>
    1.74 +- * @entries: a %NULL-terminated array of #GOptionEntry<!-- -->s
    1.75 +- *    describing the options of your program
    1.76 +- * @translation_domain: a translation domain to use for translating
    1.77 +- *    the <option>--help</option> output for the options in @entries
    1.78 +- *    with gettext(), or %NULL
    1.79 +- * @error: a return location for errors
    1.80 ++ * @argc: (inout): a pointer to the number of command line arguments.
    1.81 ++ * @argv: (array length=argc) (inout) (allow-none): a pointer to the array
    1.82 ++ *   of command line arguments.
    1.83 ++ * @parameter_string: (allow-none): a string which is displayed in
    1.84 ++ *   the first line of <option>--help</option> output, after
    1.85 ++ *   <literal><replaceable>programname</replaceable> [OPTION...]</literal>
    1.86 ++ * @entries: (allow-none): a %NULL-terminated array of #GOptionEntry<!-- -->s
    1.87 ++ *   describing the options of your program, or %NULL
    1.88 ++ * @translation_domain: (allow-none): a translation domain to use for
    1.89 ++ *   translating the <option>--help</option> output for the options
    1.90 ++ *   in @entries with gettext(), or %NULL
    1.91 ++ * @error: (allow-none): a return location for errors, or %NULL
    1.92 +  *
    1.93 +  * This function should be called instead of clutter_init() and
    1.94 +  * gtk_init_with_args().
    1.95 +--
    1.96 +cgit v0.8.3.1-30-gff3a