From 618331aefa5486e6d303721a2ac4d54d21362453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 19 Feb 2015 19:39:26 +0100
Subject: [PATCH] gpgme: add own version here supporting native build with
 aligned binconfig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Complaints introducing this in oe-core are correct: we cannot assure that
native build is same as cross one.

Correct strategy should be to fix kwallet so that it detects flavors of gpgme
by pkg-config (libs?)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../gpgme/0001-return-unknown-as-host.patch   | 33 ++++++++++++++
 extends-oe-core/gpgme/gpgme.pc                | 10 +++++
 extends-oe-core/gpgme_1.4.3.bb                | 45 +++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 extends-oe-core/gpgme/0001-return-unknown-as-host.patch
 create mode 100644 extends-oe-core/gpgme/gpgme.pc
 create mode 100644 extends-oe-core/gpgme_1.4.3.bb

diff --git a/extends-oe-core/gpgme/0001-return-unknown-as-host.patch b/extends-oe-core/gpgme/0001-return-unknown-as-host.patch
new file mode 100644
index 00000000..7dabd981
--- /dev/null
+++ b/extends-oe-core/gpgme/0001-return-unknown-as-host.patch
@@ -0,0 +1,33 @@
+From 84427b2fd68f6c56f3919fdddad63cf5b5541730 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 4 Dec 2014 13:31:15 +0100
+Subject: [PATCH] return unknown as host
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+this is intended for native build which cannot know target host
+
+Upstream-Status: Inappropriate [cross build specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 92375e6..4564c05 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -989,7 +989,7 @@ AH_BOTTOM([
+ # Substitution used for gpgme-config
+ GPGME_CONFIG_LIBS="-lgpgme"
+ GPGME_CONFIG_CFLAGS=""
+-GPGME_CONFIG_HOST="$host"
++GPGME_CONFIG_HOST="unknown"
+ AC_SUBST(GPGME_CONFIG_API_VERSION)
+ AC_SUBST(GPGME_CONFIG_LIBS)
+ AC_SUBST(GPGME_CONFIG_CFLAGS)
+-- 
+1.8.3.1
+
diff --git a/extends-oe-core/gpgme/gpgme.pc b/extends-oe-core/gpgme/gpgme.pc
new file mode 100644
index 00000000..30a4d56d
--- /dev/null
+++ b/extends-oe-core/gpgme/gpgme.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: gpgme
+Description: GNU Privacy Guard Made Easy
+Version: 1.4.3
+Requires:
+Libs: -L${libdir} -lgpgme -lassuan -lgpg-error
+Cflags: -I${includedir}
diff --git a/extends-oe-core/gpgme_1.4.3.bb b/extends-oe-core/gpgme_1.4.3.bb
new file mode 100644
index 00000000..0b93ce4a
--- /dev/null
+++ b/extends-oe-core/gpgme_1.4.3.bb
@@ -0,0 +1,45 @@
+SUMMARY = "High-level GnuPG encryption/signing API"
+DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management"
+HOMEPAGE = "http://www.gnupg.org/gpgme.html"
+BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
+
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
+                    file://src/gpgme.h.in;endline=23;md5=dccb4bb624011e36513c61ef0422d054 \
+                    file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
+           file://gpgme.pc"
+
+SRC_URI_append_class-native = " file://0001-return-unknown-as-host.patch"
+
+SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
+SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496"
+
+DEPENDS = "libgpg-error libassuan"
+
+EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm --with-gpgconf=no --with-g13=no"
+
+inherit autotools texinfo pkgconfig
+
+PACKAGES =+ "${PN}-pthread"
+FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
+FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"
+
+do_configure_prepend () {
+	# Else these could be used in preference to those in aclocal-copy
+	rm -f ${S}/m4/gpg-error.m4
+	rm -f ${S}/m4/libassuan.m4
+}
+
+do_install_append () {
+        install -d ${D}${libdir}/pkgconfig
+        install -m 0644 ${WORKDIR}/gpgme.pc ${D}${libdir}/pkgconfig/
+}
+
+do_install_append_class-native () {
+	sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}${bindir}/gpgme-config
+}
+
+BBCLASSEXTEND = "native"