Fixes | ../../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)
Signed-off-by: Khem Raj <[email protected]> --- .../0001-Use-g_ptr_array_find-from-GLib.patch | 93 ++++++++++++++++++++++ meta-oe/recipes-devtools/glade/glade_3.20.0.bb | 1 + 2 files changed, 94 insertions(+) create mode 100644 meta-oe/recipes-devtools/glade/glade/0001-Use-g_ptr_array_find-from-GLib.patch diff --git a/meta-oe/recipes-devtools/glade/glade/0001-Use-g_ptr_array_find-from-GLib.patch b/meta-oe/recipes-devtools/glade/glade/0001-Use-g_ptr_array_find-from-GLib.patch new file mode 100644 index 000000000..d2071f5d2 --- /dev/null +++ b/meta-oe/recipes-devtools/glade/glade/0001-Use-g_ptr_array_find-from-GLib.patch @@ -0,0 +1,93 @@ + +m 8a73d114ca5b4d37a770d0b6b69dd17a366dbcf4 Mon Sep 17 00:00:00 2001 +From: Jonh Wendell <[email protected]> +Date: Thu, 4 May 2017 11:05:48 -0300 +Subject: Use g_ptr_array_find() from GLib + +https://bugzilla.gnome.org/show_bug.cgi?id=782161 +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj <[email protected]> + + configure.ac | 2 ++ + gladeui/glade-signal-model.c | 30 ++++++++++-------------------- + 2 files changed, 12 insertions(+), 20 deletions(-) + +Index: glade-3.20.0/configure.ac +=================================================================== +--- glade-3.20.0.orig/configure.ac ++++ glade-3.20.0/configure.ac +@@ -146,8 +146,10 @@ dnl ==================================== + dnl Check for gtk+ + dnl ================================================================ + GTK_REQUIRED=3.20.0 ++GLIB_REQUIRED=2.53.2 + PKG_CHECK_MODULES([GTK],[ + gtk+-3.0 >= $GTK_REQUIRED ++ glib-2.0 >= $GLIB_REQUIRED + gmodule-2.0 + libxml-2.0 >= 2.4.0 + ]) +Index: glade-3.20.0/gladeui/glade-signal-model.c +=================================================================== +--- glade-3.20.0.orig/gladeui/glade-signal-model.c ++++ glade-3.20.0/gladeui/glade-signal-model.c +@@ -64,18 +64,6 @@ G_DEFINE_TYPE_WITH_CODE (GladeSignalMode + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE, + gtk_tree_drag_source_iface_init)) + +-static gint +-g_ptr_array_find (GPtrArray *array, gpointer data) +-{ +- gint i; +- for (i = 0; i < array->len; i++) +- { +- if (array->pdata[i] == data) +- return i; +- } +- return -1; +-} +- + static void + glade_signal_model_init (GladeSignalModel *object) + { +@@ -524,13 +512,11 @@ glade_signal_model_get_path (GtkTreeMode + { + if (handlers) + { +- gint handler_index = g_ptr_array_find (handlers, handler); +- if (handler_index == -1) /* dummy handler */ +- { +- index1 += handlers->len; +- } +- else ++ guint handler_index; ++ if (g_ptr_array_find (handlers, handler, &handler_index)) + index1 += handler_index; ++ else ++ index1 += handlers->len; + } + break; + } +@@ -582,7 +568,8 @@ glade_signal_model_get_value (GtkTreeMod + { + GPtrArray *handlers = g_hash_table_lookup (sig_model->priv->signals, + glade_signal_get_name (signal)); +- if (!handlers || !handlers->len || g_ptr_array_find (handlers, signal) == 0) ++ guint index; ++ if (!handlers || !handlers->len || (g_ptr_array_find (handlers, signal, &index) && index == 0)) + g_value_set_boolean (value, TRUE); + else + g_value_set_boolean (value, FALSE); +@@ -718,7 +705,10 @@ glade_signal_model_iter_next (GtkTreeMod + } + else if (handlers) + { +- gint new_index = g_ptr_array_find (handlers, handler) + 1; ++ guint new_index = 0; ++ if (g_ptr_array_find (handlers, handler, &new_index)) ++ new_index++; ++ + if (new_index < handlers->len) + { + glade_signal_model_create_signal_iter (sig_model, widget, diff --git a/meta-oe/recipes-devtools/glade/glade_3.20.0.bb b/meta-oe/recipes-devtools/glade/glade_3.20.0.bb index f33b6e31b..ff6dcce26 100644 --- a/meta-oe/recipes-devtools/glade/glade_3.20.0.bb +++ b/meta-oe/recipes-devtools/glade/glade_3.20.0.bb @@ -13,6 +13,7 @@ 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 \ + file://0001-Use-g_ptr_array_find-from-GLib.patch \ " SRC_URI[md5sum] = "9964a2da14c5f845eae363889586ca43" SRC_URI[sha256sum] = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe" -- 2.15.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
