@@ -1,4 +1,4 @@
-From 4b5e00ad020ec327cbc934528d02aa8c4fe3910b Mon Sep 17 00:00:00 2001
+From 126dfefb5fddf411ad0a1316209e9c1b47abfcd2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 9 Feb 2022 17:30:16 -0800
Subject: [PATCH] man: Move local variable declaration to function scope
@@ -10,12 +10,13 @@ code without changing the logic, until its fixed in clang
Upstream-Status: Inappropriate [Inappropriate: Clang bug]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
---
src/man.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/man.c b/src/man.c
-index c91abf1..3240eea 100644
+index f16fae8..333df03 100644
--- a/src/man.c
+++ b/src/man.c
@@ -352,7 +352,7 @@ static void init_html_pager (void)
@@ -27,15 +28,12 @@ index c91abf1..3240eea 100644
/* Please keep these keys in the same order as in options above. */
switch (key) {
case 'C':
-@@ -383,7 +383,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
-
+@@ -384,7 +384,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
case OPT_WARNINGS:
#ifdef NROFF_WARNINGS
-- char *s = xstrdup (arg ? arg : default_roff_warnings);
-+ s = xstrdup (arg ? arg : default_roff_warnings);
- const char *warning;
+ {
+- char *s = xstrdup
++ s = xstrdup
+ (arg ? arg : default_roff_warnings);
+ const char *warning;
- for (warning = strtok (s, ","); warning;
-2.35.1
-
similarity index 93%
rename from meta/recipes-extended/man-db/man-db_2.10.0.bb
rename to 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 \
file://99_mandb \
file://0001-man-Move-local-variable-declaration-to-function-scop.patch \
file://man_db.conf-avoid-multilib-install-file-conflict.patch"
-SRC_URI[sha256sum] = "0a8629022f7117dc7fc6473c6fdb14913b24b106059bb056abee87dbd6070c79"
-
-# remove at next version upgrade or when output changes
-PR = "r1"
-HASHEQUIV_HASH_VERSION .= ".2"
+SRC_URI[sha256sum] = "2ffd8f2e80122fe72e60c740c851e6a3e15c9a7921185eb4752c1c672824bed6"
DEPENDS = "libpipeline gdbm groff-native base-passwd"
RDEPENDS:${PN} += "base-passwd"
Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...ariable-declaration-to-function-scop.patch | 20 +++++++++---------- .../{man-db_2.10.0.bb => man-db_2.10.1.bb} | 6 +----- 2 files changed, 10 insertions(+), 16 deletions(-) rename meta/recipes-extended/man-db/{man-db_2.10.0.bb => man-db_2.10.1.bb} (93%)