diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-02-17 17:09:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-18 11:37:11 +0000 |
commit | 83a7b9317276ca75e9edae201ac5a3c7d7f77739 (patch) | |
tree | 76d1b69847beba36b842c2d5ac2076239e59734c | |
parent | 2dfaee820391dba7c649090bcf9b0b275c56c670 (diff) | |
download | poky-83a7b9317276ca75e9edae201ac5a3c7d7f77739.tar.gz |
man-db: update 2.10.0 -> 2.10.1
(From OE-Core rev: 550be77683805f2853a49cfe79584e9bf925f53d)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch | 20 | ||||
-rw-r--r-- | meta/recipes-extended/man-db/man-db_2.10.1.bb (renamed from meta/recipes-extended/man-db/man-db_2.10.0.bb) | 6 |
2 files changed, 10 insertions, 16 deletions
diff --git a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch index 820b17b5de..dc6966629c 100644 --- a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch +++ b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4b5e00ad020ec327cbc934528d02aa8c4fe3910b Mon Sep 17 00:00:00 2001 | 1 | From 126dfefb5fddf411ad0a1316209e9c1b47abfcd2 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 9 Feb 2022 17:30:16 -0800 | 3 | Date: Wed, 9 Feb 2022 17:30:16 -0800 |
4 | Subject: [PATCH] man: Move local variable declaration to function scope | 4 | Subject: [PATCH] man: Move local variable declaration to function scope |
@@ -10,12 +10,13 @@ code without changing the logic, until its fixed in clang | |||
10 | 10 | ||
11 | Upstream-Status: Inappropriate [Inappropriate: Clang bug] | 11 | Upstream-Status: Inappropriate [Inappropriate: Clang bug] |
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | src/man.c | 4 ++-- | 15 | src/man.c | 4 ++-- |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
16 | 17 | ||
17 | diff --git a/src/man.c b/src/man.c | 18 | diff --git a/src/man.c b/src/man.c |
18 | index c91abf1..3240eea 100644 | 19 | index f16fae8..333df03 100644 |
19 | --- a/src/man.c | 20 | --- a/src/man.c |
20 | +++ b/src/man.c | 21 | +++ b/src/man.c |
21 | @@ -352,7 +352,7 @@ static void init_html_pager (void) | 22 | @@ -352,7 +352,7 @@ static void init_html_pager (void) |
@@ -27,15 +28,12 @@ index c91abf1..3240eea 100644 | |||
27 | /* Please keep these keys in the same order as in options above. */ | 28 | /* Please keep these keys in the same order as in options above. */ |
28 | switch (key) { | 29 | switch (key) { |
29 | case 'C': | 30 | case 'C': |
30 | @@ -383,7 +383,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) | 31 | @@ -384,7 +384,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) |
31 | |||
32 | case OPT_WARNINGS: | 32 | case OPT_WARNINGS: |
33 | #ifdef NROFF_WARNINGS | 33 | #ifdef NROFF_WARNINGS |
34 | - char *s = xstrdup (arg ? arg : default_roff_warnings); | 34 | { |
35 | + s = xstrdup (arg ? arg : default_roff_warnings); | 35 | - char *s = xstrdup |
36 | const char *warning; | 36 | + s = xstrdup |
37 | (arg ? arg : default_roff_warnings); | ||
38 | const char *warning; | ||
37 | 39 | ||
38 | for (warning = strtok (s, ","); warning; | ||
39 | -- | ||
40 | 2.35.1 | ||
41 | |||
diff --git a/meta/recipes-extended/man-db/man-db_2.10.0.bb b/meta/recipes-extended/man-db/man-db_2.10.1.bb index a604930198..897f8d8ce0 100644 --- a/meta/recipes-extended/man-db/man-db_2.10.0.bb +++ b/meta/recipes-extended/man-db/man-db_2.10.1.bb | |||
@@ -9,11 +9,7 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ | |||
9 | file://99_mandb \ | 9 | file://99_mandb \ |
10 | file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ | 10 | file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ |
11 | file://man_db.conf-avoid-multilib-install-file-conflict.patch" | 11 | file://man_db.conf-avoid-multilib-install-file-conflict.patch" |
12 | SRC_URI[sha256sum] = "0a8629022f7117dc7fc6473c6fdb14913b24b106059bb056abee87dbd6070c79" | 12 | SRC_URI[sha256sum] = "2ffd8f2e80122fe72e60c740c851e6a3e15c9a7921185eb4752c1c672824bed6" |
13 | |||
14 | # remove at next version upgrade or when output changes | ||
15 | PR = "r1" | ||
16 | HASHEQUIV_HASH_VERSION .= ".2" | ||
17 | 13 | ||
18 | DEPENDS = "libpipeline gdbm groff-native base-passwd" | 14 | DEPENDS = "libpipeline gdbm groff-native base-passwd" |
19 | RDEPENDS:${PN} += "base-passwd" | 15 | RDEPENDS:${PN} += "base-passwd" |