diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-04-07 01:53:24 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-09 07:43:49 +0100 |
commit | 9bad89414b5c97948b4f5809496d8cb0f56adb5c (patch) | |
tree | 33f2577dd5c9887efbcab7fe832c167193718e95 /meta/recipes-core/glib-2.0/glib-2.0 | |
parent | e3704e8b99870250ab7eb9aee304483e63748f07 (diff) | |
download | poky-9bad89414b5c97948b4f5809496d8cb0f56adb5c.tar.gz |
glib-2.0: 2.42.1 -> 2.44.0
Backported a patch to fix build on CentOS' gcc 4.4.7:
0001-GListModel-roll-back-use-of-type-redefinition.patch
(From OE-Core rev: c93394277ab11ed0efe3a777c9e5d818762fdc9e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch new file mode 100644 index 0000000000..7d957434e8 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 4a292721bcf2943bfc05c6a1c859992f28e3efec Mon Sep 17 00:00:00 2001 | ||
2 | From: Ryan Lortie <desrt@desrt.ca> | ||
3 | Date: Wed, 25 Mar 2015 09:29:49 -0400 | ||
4 | Subject: [PATCH] GListModel: roll back use of type redefinition | ||
5 | |||
6 | We declare the typedefs for GListModel and GListStore in giotypes.h, as | ||
7 | a matter of convention. This is not actually required, since the | ||
8 | typedef is emitted as part of the G_DECLARE_* macros. | ||
9 | |||
10 | The giotypes.h approach is only used to avoid cyclic dependencies | ||
11 | between headers, which is not a problem in this case. | ||
12 | |||
13 | Type redefinition is a C11 feature, and although it was around in some | ||
14 | compilers before then, gcc 4.2.1 (from 2007) is apparently still in wide | ||
15 | use, being the default compiler for OpenBSD. | ||
16 | |||
17 | Eventually, we will probably hit a case where we actually need to | ||
18 | redefine a type, but since we're not there yet, let's back off a bit. | ||
19 | |||
20 | Upstream-Status: Backport | ||
21 | |||
22 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
23 | --- | ||
24 | gio/giotypes.h | 2 -- | ||
25 | 1 file changed, 2 deletions(-) | ||
26 | |||
27 | diff --git a/gio/giotypes.h b/gio/giotypes.h | ||
28 | index 4342d47..53f8cc9 100644 | ||
29 | --- a/gio/giotypes.h | ||
30 | +++ b/gio/giotypes.h | ||
31 | @@ -61,8 +61,6 @@ typedef struct _GPermission GPermission; | ||
32 | |||
33 | typedef struct _GMenuModel GMenuModel; | ||
34 | typedef struct _GNotification GNotification; | ||
35 | -typedef struct _GListModel GListModel; | ||
36 | -typedef struct _GListStore GListStore; | ||
37 | |||
38 | /** | ||
39 | * GDrive: | ||
40 | -- | ||
41 | 1.7.9.5 | ||
42 | |||