summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYuan Chao <yuanc.fnst@cn.fujitsu.com>2019-08-07 14:37:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-08 10:17:56 +0100
commit6cc148f8e7453ef4413ec44099a4899a4b435da2 (patch)
treedef2830c201002506001f12737416186126f9c97 /meta
parent62aeba48401cba34b9cc6dc5ee14685a1a29c5d3 (diff)
downloadopenembedded-core-6cc148f8e7453ef4413ec44099a4899a4b435da2.tar.gz
openembedded-core-6cc148f8e7453ef4413ec44099a4899a4b435da2.tar.bz2
openembedded-core-6cc148f8e7453ef4413ec44099a4899a4b435da2.zip
gpgme:upgrade 1.13.0 -> 1.13.1
Refresh the following patch: 0007-python-Add-variables-to-tests.patch Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch24
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.13.1.bb (renamed from meta/recipes-support/gpgme/gpgme_1.13.0.bb)4
2 files changed, 15 insertions, 13 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch b/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch
index af9ddbf24b..4c97f63cc2 100644
--- a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch
+++ b/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch
@@ -1,6 +1,6 @@
-From 317cdf60165d760572a26db317e3d6edb159b04e Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 17 Oct 2018 23:41:09 +0800
+From 093c88817397425ee4c2333c469467229a46c9e1 Mon Sep 17 00:00:00 2001
+From: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
+Date: Mon, 5 Aug 2019 01:00:58 +0900
Subject: [PATCH 7/7] python: Add variables to tests
* configure.ac, lang/python/Makefile.am:
@@ -9,16 +9,18 @@ Subject: [PATCH 7/7] python: Add variables to tests
Upstream-Status: Submitted [gnupg-devel@gnupg.org]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
---
configure.ac | 5 +++++
lang/python/Makefile.am | 3 +++
2 files changed, 8 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 865bd10..035555a 100644
+index bd85886..b5ae42e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -535,6 +535,11 @@ AC_ARG_ENABLE(g13-test,
+@@ -533,6 +533,11 @@ AC_ARG_ENABLE(g13-test,
run_g13_test=$enableval)
AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes")
@@ -31,17 +33,17 @@ index 865bd10..035555a 100644
# Checks for header files.
AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
-index ce9a108..0c8cfdc 100644
+index 551deee..0fd555e 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
-@@ -25,7 +25,10 @@ EXTRA_DIST = \
- doc \
- src
+@@ -23,7 +23,10 @@ EXTRA_DIST = \
+ gpgme.i \
+ helpers.c helpers.h private.h
++SUBDIRS = . examples doc src
+if RUN_LANG_PYTHON_TESTS
- SUBDIRS = . tests
+ SUBDIRS = . tests examples doc src
+endif
-+
.PHONY: prepare
prepare: copystamp
diff --git a/meta/recipes-support/gpgme/gpgme_1.13.0.bb b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
index cbd37da303..9fc1ae24a4 100644
--- a/meta/recipes-support/gpgme/gpgme_1.13.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
@@ -22,8 +22,8 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
file://0008-do-not-auto-check-var-PYTHON.patch \
"
-SRC_URI[md5sum] = "e511a0d95c507ab87e713140c82fc7d0"
-SRC_URI[sha256sum] = "d4b23e47a9e784a63e029338cce0464a82ce0ae4af852886afda410f9e39c630"
+SRC_URI[md5sum] = "198f0a908ec3cd8f0ce9a4f3a4489645"
+SRC_URI[sha256sum] = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46"
DEPENDS = "libgpg-error libassuan"
RDEPENDS_${PN}-cpp += "libstdc++"