diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-08-19 09:27:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-21 22:51:42 +0100 |
commit | fdf3e306635d785342aa50bb19d20c52576620c6 (patch) | |
tree | 387c928726f5a968cbc7d78adf94601670990eb6 /meta/recipes-support/gpgme | |
parent | a2ac81ebf13f5122dfa1aec16c05fb5069fed015 (diff) | |
download | poky-fdf3e306635d785342aa50bb19d20c52576620c6.tar.gz |
gpgme: upgrade 1.17.1 -> 1.18.0
(From OE-Core rev: b82b51a10e7348ea77999219a13b29cacd50b4f2)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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 | 18 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme_1.18.0.bb (renamed from meta/recipes-support/gpgme/gpgme_1.17.1.bb) | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 35c6b4056c..3b2f59c2fc 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 98ce65902b197faa8f660564613ca2e504c2f8f8 Mon Sep 17 00:00:00 2001 | 1 | From 0d7ec5b98dc6cbd35f56deaecec5ecfdaa944aee Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Fri, 10 May 2019 14:23:55 +0800 | 3 | Date: Fri, 10 May 2019 14:23:55 +0800 |
4 | Subject: [PATCH] pkgconfig | 4 | Subject: [PATCH] pkgconfig |
@@ -15,6 +15,7 @@ Rebase to 1.13.0 | |||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
16 | Rebase to 1.17.0 | 16 | Rebase to 1.17.0 |
17 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | 17 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> |
18 | |||
18 | --- | 19 | --- |
19 | configure.ac | 1 + | 20 | configure.ac | 1 + |
20 | src/Makefile.am | 4 +- | 21 | src/Makefile.am | 4 +- |
@@ -25,10 +26,10 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | |||
25 | create mode 100644 src/gpgme-pthread.pc.in | 26 | create mode 100644 src/gpgme-pthread.pc.in |
26 | 27 | ||
27 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
28 | index 80ce79c..d7c0ac1 100644 | 29 | index 9d696b9..5b4e730 100644 |
29 | --- a/configure.ac | 30 | --- a/configure.ac |
30 | +++ b/configure.ac | 31 | +++ b/configure.ac |
31 | @@ -905,6 +905,7 @@ AC_CONFIG_FILES(Makefile src/Makefile | 32 | @@ -926,6 +926,7 @@ AC_CONFIG_FILES(Makefile src/Makefile |
32 | src/gpgme-glib.pc | 33 | src/gpgme-glib.pc |
33 | src/gpgme.h) | 34 | src/gpgme.h) |
34 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) | 35 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) |
@@ -37,7 +38,7 @@ index 80ce79c..d7c0ac1 100644 | |||
37 | AC_CONFIG_FILES(lang/cpp/tests/Makefile) | 38 | AC_CONFIG_FILES(lang/cpp/tests/Makefile) |
38 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) | 39 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) |
39 | diff --git a/src/Makefile.am b/src/Makefile.am | 40 | diff --git a/src/Makefile.am b/src/Makefile.am |
40 | index 39c341f..3aca716 100644 | 41 | index 67805a8..d38ba02 100644 |
41 | --- a/src/Makefile.am | 42 | --- a/src/Makefile.am |
42 | +++ b/src/Makefile.am | 43 | +++ b/src/Makefile.am |
43 | @@ -20,11 +20,11 @@ | 44 | @@ -20,11 +20,11 @@ |
@@ -52,8 +53,8 @@ index 39c341f..3aca716 100644 | |||
52 | - gpgme.pc.in gpgme-glib.pc.in | 53 | - gpgme.pc.in gpgme-glib.pc.in |
53 | + gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in | 54 | + gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in |
54 | 55 | ||
55 | bin_SCRIPTS = gpgme-config | 56 | if USE_GPGRT_CONFIG |
56 | m4datadir = $(datadir)/aclocal | 57 | noinst_SCRIPTS = gpgme-config |
57 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in | 58 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in |
58 | new file mode 100644 | 59 | new file mode 100644 |
59 | index 0000000..074bbf6 | 60 | index 0000000..074bbf6 |
@@ -76,7 +77,7 @@ index 0000000..074bbf6 | |||
76 | +Cflags: -I${includedir} | 77 | +Cflags: -I${includedir} |
77 | +Requires: libassuan gpg-error | 78 | +Requires: libassuan gpg-error |
78 | diff --git a/src/gpgme.m4 b/src/gpgme.m4 | 79 | diff --git a/src/gpgme.m4 b/src/gpgme.m4 |
79 | index 71b0010..30ec151 100644 | 80 | index 71b0010..5821895 100644 |
80 | --- a/src/gpgme.m4 | 81 | --- a/src/gpgme.m4 |
81 | +++ b/src/gpgme.m4 | 82 | +++ b/src/gpgme.m4 |
82 | @@ -79,7 +79,7 @@ dnl config script does not match the host specification the script | 83 | @@ -79,7 +79,7 @@ dnl config script does not match the host specification the script |
@@ -287,6 +288,3 @@ index 80d59de..932645b 100644 | |||
287 | +Cflags: -I${includedir} | 288 | +Cflags: -I${includedir} |
288 | +Libs: -L${libdir} -lgpgme | 289 | +Libs: -L${libdir} -lgpgme |
289 | URL: https://www.gnupg.org/software/gpgme/index.html | 290 | URL: https://www.gnupg.org/software/gpgme/index.html |
290 | -- | ||
291 | 2.25.1 | ||
292 | |||
diff --git a/meta/recipes-support/gpgme/gpgme_1.17.1.bb b/meta/recipes-support/gpgme/gpgme_1.18.0.bb index d95ed6c299..ca9c6cab14 100644 --- a/meta/recipes-support/gpgme/gpgme_1.17.1.bb +++ b/meta/recipes-support/gpgme/gpgme_1.18.0.bb | |||
@@ -23,7 +23,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ | |||
23 | file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ | 23 | file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ |
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI[sha256sum] = "711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f" | 26 | SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e" |
27 | 27 | ||
28 | DEPENDS = "libgpg-error libassuan" | 28 | DEPENDS = "libgpg-error libassuan" |
29 | RDEPENDS:${PN}-cpp += "libstdc++" | 29 | RDEPENDS:${PN}-cpp += "libstdc++" |