mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

gpgme: 1.10.0 -> 1.11.1

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