From patchwork Wed Jun 5 18:11:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 17569 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D5F7825DEA for ; Wed, 5 Jun 2013 18:11:48 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id fo13sf1830208lab.5 for ; Wed, 05 Jun 2013 11:11:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=2kCW3YSnD6W7fR2yh56TH77Rz0JjPuJwKUYYJjSuQ/o=; b=ZhFHUVjcgCW1Q0rZWBvqCtvrFzfwQfoV9qADtjcfUyowr9l0RrPoF1adRD8YZat7dX Xy7GsJkUDunbC6dvHvi+yw+nkORh4qzdHZhEvmSnUEne3UXaq4MszgVGdGdQf3/GFiUM 7TMrpEbszej8Qp67qj5kM0STcMq6gYc1ZHpMUSS2haLlgo+sYCkrzogIIAsS5gcMeyAZ QAFdrdB8JIVdUFiTf95CMcSUOCNN4gOij9u/fJ+5IV76o3xhfNesqAZuPfHA/Po5AFhh teUPH0r41qh6+FsSkRruCE+HSyKwy5dz5SLySvrudB7weIvcr2rlRazDROcl+vHDXdch O2AA== X-Received: by 10.180.187.115 with SMTP id fr19mr3029808wic.4.1370455907127; Wed, 05 Jun 2013 11:11:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.48.4 with SMTP id h4ls1034693qen.50.gmail; Wed, 05 Jun 2013 11:11:46 -0700 (PDT) X-Received: by 10.220.83.138 with SMTP id f10mr20894566vcl.7.1370455906456; Wed, 05 Jun 2013 11:11:46 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id tq4si40009052vdc.144.2013.06.05.11.11.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Jun 2013 11:11:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hf12so1367008vcb.1 for ; Wed, 05 Jun 2013 11:11:46 -0700 (PDT) X-Received: by 10.52.155.67 with SMTP id vu3mr17783300vdb.94.1370455906265; Wed, 05 Jun 2013 11:11:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.10.206 with SMTP id pb14csp31637vcb; Wed, 5 Jun 2013 11:11:45 -0700 (PDT) X-Received: by 10.182.137.196 with SMTP id qk4mr15758170obb.53.1370455905560; Wed, 05 Jun 2013 11:11:45 -0700 (PDT) Received: from mail-ie0-x232.google.com (mail-ie0-x232.google.com [2607:f8b0:4001:c03::232]) by mx.google.com with ESMTPS id ry2si30580522oeb.56.2013.06.05.11.11.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Jun 2013 11:11:45 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:4001:c03::232 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c03::232; Received: by mail-ie0-f178.google.com with SMTP id at1so570066iec.37 for ; Wed, 05 Jun 2013 11:11:45 -0700 (PDT) X-Received: by 10.50.56.11 with SMTP id w11mr3969760igp.50.1370455905054; Wed, 05 Jun 2013 11:11:45 -0700 (PDT) Received: from mars.mantorvilleexpress.com ([70.35.96.184]) by mx.google.com with ESMTPSA id gz1sm7076010igb.5.2013.06.05.11.11.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Jun 2013 11:11:44 -0700 (PDT) From: Tom Gall To: patches@linaro.org Cc: Tom Gall Subject: [PATCH 2/7] pull in upstream fix for gnome keyring to use the right include as well as fn prototype signatures. Date: Wed, 5 Jun 2013 13:11:25 -0500 Message-Id: <1370455890-18305-2-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1370455890-18305-1-git-send-email-tom.gall@linaro.org> References: <1370455890-18305-1-git-send-email-tom.gall@linaro.org> X-Gm-Message-State: ALoCoQlVAuwkytU/jCc4hmqemCvDpJuZhM9uVx15VeacT85NHvO4I1NAmeG5XcRa+FI13fHr4PYC X-Original-Sender: tom.gall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Tom Gall --- .../gnome-keyring/files/aarch64-build-fix.diff | 29 ++++++++++++++++++++ .../gnome-keyring/gnome-keyring_2.32.1.bbappend | 5 ++++ 2 files changed, 34 insertions(+) create mode 100644 meta-aarch64/recipes-gnome/gnome-keyring/files/aarch64-build-fix.diff create mode 100644 meta-aarch64/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bbappend diff --git a/meta-aarch64/recipes-gnome/gnome-keyring/files/aarch64-build-fix.diff b/meta-aarch64/recipes-gnome/gnome-keyring/files/aarch64-build-fix.diff new file mode 100644 index 0000000..3ef5a59 --- /dev/null +++ b/meta-aarch64/recipes-gnome/gnome-keyring/files/aarch64-build-fix.diff @@ -0,0 +1,29 @@ +Index: gnome-keyring-2.32.1/egg/egg-asn1x.h +=================================================================== +--- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h ++++ gnome-keyring-2.32.1/egg/egg-asn1x.h +@@ -25,6 +25,7 @@ + #define EGG_ASN1X_H_ + + #include ++#include + + #ifndef HAVE_EGG_ALLOCATOR + typedef void* (*EggAllocator) (void* p, gsize); +@@ -35,13 +36,13 @@ typedef gboolean (*EggAsn1xEncoder) (gpo + + struct static_struct_asn; + +-GNode* egg_asn1x_create (const struct static_struct_asn *defs, ++GNode* egg_asn1x_create (const ASN1_ARRAY_TYPE *defs, + const gchar *type); + +-GNode* egg_asn1x_create_quark (const struct static_struct_asn *defs, ++GNode* egg_asn1x_create_quark (const ASN1_ARRAY_TYPE *defs, + GQuark type); + +-GNode* egg_asn1x_create_and_decode (const struct static_struct_asn *defs, ++GNode* egg_asn1x_create_and_decode (const ASN1_ARRAY_TYPE *defs, + const gchar *type, + gconstpointer data, + gsize n_data); diff --git a/meta-aarch64/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bbappend b/meta-aarch64/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bbappend new file mode 100644 index 0000000..88cf0b4 --- /dev/null +++ b/meta-aarch64/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI_append = " \ + file://aarch64-build-fix.diff \ +"