diff options
author | Yuan Chao <yuanc.fnst@cn.fujitsu.com> | 2019-08-07 14:37:06 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-08 10:19:56 +0100 |
commit | cd1f08e28d84d11a141f71d0a0822e0c439a76b4 (patch) | |
tree | f88757f6b3c993684a0c01206fefe368f65296e3 /meta | |
parent | 534dc2e004fb499d2d7063340e26cfe816175b63 (diff) | |
download | poky-cd1f08e28d84d11a141f71d0a0822e0c439a76b4.tar.gz |
gpgme:upgrade 1.13.0 -> 1.13.1
Refresh the following patch:
0007-python-Add-variables-to-tests.patch
(From OE-Core rev: 6cc148f8e7453ef4413ec44099a4899a4b435da2)
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.patch | 24 | ||||
-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 @@ | |||
1 | From 317cdf60165d760572a26db317e3d6edb159b04e Mon Sep 17 00:00:00 2001 | 1 | From 093c88817397425ee4c2333c469467229a46c9e1 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> |
3 | Date: Wed, 17 Oct 2018 23:41:09 +0800 | 3 | Date: Mon, 5 Aug 2019 01:00:58 +0900 |
4 | Subject: [PATCH 7/7] python: Add variables to tests | 4 | Subject: [PATCH 7/7] python: Add variables to tests |
5 | 5 | ||
6 | * configure.ac, lang/python/Makefile.am: | 6 | * configure.ac, lang/python/Makefile.am: |
@@ -9,16 +9,18 @@ Subject: [PATCH 7/7] python: Add variables to tests | |||
9 | Upstream-Status: Submitted [gnupg-devel@gnupg.org] | 9 | Upstream-Status: Submitted [gnupg-devel@gnupg.org] |
10 | 10 | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | |||
13 | Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> | ||
12 | --- | 14 | --- |
13 | configure.ac | 5 +++++ | 15 | configure.ac | 5 +++++ |
14 | lang/python/Makefile.am | 3 +++ | 16 | lang/python/Makefile.am | 3 +++ |
15 | 2 files changed, 8 insertions(+) | 17 | 2 files changed, 8 insertions(+) |
16 | 18 | ||
17 | diff --git a/configure.ac b/configure.ac | 19 | diff --git a/configure.ac b/configure.ac |
18 | index 865bd10..035555a 100644 | 20 | index bd85886..b5ae42e 100644 |
19 | --- a/configure.ac | 21 | --- a/configure.ac |
20 | +++ b/configure.ac | 22 | +++ b/configure.ac |
21 | @@ -535,6 +535,11 @@ AC_ARG_ENABLE(g13-test, | 23 | @@ -533,6 +533,11 @@ AC_ARG_ENABLE(g13-test, |
22 | run_g13_test=$enableval) | 24 | run_g13_test=$enableval) |
23 | AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") | 25 | AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") |
24 | 26 | ||
@@ -31,17 +33,17 @@ index 865bd10..035555a 100644 | |||
31 | # Checks for header files. | 33 | # Checks for header files. |
32 | AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h | 34 | AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h |
33 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am | 35 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am |
34 | index ce9a108..0c8cfdc 100644 | 36 | index 551deee..0fd555e 100644 |
35 | --- a/lang/python/Makefile.am | 37 | --- a/lang/python/Makefile.am |
36 | +++ b/lang/python/Makefile.am | 38 | +++ b/lang/python/Makefile.am |
37 | @@ -25,7 +25,10 @@ EXTRA_DIST = \ | 39 | @@ -23,7 +23,10 @@ EXTRA_DIST = \ |
38 | doc \ | 40 | gpgme.i \ |
39 | src | 41 | helpers.c helpers.h private.h |
40 | 42 | ||
43 | +SUBDIRS = . examples doc src | ||
41 | +if RUN_LANG_PYTHON_TESTS | 44 | +if RUN_LANG_PYTHON_TESTS |
42 | SUBDIRS = . tests | 45 | SUBDIRS = . tests examples doc src |
43 | +endif | 46 | +endif |
44 | + | ||
45 | 47 | ||
46 | .PHONY: prepare | 48 | .PHONY: prepare |
47 | prepare: copystamp | 49 | 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 \ | |||
22 | file://0008-do-not-auto-check-var-PYTHON.patch \ | 22 | file://0008-do-not-auto-check-var-PYTHON.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[md5sum] = "e511a0d95c507ab87e713140c82fc7d0" | 25 | SRC_URI[md5sum] = "198f0a908ec3cd8f0ce9a4f3a4489645" |
26 | SRC_URI[sha256sum] = "d4b23e47a9e784a63e029338cce0464a82ce0ae4af852886afda410f9e39c630" | 26 | SRC_URI[sha256sum] = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46" |
27 | 27 | ||
28 | DEPENDS = "libgpg-error libassuan" | 28 | DEPENDS = "libgpg-error libassuan" |
29 | RDEPENDS_${PN}-cpp += "libstdc++" | 29 | RDEPENDS_${PN}-cpp += "libstdc++" |