From bdd61709ba49c3906ffe7cd5a474e967ff087ac7 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 11 Dec 2017 02:10:07 -0500 Subject: 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 --- meta-oe/recipes-devtools/glade/glade_3.20.0.bb | 25 ------------------------- meta-oe/recipes-devtools/glade/glade_3.20.2.bb | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 meta-oe/recipes-devtools/glade/glade_3.20.0.bb create mode 100644 meta-oe/recipes-devtools/glade/glade_3.20.2.bb diff --git a/meta-oe/recipes-devtools/glade/glade_3.20.0.bb b/meta-oe/recipes-devtools/glade/glade_3.20.0.bb deleted file mode 100644 index f33b6e31b..000000000 --- a/meta-oe/recipes-devtools/glade/glade_3.20.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Glade - A User Interface Designer" -HOMEPAGE = "http://www.gnu.org/software/gnash" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ - file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ - file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "gtk+ gtk+3 glib-2.0 libxml2 intltool-native \ - gnome-common-native \ -" - - -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" - -EXTRA_OECONF += "--disable-man-pages" - -FILES_${PN} += "${datadir}/* ${libdir}/glade/modules/libgladegtk.so" -FILES_${PN}-dev += "${libdir}/glade/modules/libgladegtk.la" -FILES_${PN}-dbg += "${libdir}/glade/modules/.debug/libgladegtk.so" - diff --git a/meta-oe/recipes-devtools/glade/glade_3.20.2.bb b/meta-oe/recipes-devtools/glade/glade_3.20.2.bb new file mode 100644 index 000000000..ad91ca332 --- /dev/null +++ b/meta-oe/recipes-devtools/glade/glade_3.20.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "Glade - A User Interface Designer" +HOMEPAGE = "http://www.gnu.org/software/gnash" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ + file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ + file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "gtk+ gtk+3 glib-2.0 libxml2 intltool-native \ + gnome-common-native \ +" + + +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] = "d3dd9ba33c7d7c854ab207e1ba844dda" +SRC_URI[sha256sum] = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed" + +EXTRA_OECONF += "--disable-man-pages" + +FILES_${PN} += "${datadir}/* ${libdir}/glade/modules/libgladegtk.so" +FILES_${PN}-dev += "${libdir}/glade/modules/libgladegtk.la" +FILES_${PN}-dbg += "${libdir}/glade/modules/.debug/libgladegtk.so" + -- cgit v1.2.3-54-g00ecf