From e543afc2c18db5455e283b5c415395288e256e6d Mon Sep 17 00:00:00 2001 From: Brahmajit Das Date: Sat, 31 Aug 2024 12:51:05 +0000 Subject: [PATCH] sys-apps/dog: Fix implicit declaration of function strfry [arthurzam]: undo revbump since this is build only issue Signed-off-by: Brahmajit Das Bug: https://bugs.gentoo.org/717252 Bug: https://bugs.gentoo.org/938613 Closes: https://github.com/gentoo/gentoo/pull/38355 Signed-off-by: Arthur Zamarin --- profiles/features/musl/package.mask | 4 ---- sys-apps/dog/dog-1.7-r6.ebuild | 3 ++- sys-apps/dog/files/dog-1.7-musl-strfry-fix.patch | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 sys-apps/dog/files/dog-1.7-musl-strfry-fix.patch diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask index 7b377e8238500..4afe673517e18 100644 --- a/profiles/features/musl/package.mask +++ b/profiles/features/musl/package.mask @@ -28,10 +28,6 @@ kde-misc/krunner-vscodeprojects # would require a patch to get past the configure step net-fs/openafs -# Sam James (2024-11-19) -# Not ported to musl (bug #717252, bug #938613) -sys-apps/dog - # Robert Siebeck (2024-10-30) # musl not supported by upstream app-editors/zed diff --git a/sys-apps/dog/dog-1.7-r6.ebuild b/sys-apps/dog/dog-1.7-r6.ebuild index ea419e8e51c7b..7346f1f008ee5 100644 --- a/sys-apps/dog/dog-1.7-r6.ebuild +++ b/sys-apps/dog/dog-1.7-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,6 +18,7 @@ PATCHES=( "${FILESDIR}"/${PV}-manpage-touchup.patch "${FILESDIR}"/${P}-64bit-goodness.patch "${FILESDIR}"/${P}-strfry.patch + "${FILESDIR}"/${P}-musl-strfry-fix.patch ) src_prepare() { diff --git a/sys-apps/dog/files/dog-1.7-musl-strfry-fix.patch b/sys-apps/dog/files/dog-1.7-musl-strfry-fix.patch new file mode 100644 index 0000000000000..a36bc68bac490 --- /dev/null +++ b/sys-apps/dog/files/dog-1.7-musl-strfry-fix.patch @@ -0,0 +1,15 @@ +See bug #938613 +--- a/dog.c ++++ b/dog.c +@@ -77,9 +77,11 @@ + #endif + + #if ALLOW_LINUX_EXTENSIONS ++#if defined(__GLIBC__) + #define ALLOW_STRFRY 1 + extern char *strfry __P ((char *__string)); + #else ++#endif + #define ALLOW_STRFRY 0 + #endif +