mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
3331992a27
commit
24aea3a87b
@@ -0,0 +1,59 @@
|
|||||||
|
The autoptr types should be excluded from gobject-introspection parsing as
|
||||||
|
they're not user-facing.
|
||||||
|
|
||||||
|
Upstream-Status: Submitted
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
|
diff --git a/gio/gio-autocleanups.h b/gio/gio-autocleanups.h
|
||||||
|
index a95ba65..24ccc2d 100644
|
||||||
|
--- a/gio/gio-autocleanups.h
|
||||||
|
+++ b/gio/gio-autocleanups.h
|
||||||
|
@@ -21,6 +21,8 @@
|
||||||
|
#error "Only <gio/gio.h> can be included directly."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifndef __GI_SCANNER__
|
||||||
|
+
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GAction, g_object_unref)
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GActionMap, g_object_unref)
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GAppInfo, g_object_unref)
|
||||||
|
@@ -146,3 +148,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVolume, g_object_unref)
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVolumeMonitor, g_object_unref)
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GZlibCompressor, g_object_unref)
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GZlibDecompressor, g_object_unref)
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h
|
||||||
|
index 6355f75..09d28be 100644
|
||||||
|
--- a/glib/glib-autocleanups.h
|
||||||
|
+++ b/glib/glib-autocleanups.h
|
||||||
|
@@ -21,6 +21,8 @@
|
||||||
|
#error "Only <glib.h> can be included directly."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifndef __GI_SCANNER__
|
||||||
|
+
|
||||||
|
static inline void
|
||||||
|
g_autoptr_cleanup_generic_gfree (void *p)
|
||||||
|
{
|
||||||
|
@@ -87,3 +89,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantDict, g_variant_dict_unref)
|
||||||
|
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GVariantDict, g_variant_dict_clear)
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantType, g_variant_type_free)
|
||||||
|
G_DEFINE_AUTO_CLEANUP_FREE_FUNC(GStrv, g_strfreev, NULL)
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
diff --git a/gobject/gobject-autocleanups.h b/gobject/gobject-autocleanups.h
|
||||||
|
index 980203f..a1d4ba1 100644
|
||||||
|
--- a/gobject/gobject-autocleanups.h
|
||||||
|
+++ b/gobject/gobject-autocleanups.h
|
||||||
|
@@ -21,6 +21,10 @@
|
||||||
|
#error "Only <glib-object.h> can be included directly."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifndef __GI_SCANNER__
|
||||||
|
+
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GObject, g_object_unref)
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GInitiallyUnowned, g_object_unref)
|
||||||
|
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GValue, g_value_unset)
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
@@ -15,6 +15,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
|
|||||||
file://allow-run-media-sdX-drive-mount-if-username-root.patch \
|
file://allow-run-media-sdX-drive-mount-if-username-root.patch \
|
||||||
file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
|
file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
|
||||||
file://Enable-more-tests-while-cross-compiling.patch \
|
file://Enable-more-tests-while-cross-compiling.patch \
|
||||||
|
file://gi-exclude.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
|
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
|
||||||
|
|||||||
Reference in New Issue
Block a user