sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

glib: remove obsolete gi-exclude patch 

This patch has been superseded by 2907b1 in gobject-introspection, which we're
now shipping.

(From OE-Core rev: f5c11a40008801aef5ab8df10ee837ad23c24b8d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2016-11-14 17:27:32 +00:00 committed by Richard Purdie
parent 993fbcfb85
commit edb608ff45
2 changed files with 0 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch
View File

@ -1,59 +0,0 @@
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

1
meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb
View File

@ -13,7 +13,6 @@ 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 \
file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
file://0001-Do-not-ignore-return-value-of-write.patch \
file://0001-Test-for-pthread_getname_np-before-using-it.patch \