diff options
author | Ross Burton <ross.burton@intel.com> | 2016-11-14 17:27:32 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 11:10:13 +0000 |
commit | edb608ff45c40ec06476aba3482ec6f243a63c25 (patch) | |
tree | fae2affbdf95c0973060ab1434208f41bca59a78 /meta/recipes-core | |
parent | 993fbcfb85e4556577328ec9021b6e2769f3722a (diff) | |
download | poky-edb608ff45c40ec06476aba3482ec6f243a63c25.tar.gz |
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>
Diffstat (limited to 'meta/recipes-core')
-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.50.1.bb | 1 |
2 files changed, 0 insertions, 60 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 deleted file mode 100644 index dc62b92ef3..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | The autoptr types should be excluded from gobject-introspection parsing as | ||
2 | they're not user-facing. | ||
3 | |||
4 | Upstream-Status: Submitted | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/gio/gio-autocleanups.h b/gio/gio-autocleanups.h | ||
8 | index 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 | ||
26 | diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h | ||
27 | index 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 | ||
45 | diff --git a/gobject/gobject-autocleanups.h b/gobject/gobject-autocleanups.h | ||
46 | index 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.50.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb index 17016c80c0..e4fccc7bd6 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.50.1.bb | |||
@@ -13,7 +13,6 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
13 | file://allow-run-media-sdX-drive-mount-if-username-root.patch \ | 13 | file://allow-run-media-sdX-drive-mount-if-username-root.patch \ |
14 | file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ | 14 | file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ |
15 | file://Enable-more-tests-while-cross-compiling.patch \ | 15 | file://Enable-more-tests-while-cross-compiling.patch \ |
16 | file://gi-exclude.patch \ | ||
17 | file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ | 16 | file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ |
18 | file://0001-Do-not-ignore-return-value-of-write.patch \ | 17 | file://0001-Do-not-ignore-return-value-of-write.patch \ |
19 | file://0001-Test-for-pthread_getname_np-before-using-it.patch \ | 18 | file://0001-Test-for-pthread_getname_np-before-using-it.patch \ |