diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-10-11 13:47:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-15 14:16:11 +0100 |
commit | 4a9fa9e82fdac3fdf03a67f92d08eb60f9811f1d (patch) | |
tree | 3e4305c6e138b51c67a7104486d51387404b4d39 /meta | |
parent | 51d8fdfc9174390f2622057b7737e4cbf73f546e (diff) | |
download | poky-4a9fa9e82fdac3fdf03a67f92d08eb60f9811f1d.tar.gz |
p11-kit: upgrade 0.23.16.1 -> 0.23.18.1
Drop the patch that has been merged upstream.
(From OE-Core rev: 5bcf7ab7d9c45bdef6c55195d5a648cc0a773762)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch | 29 | ||||
-rw-r--r-- | meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb (renamed from meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb) | 6 |
2 files changed, 2 insertions, 33 deletions
diff --git a/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch b/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch deleted file mode 100644 index e902b0b522..0000000000 --- a/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 31 Jan 2018 16:47:44 +0200 | ||
4 | Subject: [PATCH] LINGUAS: drop the languages for which upstream does not | ||
5 | supply .po files | ||
6 | |||
7 | Regenerating them proved to be too painful. | ||
8 | Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127 | ||
9 | |||
10 | Upstream-Status: Inappropriate [missing upstream distribution files] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | |||
13 | --- | ||
14 | po/LINGUAS | 2 -- | ||
15 | 1 file changed, 2 deletions(-) | ||
16 | |||
17 | diff --git a/po/LINGUAS b/po/LINGUAS | ||
18 | index 767a806c2e20..6ab48001c409 100644 | ||
19 | --- a/po/LINGUAS | ||
20 | +++ b/po/LINGUAS | ||
21 | @@ -12,8 +12,6 @@ cy | ||
22 | da | ||
23 | de | ||
24 | el | ||
25 | -en@boldquot | ||
26 | -en@quot | ||
27 | en_GB | ||
28 | eo | ||
29 | es | ||
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb index 54455da1bb..119d8365a1 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb | |||
@@ -6,10 +6,8 @@ inherit autotools gettext pkgconfig gtk-doc | |||
6 | 6 | ||
7 | DEPENDS = "libtasn1 libffi" | 7 | DEPENDS = "libtasn1 libffi" |
8 | 8 | ||
9 | SRC_URI = "git://github.com/p11-glue/p11-kit \ | 9 | SRC_URI = "git://github.com/p11-glue/p11-kit" |
10 | file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \ | 10 | SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6" |
11 | " | ||
12 | SRCREV = "c689917b393379d288b868f70b2f7b7f6aafe430" | ||
13 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
14 | 12 | ||
15 | AUTOTOOLS_AUXDIR = "${S}/build/litter" | 13 | AUTOTOOLS_AUXDIR = "${S}/build/litter" |