From 327a205037b9cb5779ad66d2dfb3cc7b89970eb3 Mon Sep 17 00:00:00 2001 From: NHOrus Date: Sun, 23 Feb 2025 17:17:32 +0400 Subject: [PATCH] dev-db/recutils: Fix incompatible pointer types and remove .la files Closes: https://bugs.gentoo.org/941097 Closes: https://bugs.gentoo.org/941542 Signed-off-by: NHOrus Closes: https://github.com/gentoo/gentoo/pull/40715 Signed-off-by: Sam James --- dev-db/recutils/files/recutils-1.9-add-const.patch | 14 ++++++++++++++ ...{recutils-1.9.ebuild => recutils-1.9-r1.ebuild} | 10 +++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dev-db/recutils/files/recutils-1.9-add-const.patch rename dev-db/recutils/{recutils-1.9.ebuild => recutils-1.9-r1.ebuild} (83%) diff --git a/dev-db/recutils/files/recutils-1.9-add-const.patch b/dev-db/recutils/files/recutils-1.9-add-const.patch new file mode 100644 index 0000000000000..b8c14845d11ea --- /dev/null +++ b/dev-db/recutils/files/recutils-1.9-add-const.patch @@ -0,0 +1,14 @@ +Cast bash-generated argv from char ** to const char ** so it would be of the same +type argv was declared +https://bugs.gentoo.org/941542 +--- a/bash/testrec.c ++++ b/bash/testrec.c +@@ -60,7 +60,7 @@ + + /* Get arguments and verify them. */ + +- argv = make_builtin_argv (list, &argc); ++ argv = (const char**)make_builtin_argv (list, &argc); + if ((argc != 3) + || ((strcmp (argv[0], "[%") == 0) && ((strlen (argv[2]) == 2) && ((argv[2][0] != '%') || (argv[2][1] != ']'))))) + { diff --git a/dev-db/recutils/recutils-1.9.ebuild b/dev-db/recutils/recutils-1.9-r1.ebuild similarity index 83% rename from dev-db/recutils/recutils-1.9.ebuild rename to dev-db/recutils/recutils-1.9-r1.ebuild index cff0821ae74ea..df600fd416d64 100644 --- a/dev-db/recutils/recutils-1.9.ebuild +++ b/dev-db/recutils/recutils-1.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -37,6 +37,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PV} + "${FILESDIR}"/${P}-add-const.patch ) src_prepare() { @@ -63,3 +64,10 @@ src_test() { # tests have parallel issues emake -j1 check } + +src_install() { + default + + # Remove unneeded .la files (Bug #941097) + find "${ED}" -name '*.la' -type f -delete || die +}