From 9bad89414b5c97948b4f5809496d8cb0f56adb5c Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 7 Apr 2015 01:53:24 -0700
Subject: 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>
---
...tModel-roll-back-use-of-type-redefinition.patch | 42 ++++++++++++++++++++++
meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb | 22 ------------
meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb | 23 ++++++++++++
3 files changed, 65 insertions(+), 22 deletions(-)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
(limited to 'meta/recipes-core')
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 @@
+From 4a292721bcf2943bfc05c6a1c859992f28e3efec Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Wed, 25 Mar 2015 09:29:49 -0400
+Subject: [PATCH] GListModel: roll back use of type redefinition
+
+We declare the typedefs for GListModel and GListStore in giotypes.h, as
+a matter of convention. This is not actually required, since the
+typedef is emitted as part of the G_DECLARE_* macros.
+
+The giotypes.h approach is only used to avoid cyclic dependencies
+between headers, which is not a problem in this case.
+
+Type redefinition is a C11 feature, and although it was around in some
+compilers before then, gcc 4.2.1 (from 2007) is apparently still in wide
+use, being the default compiler for OpenBSD.
+
+Eventually, we will probably hit a case where we actually need to
+redefine a type, but since we're not there yet, let's back off a bit.
+
+Upstream-Status: Backport
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ gio/giotypes.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/gio/giotypes.h b/gio/giotypes.h
+index 4342d47..53f8cc9 100644
+--- a/gio/giotypes.h
++++ b/gio/giotypes.h
+@@ -61,8 +61,6 @@ typedef struct _GPermission GPermission;
+
+ typedef struct _GMenuModel GMenuModel;
+ typedef struct _GNotification GNotification;
+-typedef struct _GListModel GListModel;
+-typedef struct _GListStore GListStore;
+
+ /**
+ * GDrive:
+--
+1.7.9.5
+
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.42.1.bb
deleted file mode 100644
index 69b3ef8e37..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require glib.inc
-
-PE = "1"
-
-SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-
-SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
- file://configure-libtool.patch \
- file://fix-conflicting-rand.patch \
- file://add-march-i486-into-CFLAGS-automatically.patch \
- file://glib-2.0-configure-readlink.patch \
- file://run-ptest \
- file://ptest-paths.patch \
- file://uclibc.patch \
- file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
- file://allow-run-media-sdX-drive-mount-if-username-root.patch \
- "
-
-SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
-
-SRC_URI[md5sum] = "89c4119e50e767d3532158605ee9121a"
-SRC_URI[sha256sum] = "8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
new file mode 100644
index 0000000000..227e1b4333
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb
@@ -0,0 +1,23 @@
+require glib.inc
+
+PE = "1"
+
+SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+
+SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
+ file://configure-libtool.patch \
+ file://fix-conflicting-rand.patch \
+ file://add-march-i486-into-CFLAGS-automatically.patch \
+ file://glib-2.0-configure-readlink.patch \
+ file://run-ptest \
+ file://ptest-paths.patch \
+ file://uclibc.patch \
+ file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
+ file://allow-run-media-sdX-drive-mount-if-username-root.patch \
+ file://0001-GListModel-roll-back-use-of-type-redefinition.patch \
+ "
+
+SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
+
+SRC_URI[md5sum] = "74cf7b4ea200b76e42a4c22c8daf0f93"
+SRC_URI[sha256sum] = "f2d362b106a08fa801770d41829a06fcfe287a00421018869eebf5efc796f5b9"
--
cgit v1.2.3-54-g00ecf