summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-03-09 16:44:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-10 23:13:55 +0000
commit24aea3a87b2bc95c07c177b2c97fccd52ddbe1a7 (patch)
tree2d5d7f2ea19fc845ff3e368c4f4b99d0922dad88 /meta/recipes-core
parent3331992a27f48f590efb1188f6507378b6e1d352 (diff)
downloadpoky-24aea3a87b2bc95c07c177b2c97fccd52ddbe1a7.tar.gz
glib-2.0: silence warnings when parsing headers for introspection
(From OE-Core rev: ae11f395121e071774b0da450b64bcc98908dd58) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch59
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb1
2 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch b/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch
new file mode 100644
index 0000000000..dc62b92ef3
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch
@@ -0,0 +1,59 @@
1The autoptr types should be excluded from gobject-introspection parsing as
2they're not user-facing.
3
4Upstream-Status: Submitted
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/gio/gio-autocleanups.h b/gio/gio-autocleanups.h
8index a95ba65..24ccc2d 100644
9--- a/gio/gio-autocleanups.h
10+++ b/gio/gio-autocleanups.h
11@@ -21,6 +21,8 @@
12 #error "Only <gio/gio.h> can be included directly."
13 #endif
14
15+#ifndef __GI_SCANNER__
16+
17 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GAction, g_object_unref)
18 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GActionMap, g_object_unref)
19 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GAppInfo, g_object_unref)
20@@ -146,3 +148,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVolume, g_object_unref)
21 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVolumeMonitor, g_object_unref)
22 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GZlibCompressor, g_object_unref)
23 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GZlibDecompressor, g_object_unref)
24+
25+#endif
26diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h
27index 6355f75..09d28be 100644
28--- a/glib/glib-autocleanups.h
29+++ b/glib/glib-autocleanups.h
30@@ -21,6 +21,8 @@
31 #error "Only <glib.h> can be included directly."
32 #endif
33
34+#ifndef __GI_SCANNER__
35+
36 static inline void
37 g_autoptr_cleanup_generic_gfree (void *p)
38 {
39@@ -87,3 +89,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantDict, g_variant_dict_unref)
40 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GVariantDict, g_variant_dict_clear)
41 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantType, g_variant_type_free)
42 G_DEFINE_AUTO_CLEANUP_FREE_FUNC(GStrv, g_strfreev, NULL)
43+
44+#endif
45diff --git a/gobject/gobject-autocleanups.h b/gobject/gobject-autocleanups.h
46index 980203f..a1d4ba1 100644
47--- a/gobject/gobject-autocleanups.h
48+++ b/gobject/gobject-autocleanups.h
49@@ -21,6 +21,10 @@
50 #error "Only <glib-object.h> can be included directly."
51 #endif
52
53+#ifndef __GI_SCANNER__
54+
55 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GObject, g_object_unref)
56 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GInitiallyUnowned, g_object_unref)
57 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GValue, g_value_unset)
58+
59+#endif
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
index 5abb8616f6..bf3cadeb76 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
@@ -15,6 +15,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
15 file://allow-run-media-sdX-drive-mount-if-username-root.patch \ 15 file://allow-run-media-sdX-drive-mount-if-username-root.patch \
16 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ 16 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
17 file://Enable-more-tests-while-cross-compiling.patch \ 17 file://Enable-more-tests-while-cross-compiling.patch \
18 file://gi-exclude.patch \
18 " 19 "
19 20
20SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 21SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"