summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gpgme
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-08-16 04:31:21 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:27 +0100
commit26fbd1e3f67fb093b8eada5271e4412b78465977 (patch)
treeee6c6fc655e943e39f59aa541c33d79c589de6ef /meta/recipes-support/gpgme
parent63042b82b2d611a8054af78ebe29d1ebdfc6228b (diff)
downloadpoky-26fbd1e3f67fb093b8eada5271e4412b78465977.tar.gz
gpgme: 1.8.0 -> 1.9.0
Rebase patches: - pkgconfig.patch -> 0001 - python-lang-config.patch -> 0002 - 0001-Correctly-install-python-modules.patch -> 0003 - python-import.patch -> 0004 - 0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch -> 0005 (From OE-Core rev: b18a7adf8ce194b2dd3ce787228fb87c5ef3efde) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme')
-rw-r--r--meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch (renamed from meta/recipes-support/gpgme/gpgme/pkgconfig.patch)16
-rw-r--r--meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch (renamed from meta/recipes-support/gpgme/gpgme/python-lang-config.patch)25
-rw-r--r--meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch (renamed from meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch)22
-rw-r--r--meta/recipes-support/gpgme/gpgme/0004-python-import.patch (renamed from meta/recipes-support/gpgme/gpgme/python-import.patch)15
-rw-r--r--meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch (renamed from meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch)6
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.9.0.bb (renamed from meta/recipes-support/gpgme/gpgme_1.8.0.bb)16
6 files changed, 70 insertions, 30 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
index 341cabfc50..14a43eeeeb 100644
--- a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
+++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
@@ -1,10 +1,18 @@
1From 8ae149035c97d27cd2c624704d1651806c53577e Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 16 Aug 2017 02:00:08 -0400
4Subject: [PATCH 1/5] pkgconfig
5
1Update gpgme to use pkgconfig instead of -config files since its 6Update gpgme to use pkgconfig instead of -config files since its
2simpler and less error prone when cross compiling. 7simpler and less error prone when cross compiling.
3 8
4Upstream-Status: Denied [Upstream not interested in pkg-config support] 9Upstream-Status: Denied [Upstream not interested in pkg-config support]
5RP 2015/4/17 10RP 2015/4/17
6 11
7Rebase to 1.8.0 12Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
13
14Rebase to 1.9.0
15
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9--- 17---
10 configure.ac | 1 + 18 configure.ac | 1 +
@@ -17,10 +25,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17 create mode 100644 src/gpgme.pc.in 25 create mode 100644 src/gpgme.pc.in
18 26
19diff --git a/configure.ac b/configure.ac 27diff --git a/configure.ac b/configure.ac
20index 0a67b48..e402dd3 100644 28index 0dac6ce..6a9e507 100644
21--- a/configure.ac 29--- a/configure.ac
22+++ b/configure.ac 30+++ b/configure.ac
23@@ -875,6 +875,7 @@ AC_CONFIG_FILES(Makefile src/Makefile 31@@ -866,6 +866,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
24 src/versioninfo.rc 32 src/versioninfo.rc
25 src/gpgme.h) 33 src/gpgme.h)
26 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) 34 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -50,7 +58,7 @@ index ce6f1d4..5f38fee 100644
50 58
51diff --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
52new file mode 100644 60new file mode 100644
53index 0000000..980a48e 61index 0000000..074bbf6
54--- /dev/null 62--- /dev/null
55+++ b/src/gpgme-pthread.pc.in 63+++ b/src/gpgme-pthread.pc.in
56@@ -0,0 +1,15 @@ 64@@ -0,0 +1,15 @@
diff --git a/meta/recipes-support/gpgme/gpgme/python-lang-config.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
index 132e42677f..f1f8c911fc 100644
--- a/meta/recipes-support/gpgme/gpgme/python-lang-config.patch
+++ b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
@@ -1,4 +1,7 @@
1gpgme/lang/python: gpg-error-config should not be used. 1From fb165c9bd96aca8c9ee3e4509c9b6e35d238ad2e Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@windriver.com>
3Date: Wed, 16 Aug 2017 02:02:47 -0400
4Subject: [PATCH 2/5] gpgme/lang/python: gpg-error-config should not be used.
2 5
3gpg-error-config was modified by OE to always return an error. So we want 6gpg-error-config was modified by OE to always return an error. So we want
4to find an alternative way to retrieve whatever it is we need. It turns 7to find an alternative way to retrieve whatever it is we need. It turns
@@ -9,10 +12,17 @@ Upstream-Status: Inappropriate [changes are specific to OE]
9 12
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 13Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 14
12Index: gpgme-1.8.0/lang/python/setup.py.in 15Rebase to 1.9.0
13=================================================================== 16
14--- gpgme-1.8.0.orig/lang/python/setup.py.in 17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15+++ gpgme-1.8.0/lang/python/setup.py.in 18---
19 lang/python/setup.py.in | 15 ++-------------
20 1 file changed, 2 insertions(+), 13 deletions(-)
21
22diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
23index bf4efa3..7c34487 100755
24--- a/lang/python/setup.py.in
25+++ b/lang/python/setup.py.in
16@@ -24,7 +24,6 @@ import glob 26@@ -24,7 +24,6 @@ import glob
17 import subprocess 27 import subprocess
18 28
@@ -35,7 +45,7 @@ Index: gpgme-1.8.0/lang/python/setup.py.in
35 subprocess.check_call(gpgme_config + ['--version'], 45 subprocess.check_call(gpgme_config + ['--version'],
36 stdout=devnull) 46 stdout=devnull)
37 except: 47 except:
38@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and min 48@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and minor >= 7)):
39 if not gpgme_h: 49 if not gpgme_h:
40 gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h") 50 gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h")
41 51
@@ -50,3 +60,6 @@ Index: gpgme-1.8.0/lang/python/setup.py.in
50 60
51 print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) 61 print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h))
52 62
63--
642.8.1
65
diff --git a/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
index 42655fbbe6..d38331171e 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch
+++ b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
@@ -1,26 +1,30 @@
1From 4d714c097e497b63d2e8b22a834c671045e215e9 Mon Sep 17 00:00:00 2001 1From 62332eec752dd790f4dd071dfb0dbe86be377203 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 9 Mar 2017 21:34:55 +0200 3Date: Wed, 16 Aug 2017 02:05:34 -0400
4Subject: [PATCH] Correctly install python modules 4Subject: [PATCH 3/5] 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>
8
9Rebase to 1.9.0
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
8--- 12---
9 lang/python/Makefile.am | 1 + 13 lang/python/Makefile.am | 1 +
10 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
11 15
12diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am 16diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
13index e32fd12..5ecf6fb 100644 17index d91ead9..67f7cdc 100644
14--- a/lang/python/Makefile.am 18--- a/lang/python/Makefile.am
15+++ b/lang/python/Makefile.am 19+++ b/lang/python/Makefile.am
16@@ -102,6 +102,7 @@ install-exec-local: 20@@ -106,6 +106,7 @@ install-exec-local:
17 for PYTHON in $(PYTHONS); do \ 21 cd python$${VERSION}-gpg ; \
18 $$PYTHON setup.py install \ 22 $$PYTHON setup.py install \
19 --prefix $(DESTDIR)$(prefix) \ 23 --prefix $(DESTDIR)$(prefix) \
20+ --install-lib=$(DESTDIR)${pythondir} \ 24+ --install-lib=$(DESTDIR)${pythondir} \
21 --record files.txt \ 25 --record files.txt \
22 --verbose ; \ 26 --verbose ; \
23 cat files.txt >> install_files.txt ; \ 27 cat files.txt >> ../install_files.txt ; \
24-- 28--
252.11.0 292.8.1
26 30
diff --git a/meta/recipes-support/gpgme/gpgme/python-import.patch b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
index 61b77a1f75..93071030f9 100644
--- a/meta/recipes-support/gpgme/gpgme/python-import.patch
+++ b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
@@ -1,9 +1,21 @@
1From ccbf028eea8815d3b16d6c34b527253a6b108ec3 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 16 Aug 2017 02:06:45 -0400
4Subject: [PATCH 4/5] python import
5
1Don'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
2sysroot readline can cause warnings on stderr. 7sysroot readline can cause warnings on stderr.
3 8
4Upstream-Status: Backport (from autoconf-archive 883a2abd) 9Upstream-Status: Backport (from autoconf-archive 883a2abd)
5Signed-off-by: Ross Burton <ross.burton@intel.com> 10Signed-off-by: Ross Burton <ross.burton@intel.com>
6 11
12Rebase to 1.9.0
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 m4/ax_python_devel.m4 | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
7diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 19diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
8index b990d5b..318b089 100644 20index b990d5b..318b089 100644
9--- a/m4/ax_python_devel.m4 21--- a/m4/ax_python_devel.m4
@@ -17,3 +29,6 @@ index b990d5b..318b089 100644
17 AC_MSG_RESULT([yes]) 29 AC_MSG_RESULT([yes])
18 else 30 else
19 AC_MSG_RESULT([no]) 31 AC_MSG_RESULT([no])
32--
332.8.1
34
diff --git a/meta/recipes-support/gpgme/gpgme/0001-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 84d55b9685..7a6cc7b84d 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-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 8c317f6186bd3a9a1c80b4d1e872b3db95934bb6 Mon Sep 17 00:00:00 2001 1From 064ae4441e2c11329748a18157988f9e953f9752 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] gpgme-config: skip all /lib* or /usr/lib* directories in 4Subject: [PATCH 5/5] 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--
302.11.0 302.8.1
31 31
diff --git a/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/meta/recipes-support/gpgme/gpgme_1.9.0.bb
index 4ddf6ed999..251814743d 100644
--- a/meta/recipes-support/gpgme/gpgme_1.8.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.9.0.bb
@@ -6,20 +6,20 @@ 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=0f7059665c4b7897f4f4d0cb93aa9f98 \ 9 file://src/gpgme.h.in;endline=23;md5=9d157d08a69059344e6f82abd2d25781 \
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"
13SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ 13SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
14 file://pkgconfig.patch \ 14 file://0001-pkgconfig.patch \
15 file://python-lang-config.patch \ 15 file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \
16 file://0001-Correctly-install-python-modules.patch \ 16 file://0003-Correctly-install-python-modules.patch \
17 file://python-import.patch \ 17 file://0004-python-import.patch \
18 file://0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ 18 file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \
19 " 19 "
20 20
21SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b" 21SRC_URI[md5sum] = "1e00bb8ef04d1d05d5a0f19e143854c3"
22SRC_URI[sha256sum] = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33" 22SRC_URI[sha256sum] = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"
23 23
24DEPENDS = "libgpg-error libassuan" 24DEPENDS = "libgpg-error libassuan"
25RDEPENDS_${PN}-cpp += "libstdc++" 25RDEPENDS_${PN}-cpp += "libstdc++"