summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-07-02 13:57:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-04 00:02:16 +0100
commitb68ea8b7fe5e9aec1748bc96234f7f9bf7d1a237 (patch)
treee7bf17cb1e7229c44c5ecd876faf88731eeb34d1 /meta
parent29687df30a414472c312781ec2475d3d041bbc5d (diff)
downloadpoky-b68ea8b7fe5e9aec1748bc96234f7f9bf7d1a237.tar.gz
gpgme: 1.10.0 -> 1.11.1
License-Update: copyright years updated 2001-2017 -> 2001-2018 (From OE-Core rev: 82b2a087e4f0f9ff9e602e7b507be94498a7a73b) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch18
-rw-r--r--meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch10
-rw-r--r--meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch6
-rw-r--r--meta/recipes-support/gpgme/gpgme/0004-python-import.patch6
-rw-r--r--meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch6
-rw-r--r--meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch6
-rw-r--r--meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch12
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.11.1.bb (renamed from meta/recipes-support/gpgme/gpgme_1.10.0.bb)6
8 files changed, 35 insertions, 35 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
index f1997e15a3..ae9a46ed4e 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
+++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
@@ -1,7 +1,7 @@
1From 265faf8fe0acaca2043a248a4df02b0868ffa6de Mon Sep 17 00:00:00 2001 1From c452ba58dd2f99d6e624421697417cc018f9a67a Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 16 Aug 2017 02:00:08 -0400 3Date: Fri, 29 Jun 2018 14:35:41 +0800
4Subject: [PATCH 1/4] pkgconfig 4Subject: [PATCH 1/7] pkgconfig
5 5
6Update gpgme to use pkgconfig instead of -config files since its 6Update gpgme to use pkgconfig instead of -config files since its
7simpler and less error prone when cross compiling. 7simpler and less error prone when cross compiling.
@@ -11,7 +11,7 @@ RP 2015/4/17
11 11
12Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 12Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
13 13
14Rebase to 1.9.0 14Rebase to 1.11.1
15 15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17--- 17---
@@ -25,10 +25,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
25 create mode 100644 src/gpgme.pc.in 25 create mode 100644 src/gpgme.pc.in
26 26
27diff --git a/configure.ac b/configure.ac 27diff --git a/configure.ac b/configure.ac
28index 6ea4bcd..2a0d528 100644 28index 2a35404..7485cdf 100644
29--- a/configure.ac 29--- a/configure.ac
30+++ b/configure.ac 30+++ b/configure.ac
31@@ -887,6 +887,7 @@ AC_CONFIG_FILES(Makefile src/Makefile 31@@ -886,6 +886,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
32 src/versioninfo.rc 32 src/versioninfo.rc
33 src/gpgme.h) 33 src/gpgme.h)
34 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) 34 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -37,7 +37,7 @@ index 6ea4bcd..2a0d528 100644
37 AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) 37 AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in)
38 AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) 38 AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in)
39diff --git a/src/Makefile.am b/src/Makefile.am 39diff --git a/src/Makefile.am b/src/Makefile.am
40index ce6f1d4..5f38fee 100644 40index 0a196e0..cecaf8f 100644
41--- a/src/Makefile.am 41--- a/src/Makefile.am
42+++ b/src/Makefile.am 42+++ b/src/Makefile.am
43@@ -19,12 +19,14 @@ 43@@ -19,12 +19,14 @@
@@ -54,7 +54,7 @@ index ce6f1d4..5f38fee 100644
54+pkgconfigdir = $(libdir)/pkgconfig 54+pkgconfigdir = $(libdir)/pkgconfig
55+pkgconfig_DATA = gpgme.pc gpgme-pthread.pc 55+pkgconfig_DATA = gpgme.pc gpgme-pthread.pc
56 56
57 bin_PROGRAMS = gpgme-tool 57 bin_PROGRAMS = gpgme-tool gpgme-json
58 58
59diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in 59diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in
60new file mode 100644 60new file mode 100644
@@ -299,5 +299,5 @@ index 0000000..b69539f
299+Requires: libassuan gpg-error 299+Requires: libassuan gpg-error
300\ No newline at end of file 300\ No newline at end of file
301-- 301--
3021.8.3.1 3022.7.4
303 303
diff --git a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
index d20271e311..4f5cedaca2 100644
--- a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
+++ b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
@@ -1,7 +1,7 @@
1From 30f7a694cc4568ecb24f77c83a6123ed3f4075fa Mon Sep 17 00:00:00 2001 1From 45d828356efc140a1492befb1e6dc59a9f4e16b5 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 31 Jan 2018 10:44:19 +0800 3Date: Wed, 31 Jan 2018 10:44:19 +0800
4Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used 4Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used
5 5
6gpg-error-config was modified by OE to always return an error. 6gpg-error-config was modified by OE to always return an error.
7So we want to find an alternative way to retrieve whatever it 7So we want to find an alternative way to retrieve whatever it
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19 1 file changed, 1 insertion(+), 9 deletions(-) 19 1 file changed, 1 insertion(+), 9 deletions(-)
20 20
21diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in 21diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
22index f9dda20..9f5d61f 100755 22index 2595073..60b5257 100755
23--- a/lang/python/setup.py.in 23--- a/lang/python/setup.py.in
24+++ b/lang/python/setup.py.in 24+++ b/lang/python/setup.py.in
25@@ -26,7 +26,6 @@ import shutil 25@@ -26,7 +26,6 @@ import shutil
@@ -30,7 +30,7 @@ index f9dda20..9f5d61f 100755
30 gpgme_config_flags = ["--thread=pthread"] 30 gpgme_config_flags = ["--thread=pthread"]
31 gpgme_config = ["gpgme-config"] + gpgme_config_flags 31 gpgme_config = ["gpgme-config"] + gpgme_config_flags
32 gpgme_h = "" 32 gpgme_h = ""
33@@ -174,14 +173,7 @@ class BuildExtFirstHack(build): 33@@ -157,14 +156,7 @@ class BuildExtFirstHack(build):
34 34
35 def _generate_errors_i(self): 35 def _generate_errors_i(self):
36 36
@@ -47,5 +47,5 @@ index f9dda20..9f5d61f 100755
47 filter_re = re.compile(r'GPG_ERR_[^ ]* =') 47 filter_re = re.compile(r'GPG_ERR_[^ ]* =')
48 rewrite_re = re.compile(r' *(.*) = .*') 48 rewrite_re = re.compile(r' *(.*) = .*')
49-- 49--
501.8.3.1 502.7.4
51 51
diff --git a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
index 7c9cccc0ea..330bec659b 100644
--- a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
+++ b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
@@ -1,7 +1,7 @@
1From 93aae34ee70b8d50b31a19a65d6ac8290cb148ae Mon Sep 17 00:00:00 2001 1From 60baf9ebf30bed0e2ee3c7c5a74d5b6d50035862 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 30 Jan 2018 15:28:49 +0800 3Date: Tue, 30 Jan 2018 15:28:49 +0800
4Subject: [PATCH 2/4] Correctly install python modules 4Subject: [PATCH 3/7] Correctly install python modules
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
@@ -29,5 +29,5 @@ index 8d74cbd..ce4f0a5 100644
29 done 29 done
30 30
31-- 31--
321.8.3.1 322.7.4
33 33
diff --git a/meta/recipes-support/gpgme/gpgme/0004-python-import.patch b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
index d2b039dacd..1a60f79b6b 100644
--- a/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
+++ b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
@@ -1,7 +1,7 @@
1From 32ecc3f058307060e40af86127cd226248a73c41 Mon Sep 17 00:00:00 2001 1From fd7dcceeee439eb479edbb418bab635343414ee6 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 16 Aug 2017 02:06:45 -0400 3Date: Wed, 16 Aug 2017 02:06:45 -0400
4Subject: [PATCH 3/4] python import 4Subject: [PATCH 4/7] python import
5 5
6Don't check for output on stderr to know if an import worked, host inputrc and 6Don't check for output on stderr to know if an import worked, host inputrc and
7sysroot readline can cause warnings on stderr. 7sysroot readline can cause warnings on stderr.
@@ -30,5 +30,5 @@ index b990d5b..318b089 100644
30 else 30 else
31 AC_MSG_RESULT([no]) 31 AC_MSG_RESULT([no])
32-- 32--
331.8.3.1 332.7.4
34 34
diff --git a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
index 963ae874ca..2da79043dd 100644
--- a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
+++ b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
@@ -1,7 +1,7 @@
1From 6dcedc4dd055af902719b1a1cb10daa935a27f58 Mon Sep 17 00:00:00 2001 1From a58d90632a9907be3e8001800a143ac19075241a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 13 Apr 2017 16:40:27 +0300 3Date: Thu, 13 Apr 2017 16:40:27 +0300
4Subject: [PATCH 4/4] gpgme-config: skip all /lib* or /usr/lib* directories in 4Subject: [PATCH 5/7] gpgme-config: skip all /lib* or /usr/lib* directories in
5 output 5 output
6 6
7The logic was not working in multilib setups which use other 7The logic was not working in multilib setups which use other
@@ -27,5 +27,5 @@ index a4d152e..8342865 100644
27 ;; 27 ;;
28 -L*|-l*) 28 -L*|-l*)
29-- 29--
301.8.3.1 302.7.4
31 31
diff --git a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
index 8cc8983e27..26ff472377 100644
--- a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
+++ b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
@@ -1,7 +1,7 @@
1From 180a5669e4a13a550b1b0dcef1689b6c0470fe54 Mon Sep 17 00:00:00 2001 1From 4f83750ce402b65d16cc09f8a0274a7ec76fc634 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 31 Jan 2018 11:01:09 +0800 3Date: Wed, 31 Jan 2018 11:01:09 +0800
4Subject: [PATCH] fix build path issue 4Subject: [PATCH 6/7] fix build path issue
5 5
6Get the "--root" directory supplied to the "install" command, 6Get the "--root" directory supplied to the "install" command,
7and use it as a prefix to strip off the purported filename 7and use it as a prefix to strip off the purported filename
@@ -33,5 +33,5 @@ index ce4f0a5..5a468f1 100644
33 done 33 done
34 34
35-- 35--
361.8.3.1 362.7.4
37 37
diff --git a/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch b/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch
index ce3745cca0..63eeacf300 100644
--- a/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch
+++ b/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch
@@ -1,7 +1,7 @@
1From f47e8c6f9e461803468a64581d3640d873352eaa Mon Sep 17 00:00:00 2001 1From d3087348348b4a7fcfb05bf2a75b4a63453e1c77 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 1 Feb 2018 10:14:30 +0800 3Date: Thu, 1 Feb 2018 10:14:30 +0800
4Subject: [PATCH] qt/python: Add variables to tests 4Subject: [PATCH 7/7] qt/python: Add variables to tests
5 5
6* configure.ac, lang/python/Makefile.am: 6* configure.ac, lang/python/Makefile.am:
7 New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS 7 New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS
@@ -19,10 +19,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19 3 files changed, 21 insertions(+), 1 deletion(-) 19 3 files changed, 21 insertions(+), 1 deletion(-)
20 20
21diff --git a/configure.ac b/configure.ac 21diff --git a/configure.ac b/configure.ac
22index 608c376..fad7467 100644 22index 7485cdf..4aa216d 100644
23--- a/configure.ac 23--- a/configure.ac
24+++ b/configure.ac 24+++ b/configure.ac
25@@ -536,6 +536,17 @@ AC_ARG_ENABLE(g13-test, 25@@ -535,6 +535,17 @@ AC_ARG_ENABLE(g13-test,
26 run_g13_test=$enableval) 26 run_g13_test=$enableval)
27 AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") 27 AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes")
28 28
@@ -41,7 +41,7 @@ index 608c376..fad7467 100644
41 # Checks for header files. 41 # Checks for header files.
42 AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h 42 AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h
43diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am 43diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
44index 8d74cbd..43b5d1e 100644 44index 5a468f1..43b9788 100644
45--- a/lang/python/Makefile.am 45--- a/lang/python/Makefile.am
46+++ b/lang/python/Makefile.am 46+++ b/lang/python/Makefile.am
47@@ -24,7 +24,10 @@ EXTRA_DIST = \ 47@@ -24,7 +24,10 @@ EXTRA_DIST = \
@@ -74,5 +74,5 @@ index ab85960..a244ede 100644
74 74
75 EXTRA_DIST = README 75 EXTRA_DIST = README
76-- 76--
771.8.3.1 772.7.4
78 78
diff --git a/meta/recipes-support/gpgme/gpgme_1.10.0.bb b/meta/recipes-support/gpgme/gpgme_1.11.1.bb
index f015f3ad75..151fc03f55 100644
--- a/meta/recipes-support/gpgme/gpgme_1.10.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.11.1.bb
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
6LICENSE = "GPLv2+ & LGPLv2.1+" 6LICENSE = "GPLv2+ & LGPLv2.1+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
8 file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ 8 file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
9 file://src/gpgme.h.in;endline=23;md5=9d157d08a69059344e6f82abd2d25781 \ 9 file://src/gpgme.h.in;endline=23;md5=4d6319e587fd944adfe61a41a8f15b36 \
10 file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" 10 file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
11 11
12UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 12UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
@@ -20,8 +20,8 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
20 file://0007-qt-python-Add-variables-to-tests.patch \ 20 file://0007-qt-python-Add-variables-to-tests.patch \
21 " 21 "
22 22
23SRC_URI[md5sum] = "78b1533c593478982ee2fc548260c563" 23SRC_URI[md5sum] = "129c46fb85a7ffa41e43345e48aee884"
24SRC_URI[sha256sum] = "1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693" 24SRC_URI[sha256sum] = "2d1b111774d2e3dd26dcd7c251819ce4ef774ec5e566251eb9308fa7542fbd6f"
25 25
26DEPENDS = "libgpg-error libassuan" 26DEPENDS = "libgpg-error libassuan"
27RDEPENDS_${PN}-cpp += "libstdc++" 27RDEPENDS_${PN}-cpp += "libstdc++"