diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch b/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch new file mode 100644 index 000000000..dc62b92ef --- /dev/null +++ b/import-layers/yocto-poky/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 |
