summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-05-12 16:16:26 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-12 17:55:11 +0100
commit0ac1bb797a0793f8835f4da64c361dcb820f2ee1 (patch)
tree3cf6592cb42dd59a8c0751fca7403ca47116e581
parent91227184b59df30222e45abf2edf13e4e65164a1 (diff)
downloadpoky-0ac1bb797a0793f8835f4da64c361dcb820f2ee1.tar.gz
gpgme: upgrade 1.12.0 -> 1.13.0
- Revert gpgrt-config support which oe-core does not support it - Rebase 0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch and 0001-pkgconfig.patch - Tweak LANGUAGES, since upstream auto check the version of python rather than specify option [ff6ff61 python: Auto-check for all installed python versions.] License-update: SPDX identifiers site and formats [8d91c0f Add SPDX identifiers to most source files] "s/LGPL-2.1+/LGPL-2.1-or-later/" "s#https://www.gnu.org/licenses#https://gnu.org/licenses#" (From OE-Core rev: 991d374edd6fc66400dad0c54f007bfaaa46e47a) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.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.patch134
-rw-r--r--meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch72
-rw-r--r--meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch33
-rw-r--r--meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch36
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.13.0.bb (renamed from meta/recipes-support/gpgme/gpgme_1.12.0.bb)12
5 files changed, 222 insertions, 65 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
new file mode 100644
index 0000000000..0ed4eb6818
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
@@ -0,0 +1,134 @@
1From a001b3c23bf80fd752044615b9bba6b926ff9666 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 10 May 2019 14:18:04 +0800
4Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc."
5
6This reverts commit 60828a505a1c74fd34476c181df2a588ea6f9c83.
7
8The oe-core does not support gpgrt-config, so revert it
9
10Upstream-Status: Inappropriate [oe-core specific]
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 src/gpgme.m4 | 58 ++++++++++------------------------------------------------
15 1 file changed, 10 insertions(+), 48 deletions(-)
16
17diff --git a/src/gpgme.m4 b/src/gpgme.m4
18index 2a72f18..6c2be44 100644
19--- a/src/gpgme.m4
20+++ b/src/gpgme.m4
21@@ -1,5 +1,5 @@
22 # gpgme.m4 - autoconf macro to detect GPGME.
23-# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH
24+# Copyright (C) 2002, 2003, 2004, 2014 g10 Code GmbH
25 #
26 # This file is free software; as a special exception the author gives
27 # unlimited permission to copy and/or distribute it, with or without
28@@ -9,7 +9,7 @@
29 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
30 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
31 #
32-# Last-changed: 2018-11-12
33+# Last-changed: 2014-10-02
34
35
36 AC_DEFUN([_AM_PATH_GPGME_CONFIG],
37@@ -36,24 +36,10 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
38 fi
39 fi
40
41- use_gpgrt_config=""
42- if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
43- if $GPGRT_CONFIG gpgme --exists; then
44- GPGME_CONFIG="$GPGRT_CONFIG gpgme"
45- AC_MSG_NOTICE([Use gpgrt-config as gpgme-config])
46- use_gpgrt_config=yes
47- fi
48- fi
49- if test -z "$use_gpgrt_config"; then
50- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
51- fi
52+ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
53
54 if test "$GPGME_CONFIG" != "no" ; then
55- if test -z "$use_gpgrt_config"; then
56- gpgme_version=`$GPGME_CONFIG --version`
57- else
58- gpgme_version=`$GPGME_CONFIG --modversion`
59- fi
60+ gpgme_version=`$GPGME_CONFIG --version`
61 fi
62 gpgme_version_major=`echo $gpgme_version | \
63 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
64@@ -66,16 +52,12 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
65
66 AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK],
67 [
68- if test -z "$use_gpgrt_config"; then
69- gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
70- else
71- gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none`
72- fi
73+ gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
74 if test x"$gpgme_config_host" != xnone ; then
75 if test x"$gpgme_config_host" != x"$host" ; then
76 AC_MSG_WARN([[
77 ***
78-*** The config script "$GPGME_CONFIG" was
79+*** The config script $GPGME_CONFIG was
80 *** built for $gpgme_config_host and thus may not match the
81 *** used host $host.
82 *** You may want to use the configure option --with-gpgme-prefix
83@@ -136,11 +118,7 @@ AC_DEFUN([AM_PATH_GPGME],
84 # If we have a recent GPGME, we should also check that the
85 # API is compatible.
86 if test "$req_gpgme_api" -gt 0 ; then
87- if test -z "$use_gpgrt_config"; then
88- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
89- else
90- tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
91- fi
92+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
93 if test "$tmp" -gt 0 ; then
94 if test "$req_gpgme_api" -ne "$tmp" ; then
95 ok=no
96@@ -280,11 +258,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
97 # If we have a recent GPGME, we should also check that the
98 # API is compatible.
99 if test "$req_gpgme_api" -gt 0 ; then
100- if test -z "$use_gpgrt_config"; then
101- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
102- else
103- tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
104- fi
105+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
106 if test "$tmp" -gt 0 ; then
107 if test "$req_gpgme_api" -ne "$tmp" ; then
108 ok=no
109@@ -293,20 +267,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
110 fi
111 fi
112 if test $ok = yes; then
113- if test -z "$use_gpgrt_config"; then
114- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
115- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
116- else
117- if $GPGRT_CONFIG gpgme-glib --exists; then
118- GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib"
119- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags`
120- GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs`
121- else
122- ok = no
123- fi
124- fi
125- fi
126- if test $ok = yes; then
127+ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
128+ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
129 AC_MSG_RESULT(yes)
130 ifelse([$2], , :, [$2])
131 _AM_PATH_GPGME_CONFIG_HOST_CHECK
132--
1332.7.4
134
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
index 176723cd16..827d95a151 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
+++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
@@ -1,7 +1,7 @@
1From 6492c952d61bb93a8bf8200c093d7e491456aa5a Mon Sep 17 00:00:00 2001 1From 98ce65902b197faa8f660564613ca2e504c2f8f8 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Fri, 29 Jun 2018 14:35:41 +0800 3Date: Fri, 10 May 2019 14:23:55 +0800
4Subject: [PATCH 1/7] pkgconfig 4Subject: [PATCH] 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.11.1 14Rebase to 1.13.0
15 15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17--- 17---
@@ -19,43 +19,40 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19 src/Makefile.am | 4 +- 19 src/Makefile.am | 4 +-
20 src/gpgme-pthread.pc.in | 15 +++++++ 20 src/gpgme-pthread.pc.in | 15 +++++++
21 src/gpgme.m4 | 114 ++++-------------------------------------------- 21 src/gpgme.m4 | 114 ++++--------------------------------------------
22 src/gpgme.pc.in | 15 +++++++ 22 src/gpgme.pc.in | 4 +-
23 5 files changed, 42 insertions(+), 107 deletions(-) 23 5 files changed, 28 insertions(+), 110 deletions(-)
24 create mode 100644 src/gpgme-pthread.pc.in 24 create mode 100644 src/gpgme-pthread.pc.in
25 create mode 100644 src/gpgme.pc.in
26 25
27diff --git a/configure.ac b/configure.ac 26diff --git a/configure.ac b/configure.ac
28index af569ac..865bd10 100644 27index 25184f4..1c0a386 100644
29--- a/configure.ac 28--- a/configure.ac
30+++ b/configure.ac 29+++ b/configure.ac
31@@ -895,6 +895,7 @@ AC_CONFIG_FILES(Makefile src/Makefile 30@@ -899,6 +899,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
32 src/versioninfo.rc 31 src/gpgme-glib.pc
33 src/gpgme.h) 32 src/gpgme.h)
34 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) 33 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
35+AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc) 34+AC_CONFIG_FILES(src/gpgme-pthread.pc)
36 AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile) 35 AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile)
36 AC_CONFIG_FILES(lang/cpp/tests/Makefile)
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)
39diff --git a/src/Makefile.am b/src/Makefile.am 38diff --git a/src/Makefile.am b/src/Makefile.am
40index 1394c02..8451c3a 100644 39index d85a85c..d942f3e 100644
41--- a/src/Makefile.am 40--- a/src/Makefile.am
42+++ b/src/Makefile.am 41+++ b/src/Makefile.am
43@@ -19,12 +19,14 @@ 42@@ -20,11 +20,11 @@
44 ## Process this file with automake to produce Makefile.in 43 ## Process this file with automake to produce Makefile.in
45 44
45 pkgconfigdir = $(libdir)/pkgconfig
46-pkgconfig_DATA = gpgme.pc gpgme-glib.pc
47+pkgconfig_DATA = gpgme.pc gpgme-glib.pc gpgme-pthread.pc
48
46 EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ 49 EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
47- gpgme.h.in versioninfo.rc.in gpgme.def 50 gpgme.h.in versioninfo.rc.in gpgme.def \
48+ gpgme.h.in versioninfo.rc.in gpgme.def gpgme.pc.in gpgme-pthread.pc.in 51- gpgme.pc.in gpgme-glib.pc.in
52+ gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in
49 53
50 bin_SCRIPTS = gpgme-config 54 bin_SCRIPTS = gpgme-config
51 m4datadir = $(datadir)/aclocal 55 m4datadir = $(datadir)/aclocal
52 m4data_DATA = gpgme.m4
53 nodist_include_HEADERS = gpgme.h
54+pkgconfigdir = $(libdir)/pkgconfig
55+pkgconfig_DATA = gpgme.pc gpgme-pthread.pc
56
57 bin_PROGRAMS = gpgme-tool gpgme-json
58
59diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in 56diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in
60new file mode 100644 57new file mode 100644
61index 0000000..074bbf6 58index 0000000..074bbf6
@@ -277,27 +274,18 @@ index 6c2be44..d8a75cb 100644
277- AC_SUBST(GPGME_GLIB_LIBS) 274- AC_SUBST(GPGME_GLIB_LIBS)
278 ]) 275 ])
279diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in 276diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in
280new file mode 100644 277index be288b8..16f56ac 100644
281index 0000000..b69539f 278--- a/src/gpgme.pc.in
282--- /dev/null
283+++ b/src/gpgme.pc.in 279+++ b/src/gpgme.pc.in
284@@ -0,0 +1,15 @@ 280@@ -9,6 +9,6 @@ Name: gpgme
285+prefix=@prefix@ 281 Description: GnuPG Made Easy to access GnuPG
286+exec_prefix=@exec_prefix@ 282 Requires: gpg-error, libassuan
287+libdir=@libdir@ 283 Version: @PACKAGE_VERSION@
288+includedir=@includedir@ 284-Cflags: @GPGME_CONFIG_CFLAGS@
289+ 285-Libs: @GPGME_CONFIG_LIBS@
290+# API info
291+api_version=@GPGME_CONFIG_API_VERSION@
292+host=@GPGME_CONFIG_HOST@
293+
294+Name: gpgme
295+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program.
296+Version: @VERSION@
297+Libs: -L${libdir} -lgpgme
298+Cflags: -I${includedir} 286+Cflags: -I${includedir}
299+Requires: libassuan gpg-error 287+Libs: -L${libdir} -lgpgme
300\ No newline at end of file 288 URL: https://www.gnupg.org/software/gpgme/index.html
301-- 289--
3022.7.4 2902.7.4
303 291
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 0d0d0c67b5..ecd1793ab9 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,6 +1,6 @@
1From 03819ad1270a279223219c0e70ba631bfe517714 Mon Sep 17 00:00:00 2001 1From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 17 Oct 2018 23:32:19 +0800 3Date: Fri, 10 May 2019 14:30:36 +0800
4Subject: [PATCH 2/7] 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.
@@ -11,39 +11,38 @@ Upstream-Status: Inappropriate [changes are specific to OE]
11 11
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13 13
14Rebase to 1.12.0 14Rebase to 1.13.0
15 15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17--- 17---
18 lang/python/setup.py.in | 11 +---------- 18 lang/python/setup.py.in | 9 +--------
19 1 file changed, 1 insertion(+), 10 deletions(-) 19 1 file changed, 1 insertion(+), 8 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 65a4be0..11b8413 100755 22index 9785a28..006216d 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@@ -30,7 +30,6 @@ import subprocess 25@@ -30,7 +30,6 @@ import subprocess
26 import sys 26 import sys
27 27
28 # Out-of-tree build of the gpg bindings. 28 # Out-of-tree build of the gpg bindings.
29-gpg_error_config = ["gpg-error-config"] 29-gpg_error_config = ['gpg-error-config']
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@@ -181,16 +180,8 @@ class BuildExtFirstHack(build): 33@@ -182,15 +181,9 @@ class BuildExtFirstHack(build):
34 shutil.copy2(source_name, sink_name)
35 34
36 def _generate_errors_i(self): 35 def _generate_errors_i(self):
37- 36
38- try: 37- try:
39- subprocess.check_call( 38- subprocess.check_call(
40- gpg_error_config + ['--version'], stdout=devnull) 39- gpg_error_config + ['--version'], stdout=devnull)
41- except: 40- except:
42- sys.exit("Could not find gpg-error-config. " + 41- sys.exit('Could not find gpg-error-config. ' +
43- "Please install the libgpg-error development package.") 42- 'Please install the libgpg-error development package.')
44- 43
45 gpg_error_content = self._read_header( 44 gpg_error_content = self._read_header(
46- "gpg-error.h", getconfig("cflags", config=gpg_error_config)) 45- 'gpg-error.h', getconfig('cflags', config=gpg_error_config))
47+ "gpg-error.h", os.environ.get('CFLAGS').split()) 46+ "gpg-error.h", os.environ.get('CFLAGS').split())
48 47
49 filter_re = re.compile(r'GPG_ERR_[^ ]* =') 48 filter_re = re.compile(r'GPG_ERR_[^ ]* =')
diff --git a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch
new file mode 100644
index 0000000000..3afbfc8638
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch
@@ -0,0 +1,36 @@
1From fc3d9cc218e60582fd158d21a1cd537a3dc1b007 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 10 May 2019 16:19:54 +0800
4Subject: [PATCH] do not auto check var-PYTHON
5
6Upstream auto check the version of python rather than specify option
7[ff6ff61 python: Auto-check for all installed python versions.]
8
9In oe-core, don't check var-PYTHON, use the setting from recipe,
10only check specific python 2.7 and 3.7
11
12Upstream-Status: Inappropriate [oe-core specific]
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 configure.ac | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index cb2f073..7d74a6d 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -423,8 +423,8 @@ if test "$found_py" = "1"; then
24 if test "$found_py" = "1" -o "$found_py3" = "1"; then
25 # Reset everything, so that we can look for another Python.
26 m4_foreach([mym4pythonver],
27- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[all]],
28- [unset PYTHON
29+ [[2.7],[3.7]],
30+ [
31 unset PYTHON_VERSION
32 unset PYTHON_CPPFLAGS
33 unset PYTHON_LDFLAGS
34--
352.7.4
36
diff --git a/meta/recipes-support/gpgme/gpgme_1.12.0.bb b/meta/recipes-support/gpgme/gpgme_1.13.0.bb
index b46c5fc271..cbd37da303 100644
--- a/meta/recipes-support/gpgme/gpgme_1.12.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.13.0.bb
@@ -6,11 +6,12 @@ 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=4d6319e587fd944adfe61a41a8f15b36 \ 9 file://src/gpgme.h.in;endline=23;md5=2f0bf06d1c7dcb28532a9d0f94a7ca1d \
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://0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch \
14 file://0001-pkgconfig.patch \ 15 file://0001-pkgconfig.patch \
15 file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \ 16 file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \
16 file://0003-Correctly-install-python-modules.patch \ 17 file://0003-Correctly-install-python-modules.patch \
@@ -18,10 +19,11 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
18 file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ 19 file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \
19 file://0006-fix-build-path-issue.patch \ 20 file://0006-fix-build-path-issue.patch \
20 file://0007-python-Add-variables-to-tests.patch \ 21 file://0007-python-Add-variables-to-tests.patch \
22 file://0008-do-not-auto-check-var-PYTHON.patch \
21 " 23 "
22 24
23SRC_URI[md5sum] = "902fca3a94907efe4e929b2ade545a7c" 25SRC_URI[md5sum] = "e511a0d95c507ab87e713140c82fc7d0"
24SRC_URI[sha256sum] = "b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8" 26SRC_URI[sha256sum] = "d4b23e47a9e784a63e029338cce0464a82ce0ae4af852886afda410f9e39c630"
25 27
26DEPENDS = "libgpg-error libassuan" 28DEPENDS = "libgpg-error libassuan"
27RDEPENDS_${PN}-cpp += "libstdc++" 29RDEPENDS_${PN}-cpp += "libstdc++"
@@ -44,9 +46,7 @@ PACKAGECONFIG[python3] = ",,python3 swig-native,"
44# support. Since these bindings are currently not needed, we can disable them. 46# support. Since these bindings are currently not needed, we can disable them.
45DEFAULT_LANGUAGES = "" 47DEFAULT_LANGUAGES = ""
46DEFAULT_LANGUAGES_class-target = "cpp" 48DEFAULT_LANGUAGES_class-target = "cpp"
47LANGUAGES ?= "${DEFAULT_LANGUAGES}" 49LANGUAGES ?= "${DEFAULT_LANGUAGES} python"
48LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}"
49LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}"
50 50
51PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" 51PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}"
52PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" 52PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}"