[2/7] pull in upstream fix for gnome keyring to use the right include as well as fn prototype signatures.

Message ID 1370455890-18305-2-git-send-email-tom.gall@linaro.org
State New
Headers show

Commit Message

Tom Gall June 5, 2013, 6:11 p.m.
Signed-off-by: Tom Gall <tom.gall@linaro.org>
---
 .../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

Patch hide | download patch | download mbox

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 <glib.h>
++#include <libtasn1.h>
+ 
+ #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 \
+"