From patchwork Sat Mar 31 19:21:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 132633 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp933930ljb; Sat, 31 Mar 2018 12:21:21 -0700 (PDT) X-Google-Smtp-Source: AIpwx49QmzoK+1bWTTmnjrp3TdnVhpGF4H2kds3Oh9rGW+Q/J4+9SkvcWOIVLwaZL+oEqWWj3LHg X-Received: by 10.101.97.134 with SMTP id c6mr2516104pgv.370.1522524081270; Sat, 31 Mar 2018 12:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522524081; cv=none; d=google.com; s=arc-20160816; b=HwKIufSR7igh0CkRmXjgj3WiyA/uDW8IB/QpD3mvsAAie2BlESerOBuZHazCGAwbqB RhOirGYyR0a7Dnh52VwL5fMyowNG43gCPo9oQZG3kO1qyAz3aWFXYUQufr42XcBMV/uN y018kVPw9QoVUSl3YTkk2NgR09Qxm2SqP2JUUjAWpgGET/ZhFxyw/IHJUxPnHg/TZIlz FWffnJOnF+Ud4fi/0LllwoXb/h99ZPUeZHeEaRVozvhMrk65IRRlNRb8G8naNZ6/weXA zvhrdF6s0S6lQG04MCnCDteG/hlzpKp3P5h9+DCR0PwV5ryHaJIBItc0DNUl2Fst7ssh giEA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=OeiSUWReKV4I/NhY9lzuw4NP7fYaedF/Zg0s2DLO8uA=; b=ATmugRfkOBgFVKX51zvc8WDhxdmrdsXC1WFhDDeUBtj0Gx3dIf8Utc1fctNM61jSbs RlQSabqrxXLDdKXYgaPhYbWwk4oKZXQaOe0GUCvxgTXmtWdqCjg2h9D4n5XSQt88km+6 jlUZqH5DnHtQS6n6ncef3I9lv0xDwPdp+9qYCn+tOhm/DC7LQtGNLz/9iU/oh+B90bb3 PRLa0IazkX492+TK7LRpMrwfgR9DMF1KYfd9d6St8v3WLPerPYGVsoxKrqHL2kOIrgpk 7fTXdKAC2bHCnf8HiQVG4UhPdA+WgQmFvRvCocwJRC4UJWTSuqJQ4u0nnWaxFRqT215p iVrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Eib6L4kr; 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=QUARANTINE 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 b126si7451534pgc.476.2018.03.31.12.21.19; Sat, 31 Mar 2018 12:21:21 -0700 (PDT) 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=Eib6L4kr; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id ABD7E74685; Sat, 31 Mar 2018 19:21:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id 9B20E746AC for ; Sat, 31 Mar 2018 19:21:11 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id m68so7440935pfm.11 for ; Sat, 31 Mar 2018 12:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=iYq6Ap7PCRPUcQ254kZouew3qxbMXgT8xSQ4QUmrBxU=; b=Eib6L4kr58EvX0ik88icV4a+ctfeV89pPK1yB3dmeIW9cEbKymQo6yydpnuPpqcFGZ d3OH1+wMcEX+84A4ZY9rtx6PysHozg/vsuPzkkJdHyTRn7jJZnsjpUwvkRv4xA8wjDhK If8A6YHnoEoZ8eiyYU+veZiKLRyqy7WcEZIpVhHkxrMPPn5T5DfZBGiMhG/TBgaM+eoC NJh1/WDR8mthQa45WzZwXyO5ytWWtVGGOA+t/ik0w4PDPezkUaXkPlFRVj+ermotMRYo g8GD5m5oQvmDMfJIK1LiMO/CweE6n7sHlgUxasVXL5JHDumozsUJyjo2rFgNL4SiMv0Y cZIg== 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; bh=iYq6Ap7PCRPUcQ254kZouew3qxbMXgT8xSQ4QUmrBxU=; b=gOPILWl2i861VIUcjQ9PHRhcuouwoXdQU7+Ic348l1OnGSRNJGxPvPXPORtvq0vIay aQdMXLI6ktpTVgGCgwD/4Oj85MAaxDhGftrEBOnAtgXkX6z3LcEjpSbxP3bFXtVoJWRz ZMeojQqZi9QJ+uNciG+QSltVVWit6DYqxWQqkdexC5pkrwrWh/90Z9gol5Jru9J7vKJC U5X3XPtP7rqj+YhiAOIVjS41P01LRONvd8zc7e59Kaowvi9EqDLfmWcc/B4TDX9yu2JG HfioRaMqzMhSbZGVsMNvasoQDW9VXgz1dfxiC6LvzbQzgpY98k9clkVs98jfTh03lhe3 4Cag== X-Gm-Message-State: AElRT7FKdC23qD1AXd735gqr9hQgGeCugeBzzJGiSSBemG5LIBPqmv2j ndE2cZnFWz3RnkLmK4B/l97PWw== X-Received: by 2002:a17:902:85:: with SMTP id a5-v6mr3875101pla.99.1522524072145; Sat, 31 Mar 2018 12:21:12 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id y18sm21207015pfe.67.2018.03.31.12.21.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 12:21:11 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 31 Mar 2018 12:21:03 -0700 Message-Id: <20180331192103.25983-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.3 Subject: [oe] [meta-oe][PATCH] glibmm: Backport patch to fix invalid code in glibmm/threads.h 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 Signed-off-by: Khem Raj --- .../0001-Glib-Threads-Private-Fix-gobj.patch | 40 ++++++++++++++++++++++ meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch -- 2.16.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch b/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch new file mode 100644 index 000000000..7899022f1 --- /dev/null +++ b/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch @@ -0,0 +1,40 @@ +From 838fe84c2ddcc9af51c34f751defbf3dd0ba8a06 Mon Sep 17 00:00:00 2001 +From: Kjell Ahlstedt +Date: Wed, 20 Dec 2017 20:00:32 +0100 +Subject: [PATCH] Glib::Threads::Private: Fix gobj() + +Bug 791711 + +Signed-off-by: Khem Raj +--- +Upstream-Status: Backport [https://github.com/GNOME/glibmm/commit/37d57ae9572b7d74aa385a30313eceae7f2d3fce] + glib/glibmm/threads.h | 2 +- + glib/src/threads.hg | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h +index f7e2b82a..2c0cbe8c 100644 +--- a/glib/glibmm/threads.h ++++ b/glib/glibmm/threads.h +@@ -657,7 +657,7 @@ public: + */ + inline void replace(T* data); + +- GPrivate* gobj() { return gobject_; } ++ GPrivate* gobj() { return &gobject_; } + + private: + GPrivate gobject_; +diff --git a/glib/src/threads.hg b/glib/src/threads.hg +index 86d7a17b..c82a6130 100644 +--- a/glib/src/threads.hg ++++ b/glib/src/threads.hg +@@ -628,7 +628,7 @@ public: + */ + inline void replace(T* data); + +- GPrivate* gobj() { return gobject_; } ++ GPrivate* gobj() { return &gobject_; } + + private: + GPrivate gobject_; diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb index 3a69a7057..4706432ab 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb @@ -13,6 +13,7 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = " \ ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ file://remove-examples.patch \ + file://0001-Glib-Threads-Private-Fix-gobj.patch \ " SRC_URI[md5sum] = "dee5ebe309f5976c3dacfcf5c43a062b" SRC_URI[sha256sum] = "7cc28c732b04d70ed34f0c923543129083cfb90580ea4a2b4be5b38802bf6a4a"