From patchwork Thu Dec 14 17:36:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 122000 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp7105864qgn; Thu, 14 Dec 2017 09:37:03 -0800 (PST) X-Google-Smtp-Source: ACJfBos7lsI40P8nZF3Wtp3/+3KI9cYP6+7gicC0QkMDSPFM3voFINBGC60umpjH3XhRkOJWjP4E X-Received: by 10.84.248.131 with SMTP id q3mr10516722pll.428.1513273023814; Thu, 14 Dec 2017 09:37:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513273023; cv=none; d=google.com; s=arc-20160816; b=b+6n06UVTZ7jWfMOiGamSeiKWG+slLyxCTrAS6tE1iCOiJi6c6I9LNzKcFz+qUJy0W +dtdz2ZDdGyIZ33i9gWu9IIoIKAfnWrZnp1+ySnGcEgXYMT1gnqGVr4/sukGaGueQ5Vn Z2qND2a9ueMut5qKkALOFDtjU3a+kmcBQhslsWFca1bmDa33mwskfB38Z118hqiJg2gL OaKVyNg4AKvOcjzxSADyAF9LsEATssQcrRTamnK+HIEY5jAmlFVXAPXwYEGMHr1JxqRG q5p7lKE44a4MoUzYWgeWXb1oYxSs2zq0zlCyXj3jzouyOlCYPMbYvTJ7b/Gr4Dd099Yz du1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=pM/MZG4+iBPno0clA8SIwQSAyr9rufNsOSmrGupBMbg=; b=wwpmnG3EmRmnzpD1lLc5fjvD8XTkRa4q8hoUl3QuHwcqUZOIgTiVszPoDskNMotLP5 RQP/Kl6SuRyy7GhnLQYAp9RUiodwRdlwlM960LxyVw3pehMGn0b8rQCb95kiLYzQ+JWo xdQUIVOdz/PDCezCcNdzTUnRhi46kLYKIROWs/K67gtBmozmZeaQ3tgZ/dbHAx4udNrL EEGa5MMUWHPQC5zSr2lZkddUcGM8g1D6ibkSJ9wVcvIRe6XhCABGHY3YdEfu5KxFOovS GznObac18D1NQFpsHakd6HJop84zjNhwxfWavYg+cmmLVKYIuWMlUp1xuUCbxoaZhW7z xsQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tLlhUhgS; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z78si3540838pfk.259.2017.12.14.09.37.03; Thu, 14 Dec 2017 09:37:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tLlhUhgS; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 09B177884D; Thu, 14 Dec 2017 17:36:55 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id 53A4F78821 for ; Thu, 14 Dec 2017 17:36:45 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id p84so4110335pfd.3 for ; Thu, 14 Dec 2017 09:36:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5b/YV/+0qgkaevwdGenRWATaqdqFyjexiDroTp9dJ1M=; b=tLlhUhgSHKQ0vVuABYEdqYNMoYtlVQdVlc+ah7d6bYhnYhlX0j+Wk+IBbTUeXAntMy a7ehgJvNnofqViHs19w1Sg3IyDhzaRBDWBXRI2zXO9owlDNcXqP+XK/xZ6MHzH9sqp3H o1Ku0fkc6luYOxwHxx53AcehooRtlh74BsC47WYbpdtVz1+iOjZxVlLJv4G221cCIEZ3 a7BpdWA7IFS+iiM8Fj3kKzfTwK0OvDWYTdq4gnY7+1J69UzxpVlpDa1cpNyUhRvPVou7 qPAuTXZBLNvRvdf7CMUShylSTZgyItm+F++sLwnCXYp98jkWmzi53WkM9Y+PskmRa1Rz 2g/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5b/YV/+0qgkaevwdGenRWATaqdqFyjexiDroTp9dJ1M=; b=noSnYIfqinK0IWdPMWm9t2g8hrFnBVyStmDAUqqOBg786K1/6n3rI0Mnyd464yyepw 7Kmq3gPndFH0y+q5JLOgeRVtPEX/S0GD0n46fOoQCO07Nj3tJ7U/HZPTFWBHyM46EcOM eCv5Oy+h4Juz0GsEAHoJ8kDE5YRaf/Ae0ldN8+PA8aFTRelK1qjTPu8G2m2hUffibUQH 3LysOFJaDlh0KBB7V6kfMRGjFlWoAfzO0KobLPfXu6lhxP6U3QwOe3sEHqZGvSTjiMVT qkj8QqhisbsmBk6RbzYiP0Ae/jYUL8NFUzJmtSrU78LFkfkW0FM0ga7ZjqsAOkoDSJ53 Rimg== X-Gm-Message-State: AKGB3mLRTNgV/enH0u4U1UuBhu/h6vnQdeqThC75MET0BFei+5H4pRT/ O2k/1FbFRAEUBkMWX0eiRR5fdQ== X-Received: by 10.84.214.136 with SMTP id j8mr10283778pli.408.1513273007235; Thu, 14 Dec 2017 09:36:47 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::c579]) by smtp.gmail.com with ESMTPSA id l14sm7437748pgn.9.2017.12.14.09.36.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 09:36:45 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 14 Dec 2017 09:36:31 -0800 Message-Id: <20171214173633.16405-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171214173633.16405-1-raj.khem@gmail.com> References: <20171214173633.16405-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/5] glade: Fix build with glib-2.0 > 2.53.4 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org 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 --- .../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 -- 2.15.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel 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 +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 + + 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"