diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-03-09 16:44:00 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-10 23:06:23 +0000 |
| commit | ae11f395121e071774b0da450b64bcc98908dd58 (patch) | |
| tree | 4e21d1311e1d633ee9d2479bae1e9056b4f9faeb /meta/recipes-core/glib-2.0 | |
| parent | 9ac5017b3328a18561c2912edfda2d7d97c675f2 (diff) | |
| download | openembedded-core-contrib-ae11f395121e071774b0da450b64bcc98908dd58.tar.gz | |
glib-2.0: silence warnings when parsing headers for introspection
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch | 59 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb | 1 |
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 @@ +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 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 \ file://allow-run-media-sdX-drive-mount-if-username-root.patch \ file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://Enable-more-tests-while-cross-compiling.patch \ + file://gi-exclude.patch \ " SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" |