From bdd61709ba49c3906ffe7cd5a474e967ff087ac7 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 11 Dec 2017 02:10:07 -0500 Subject: [PATCH] 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 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 Signed-off-by: Armin Kuster --- .../glade/{glade_3.20.0.bb => glade_3.20.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-devtools/glade/{glade_3.20.0.bb => glade_3.20.2.bb} (86%) diff --git a/meta-oe/recipes-devtools/glade/glade_3.20.0.bb b/meta-oe/recipes-devtools/glade/glade_3.20.2.bb similarity index 86% rename from meta-oe/recipes-devtools/glade/glade_3.20.0.bb rename to meta-oe/recipes-devtools/glade/glade_3.20.2.bb index f33b6e31b0..ad91ca332c 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 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade/3.20/glade-${PV}.tar.xz \ file://remove-yelp-help-rules-var.patch \ " -SRC_URI[md5sum] = "9964a2da14c5f845eae363889586ca43" -SRC_URI[sha256sum] = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe" +SRC_URI[md5sum] = "d3dd9ba33c7d7c854ab207e1ba844dda" +SRC_URI[sha256sum] = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed" EXTRA_OECONF += "--disable-man-pages"