summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2021-01-21 12:56:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-23 17:08:54 +0000
commit80f38cff27a8df98b6f5f92057b7c8b37308d51d (patch)
tree64281793a889d6194ae95cceb270efeaf4d6dcae
parentc5b1cb506b8e7b319d8765fae708c7a3b1da8d1c (diff)
downloadpoky-80f38cff27a8df98b6f5f92057b7c8b37308d51d.tar.gz
gpgme: upgrade 1.15.0 -> 1.15.1
refresh the followning patches: 0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch (From OE-Core rev: cabf519e6af08d590ba55a4b2680b198e90b9826) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch8
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.15.1.bb (renamed from meta/recipes-support/gpgme/gpgme_1.15.0.bb)2
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
index 0ed4eb6818..0c15cc7c38 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
+++ b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
@@ -11,11 +11,11 @@ Upstream-Status: Inappropriate [oe-core specific]
11 11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13--- 13---
14 src/gpgme.m4 | 58 ++++++++++------------------------------------------------ 14 src/gpgme.m4 | 58 +++++++++-------------------------------------------
15 1 file changed, 10 insertions(+), 48 deletions(-) 15 1 file changed, 10 insertions(+), 48 deletions(-)
16 16
17diff --git a/src/gpgme.m4 b/src/gpgme.m4 17diff --git a/src/gpgme.m4 b/src/gpgme.m4
18index 2a72f18..6c2be44 100644 18index c749a5d..8579146 100644
19--- a/src/gpgme.m4 19--- a/src/gpgme.m4
20+++ b/src/gpgme.m4 20+++ b/src/gpgme.m4
21@@ -1,5 +1,5 @@ 21@@ -1,5 +1,5 @@
@@ -29,7 +29,7 @@ index 2a72f18..6c2be44 100644
29 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the 29 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
30 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 30 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
31 # 31 #
32-# Last-changed: 2018-11-12 32-# Last-changed: 2020-11-20
33+# Last-changed: 2014-10-02 33+# Last-changed: 2014-10-02
34 34
35 35
@@ -130,5 +130,5 @@ index 2a72f18..6c2be44 100644
130 ifelse([$2], , :, [$2]) 130 ifelse([$2], , :, [$2])
131 _AM_PATH_GPGME_CONFIG_HOST_CHECK 131 _AM_PATH_GPGME_CONFIG_HOST_CHECK
132-- 132--
1332.7.4 1332.25.1
134 134
diff --git a/meta/recipes-support/gpgme/gpgme_1.15.0.bb b/meta/recipes-support/gpgme/gpgme_1.15.1.bb
index 9264af8c5d..dc38aa8e3c 100644
--- a/meta/recipes-support/gpgme/gpgme_1.15.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.15.1.bb
@@ -22,7 +22,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
22 file://0008-do-not-auto-check-var-PYTHON.patch \ 22 file://0008-do-not-auto-check-var-PYTHON.patch \
23 " 23 "
24 24
25SRC_URI[sha256sum] = "0b472bc12c7d455906c8a539ec56da0a6480ef1c3a87aa5b74d7125df68d0e5b" 25SRC_URI[sha256sum] = "eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad"
26 26
27DEPENDS = "libgpg-error libassuan" 27DEPENDS = "libgpg-error libassuan"
28RDEPENDS_${PN}-cpp += "libstdc++" 28RDEPENDS_${PN}-cpp += "libstdc++"