summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-12-11 02:10:07 -0500
committerArmin Kuster <akuster808@gmail.com>2017-12-22 19:43:54 -0800
commitbdd61709ba49c3906ffe7cd5a474e967ff087ac7 (patch)
tree6b8b7b61007b01eef358ad847d68c25e96adbb24
parent1d943254ce7fb9a88e79ef175c8ec0d3d26dbbad (diff)
downloadmeta-openembedded-bdd61709ba49c3906ffe7cd5a474e967ff087ac7.tar.gz
glade: 3.20.0 -> 3.20.2
Since glib-2.0 updated to 2.54.2, build glade 3.20.0 failed ... |../../glade-3.20.0/gladeui/glade-signal-model.c:68:1: error: conflicting types for 'g_ptr_array_find' | g_ptr_array_find (GPtrArray *array, gpointer data) ... The following commit in the new version fixed the issue. ... commit cb87c89745c93969c3742e7a8a11d546c00107c8 Author: Juan Pablo Ugarte <juanpablougarte@gmail.com> Date: Fri Aug 11 18:17:18 2017 -0300 GladeSignalModel: rename g_ptr_array_find() to prt_array_find() GLib 2.54 introduced g_ptr_array_find() which clashes with our own function gladeui/glade-signal-model.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ... Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/glade/glade_3.20.2.bb (renamed from meta-oe/recipes-devtools/glade/glade_3.20.0.bb)4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/glade/glade_3.20.0.bb b/meta-oe/recipes-devtools/glade/glade_3.20.2.bb
index f33b6e31b..ad91ca332 100644
--- a/meta-oe/recipes-devtools/glade/glade_3.20.0.bb
+++ b/meta-oe/recipes-devtools/glade/glade_3.20.2.bb
@@ -14,8 +14,8 @@ inherit autotools pkgconfig gnomebase gobject-introspection
14SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade/3.20/glade-${PV}.tar.xz \ 14SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade/3.20/glade-${PV}.tar.xz \
15 file://remove-yelp-help-rules-var.patch \ 15 file://remove-yelp-help-rules-var.patch \
16 " 16 "
17SRC_URI[md5sum] = "9964a2da14c5f845eae363889586ca43" 17SRC_URI[md5sum] = "d3dd9ba33c7d7c854ab207e1ba844dda"
18SRC_URI[sha256sum] = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe" 18SRC_URI[sha256sum] = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed"
19 19
20EXTRA_OECONF += "--disable-man-pages" 20EXTRA_OECONF += "--disable-man-pages"
21 21