diff mbox series

[1/4] man-db: upgrade 2.12.1 -> 2.13.0

Message ID 20241127233600.4124020-1-hongxu.jia@windriver.com
State New
Headers show
Series [1/4] man-db: upgrade 2.12.1 -> 2.13.0 | expand

Commit Message

Hongxu Jia Nov. 27, 2024, 11:35 p.m. UTC 
Due to meta-clang has upgraded clang to 19.1.2 release [1]
which contains clang fix [2], drop 0001-man-Move-local-variable-declaration-to-function-scop.patch

[1] https://github.com/kraj/meta-clang/commit/d3180c5e597f587c822192caba3ceced2452b861
[2] https://github.com/llvm/llvm-project/commit/8bd06d5b6584

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 ...ariable-declaration-to-function-scop.patch | 38 -------------------
 .../{man-db_2.12.1.bb => man-db_2.13.0.bb}    |  3 +-
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
 rename meta/recipes-extended/man-db/{man-db_2.12.1.bb => man-db_2.13.0.bb} (94%)
diff mbox series

Patch

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
deleted file mode 100644
index 57ecd48b1f..0000000000
--- a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
+++ /dev/null
@@ -1,38 +0,0 @@ 
-From e4125223631f0d555fc327da6d8705bcc8ee5ba5 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
-
-There is a clang bug [1] unearthed here, so help clang by re-arranging
-code without changing the logic, until its fixed in clang
-
-[1] https://github.com/llvm/llvm-project/issues/53692
-
-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 195d35d..6870989 100644
---- a/src/man.c
-+++ b/src/man.c
-@@ -379,7 +379,7 @@ static void init_html_pager (void)
- static error_t parse_opt (int key, char *arg, struct argp_state *state)
- {
- 	static bool apropos, whatis; /* retain values between calls */
--
-+	char *s;
- 	/* Please keep these keys in the same order as in options above. */
- 	switch (key) {
- 		case 'C':
-@@ -411,7 +411,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
- 		case OPT_WARNINGS:
- #ifdef NROFF_WARNINGS
- 			{
--				char *s = xstrdup
-+				s = xstrdup
- 					(arg ? arg : default_roff_warnings);
- 				const char *warning;
- 
diff --git a/meta/recipes-extended/man-db/man-db_2.12.1.bb b/meta/recipes-extended/man-db/man-db_2.13.0.bb
similarity index 94%
rename from meta/recipes-extended/man-db/man-db_2.12.1.bb
rename to meta/recipes-extended/man-db/man-db_2.13.0.bb
index 5c6797c8f1..2fa18a8f24 100644
--- a/meta/recipes-extended/man-db/man-db_2.12.1.bb
+++ b/meta/recipes-extended/man-db/man-db_2.13.0.bb
@@ -9,9 +9,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
 
 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 \
           "
-SRC_URI[sha256sum] = "ddee249daeb78cf92bab794ccd069cc8b575992265ea20e239e887156e880265"
+SRC_URI[sha256sum] = "82f0739f4f61aab5eb937d234de3b014e777b5538a28cbd31433c45ae09aefb9"
 
 DEPENDS = "libpipeline gdbm groff-native base-passwd"
 RDEPENDS:${PN} += "base-passwd"