[gentoo-commits] repo/gentoo:master commit in: app-misc/figlet/files/, app-misc/figlet/

[David Seifert]

commit:     ff505acf8b6e0cdf3edcee56d58079f4e4b17a31
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 18:05:31 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May  1 18:05:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff505acf

app-misc/figlet: fix building on musl

* The patch is from Alpine and the ebuild changes are
  not copyrightable.

Closes: https://github.com/gentoo/gentoo/pull/20385
Closes: https://bugs.gentoo.org/608172
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-misc/figlet/figlet-2.2.5-r1.ebuild        |  2 ++
 app-misc/figlet/files/figlet-2.2.5-musl.patch | 36 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 7514e810fb6..2d98e79b36b 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -13,6 +13,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
 src_compile() {
 	emake clean
 	emake \

diff --git a/app-misc/figlet/files/figlet-2.2.5-musl.patch b/app-misc/figlet/files/figlet-2.2.5-musl.patch
new file mode 100644
index 00000000000..6294d9d889d
--- /dev/null
+++ b/app-misc/figlet/files/figlet-2.2.5-musl.patch
@@ -0,0 +1,36 @@
+From 88428a728e1f99dcdc63d7c5ff0cd8b6cda37576 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@×××××××××××.org>
+Date: Tue, 3 Jun 2014 10:59:40 +0000
+Subject: [PATCH] Fix build with musl libc
+
+Avoid using the glibc internal macros __BEGIN/__END_DECLS.
+
+Signed-off-by: Natanael Copa <ncopa@×××××××××××.org>
+---
+ utf8.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/utf8.h b/utf8.h
+index 0631b8a..a3e09bd 100644
+--- a/utf8.h
++++ b/utf8.h
+@@ -27,13 +27,17 @@
+ #define UTF8_IGNORE_ERROR		0x01
+ #define UTF8_SKIP_BOM			0x02
+ 
+-__BEGIN_DECLS
++#ifdef   __cplusplus
++extern "C" {
++#endif
+ 
+ size_t		utf8_to_wchar(const char *in, size_t insize, wchar_t *out,
+ 		    size_t outsize, int flags);
+ size_t		wchar_to_utf8(const wchar_t *in, size_t insize, char *out,
+ 		    size_t outsize, int flags);
+ 
+-__END_DECLS
++#ifdef   __cplusplus
++}
++#endif
+ 
+ #endif /* !_UTF8_H_ */