diff options
Diffstat (limited to 'meta/recipes-support/p11-kit')
-rw-r--r-- | meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch | 13 | ||||
-rw-r--r-- | meta/recipes-support/p11-kit/p11-kit_0.23.14.bb (renamed from meta/recipes-support/p11-kit/p11-kit_0.22.1.bb) | 4 |
2 files changed, 6 insertions, 11 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 index 2fda9dfbb8..e902b0b522 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From c3aa4aae5e9f4adafd9e10d9466f1bc481e0aae6 Mon Sep 17 00:00:00 2001 | 1 | From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 31 Jan 2018 16:47:44 +0200 | 3 | Date: Wed, 31 Jan 2018 16:47:44 +0200 |
4 | Subject: [PATCH] LINGUAS: drop the languages for which upstream does not | 4 | Subject: [PATCH] LINGUAS: drop the languages for which upstream does not |
@@ -9,24 +9,21 @@ Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127 | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [missing upstream distribution files] | 10 | Upstream-Status: Inappropriate [missing upstream distribution files] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | po/LINGUAS | 2 -- | 14 | po/LINGUAS | 2 -- |
14 | 1 file changed, 2 deletions(-) | 15 | 1 file changed, 2 deletions(-) |
15 | 16 | ||
16 | diff --git a/po/LINGUAS b/po/LINGUAS | 17 | diff --git a/po/LINGUAS b/po/LINGUAS |
17 | index 1fc4d53..e9cc5a7 100644 | 18 | index 767a806c2e20..6ab48001c409 100644 |
18 | --- a/po/LINGUAS | 19 | --- a/po/LINGUAS |
19 | +++ b/po/LINGUAS | 20 | +++ b/po/LINGUAS |
20 | @@ -11,9 +11,7 @@ cy | 21 | @@ -12,8 +12,6 @@ cy |
21 | da | 22 | da |
22 | de | 23 | de |
23 | el | 24 | el |
24 | -en@boldquot | 25 | -en@boldquot |
25 | en_GB | ||
26 | -en@quot | 26 | -en@quot |
27 | en_GB | ||
27 | eo | 28 | eo |
28 | es | 29 | es |
29 | es_CL | ||
30 | -- | ||
31 | 2.15.1 | ||
32 | |||
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.14.bb index 57798f4020..2a8709143b 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.14.bb | |||
@@ -9,10 +9,8 @@ DEPENDS = "libtasn1 libffi" | |||
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 | file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \ |
11 | " | 11 | " |
12 | SRCREV = "bfb3bd47aa48983f5349479bca598403097ff81c" | 12 | SRCREV = "3770793f026e46a000d2d8816d56122598289d5c" |
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | # exclude odd minor versions, which are development releases | ||
15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" | ||
16 | 14 | ||
17 | AUTOTOOLS_AUXDIR = "${S}/build/litter" | 15 | AUTOTOOLS_AUXDIR = "${S}/build/litter" |
18 | EXTRA_OECONF = "--without-trust-paths" | 16 | EXTRA_OECONF = "--without-trust-paths" |