diff options
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.44.0.bb) | 5 |
2 files changed, 2 insertions, 45 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 deleted file mode 100644 index 7d957434e8..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-GListModel-roll-back-use-of-type-redefinition.patch +++ /dev/null @@ -1,42 +0,0 @@ -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.44.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb index 227e1b4333..8eaccfbb1a 100644 --- 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.1.bb @@ -14,10 +14,9 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ 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" +SRC_URI[md5sum] = "83efba4722a9674b97437d1d99af79db" +SRC_URI[sha256sum] = "8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07" |