diff mbox series

[32/56] man-db: upgrade 2.13.0 -> 2.13.1

Message ID 1747040619-7566-32-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [01/56] appstream: upgrade 1.0.4 -> 1.0.5 | expand

Commit Message

Mingyu Wang (Fujitsu) May 12, 2025, 9:03 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-check-for-_nl_msg_cat_cntr-in-configure.patch
flex.patch
removed since they're included in 2.13.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...ck-for-_nl_msg_cat_cntr-in-configure.patch | 61 -------------------
 meta/recipes-extended/man-db/files/flex.patch | 36 -----------
 .../{man-db_2.13.0.bb => man-db_2.13.1.bb}    |  6 +-
 3 files changed, 2 insertions(+), 101 deletions(-)
 delete mode 100644 meta/recipes-extended/man-db/files/0001-check-for-_nl_msg_cat_cntr-in-configure.patch
 delete mode 100644 meta/recipes-extended/man-db/files/flex.patch
 rename meta/recipes-extended/man-db/{man-db_2.13.0.bb => man-db_2.13.1.bb} (92%)
diff mbox series

Patch

diff --git a/meta/recipes-extended/man-db/files/0001-check-for-_nl_msg_cat_cntr-in-configure.patch b/meta/recipes-extended/man-db/files/0001-check-for-_nl_msg_cat_cntr-in-configure.patch
deleted file mode 100644
index feef52b11c..0000000000
--- a/meta/recipes-extended/man-db/files/0001-check-for-_nl_msg_cat_cntr-in-configure.patch
+++ /dev/null
@@ -1,61 +0,0 @@ 
-From ea00e32a87cc733dd5aa05cef407a5bee3e6db29 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 18 Mar 2025 22:42:45 -0700
-Subject: [PATCH] check for _nl_msg_cat_cntr in configure
-
-_nl_msg_cat_cntr is not available in all implementations e.g. musl libintl
-does not have it, therefore add a check to detect it and use it only if
-it is found.
-
-Upstream-Status: Backport [https://gitlab.com/man-db/man-db/-/commit/7430ca617b5cee3d4420da3158382c5ffbc3e77d]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac        | 9 +++++++++
- include/manconfig.h | 6 ++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -404,6 +404,15 @@ AC_TYPE_PID_T
- AC_TYPE_UID_T
- AC_TYPE_SIZE_T
- 
-+dnl _nl_msg_cat_cntr is required for GNU gettext
-+AC_MSG_CHECKING([for _nl_msg_cat_cntr])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM(
-+	[[#include <libintl.h>
-+	extern int _nl_msg_cat_cntr;]],
-+	[[++_nl_msg_cat_cntr;]])],
-+	AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_NL_MSG_CAT_CNTR], [], [_nl_msg_cat_cntr from GNU Gettext]),
-+	AC_MSG_RESULT([no]))
-+
- # Check for pipeline library.
- PKG_CHECK_MODULES([libpipeline], [libpipeline >= 1.5.0])
- 
---- a/include/manconfig.h
-+++ b/include/manconfig.h
-@@ -24,6 +24,8 @@
- #ifndef MANCONFIG_H
- #define MANCONFIG_H
- 
-+#include "config.h"
-+
- /* STD_SECTIONS must contain all of your man hierarchy subdirectories. The
-    order is important. Manual pages will be displayed in this order. Ie
-    if "1" comes before "2", then a kill(1) will be displayed in preference to
-@@ -138,13 +140,13 @@
- #define UNLIKELY(cond) __builtin_expect ((cond), 0)
- 
- /* GNU gettext needs to know when the locale changes. This macro tells it. */
--#ifdef ENABLE_NLS
-+#ifdef HAVE_NL_MSG_CAT_CNTR
- extern int _nl_msg_cat_cntr;
- #  define locale_changed()                                                    \
- 	  do {                                                                \
- 		  ++_nl_msg_cat_cntr;                                         \
- 	  } while (0)
--#else /* !ENABLE_NLS */
-+#else /* !HAVE_NL_MSG_CAT_CNTR */
- #  define locale_changed()
- #endif /* ENABLE_NLS */
- 
diff --git a/meta/recipes-extended/man-db/files/flex.patch b/meta/recipes-extended/man-db/files/flex.patch
deleted file mode 100644
index c18be7e36a..0000000000
--- a/meta/recipes-extended/man-db/files/flex.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-From d3f7c160bddf5d879c74e19e4f577882e8b22559 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Wed, 22 Jan 2025 14:16:48 +0000
-Subject: [PATCH] configure: check for shipped generated sources in source
- directory
-
-The configure script fails if it can't find flex and the pregenerated
-source code isn't available, as is the case in builds from git whereas
-tarballs include the code.
-
-However this breaks with out-of-tree builds, where cwd during configure
-is the build directory not the source directory, and the pregenerated
-sources will always be inside the source directory.
-
-Upstream-Status: Submitted [https://gitlab.com/man-db/man-db/-/merge_requests/12]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7e9148fb..49a213fd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -380,7 +380,7 @@ dnl To add more decompressors just follow the scheme above.
- dnl The "noyywrap" argument is new in Autoconf 2.70, but this also works
- dnl fine with older versions that ignore the argument.
- AC_PROG_LEX([noyywrap])
--if test "$LEX" = ":" && (test ! -e src/lexgrog.c || test ! -e src/zsoelim.c)
-+if test "$LEX" = ":" && (test ! -e $srcdir/src/lexgrog.c || test ! -e $srcdir/src/zsoelim.c)
- then
- 	AC_MSG_ERROR([flex is required when building from revision control])
- fi
--- 
-2.43.0
-
diff --git a/meta/recipes-extended/man-db/man-db_2.13.0.bb b/meta/recipes-extended/man-db/man-db_2.13.1.bb
similarity index 92%
rename from meta/recipes-extended/man-db/man-db_2.13.0.bb
rename to meta/recipes-extended/man-db/man-db_2.13.1.bb
index a0ce2150f9..f044a47f7d 100644
--- a/meta/recipes-extended/man-db/man-db_2.13.0.bb
+++ b/meta/recipes-extended/man-db/man-db_2.13.1.bb
@@ -8,11 +8,9 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
                    "
 
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
-           file://flex.patch \
-           file://0001-check-for-_nl_msg_cat_cntr-in-configure.patch \
            file://99_mandb \
-          "
-SRC_URI[sha256sum] = "82f0739f4f61aab5eb937d234de3b014e777b5538a28cbd31433c45ae09aefb9"
+           "
+SRC_URI[sha256sum] = "8afebb6f7eb6bb8542929458841f5c7e6f240e30c86358c1fbcefbea076c87d9"
 
 DEPENDS = "libpipeline gdbm groff-native base-passwd"
 RDEPENDS:${PN} += "base-passwd"