summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-07 01:53:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-09 07:43:49 +0100
commit9bad89414b5c97948b4f5809496d8cb0f56adb5c (patch)
tree33f2577dd5c9887efbcab7fe832c167193718e95 /meta
parente3704e8b99870250ab7eb9aee304483e63748f07 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch42
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb)5
2 files changed, 45 insertions, 2 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 @@
1From 4a292721bcf2943bfc05c6a1c859992f28e3efec Mon Sep 17 00:00:00 2001
2From: Ryan Lortie <desrt@desrt.ca>
3Date: Wed, 25 Mar 2015 09:29:49 -0400
4Subject: [PATCH] GListModel: roll back use of type redefinition
5
6We declare the typedefs for GListModel and GListStore in giotypes.h, as
7a matter of convention. This is not actually required, since the
8typedef is emitted as part of the G_DECLARE_* macros.
9
10The giotypes.h approach is only used to avoid cyclic dependencies
11between headers, which is not a problem in this case.
12
13Type redefinition is a C11 feature, and although it was around in some
14compilers before then, gcc 4.2.1 (from 2007) is apparently still in wide
15use, being the default compiler for OpenBSD.
16
17Eventually, we will probably hit a case where we actually need to
18redefine a type, but since we're not there yet, let's back off a bit.
19
20Upstream-Status: Backport
21
22Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
23---
24 gio/giotypes.h | 2 --
25 1 file changed, 2 deletions(-)
26
27diff --git a/gio/giotypes.h b/gio/giotypes.h
28index 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--
411.7.9.5
42
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
index 69b3ef8e37..227e1b4333 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
@@ -14,9 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
14 file://uclibc.patch \ 14 file://uclibc.patch \
15 file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ 15 file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
16 file://allow-run-media-sdX-drive-mount-if-username-root.patch \ 16 file://allow-run-media-sdX-drive-mount-if-username-root.patch \
17 file://0001-GListModel-roll-back-use-of-type-redefinition.patch \
17 " 18 "
18 19
19SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 20SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
20 21
21SRC_URI[md5sum] = "89c4119e50e767d3532158605ee9121a" 22SRC_URI[md5sum] = "74cf7b4ea200b76e42a4c22c8daf0f93"
22SRC_URI[sha256sum] = "8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a" 23SRC_URI[sha256sum] = "f2d362b106a08fa801770d41829a06fcfe287a00421018869eebf5efc796f5b9"