commit: f1ad5f3ab6fec658da13c94151de756ccc6373be Author: NRK <nrk <AT> disroot <DOT> org> AuthorDate: Sat Mar 8 20:52:10 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 10 00:21:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ad5f3a
dev-lang/uasm: replace custom bool with stdbool.h Closes: https://bugs.gentoo.org/944192 Signed-off-by: NRK <nrk <AT> disroot.org> Closes: https://github.com/gentoo/gentoo/pull/40969 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/uasm/files/bool-fix.diff | 18 ++++++++++++++++++ dev-lang/uasm/uasm-2.56.2.ebuild | 3 ++- dev-lang/uasm/uasm-2.57.ebuild | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dev-lang/uasm/files/bool-fix.diff b/dev-lang/uasm/files/bool-fix.diff new file mode 100644 index 000000000000..6071a0d42ba9 --- /dev/null +++ b/dev-lang/uasm/files/bool-fix.diff @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/944192 + +diff --git a/H/bool.h b/H/bool.h +index fbf55c8..ddb7396 100644 +--- a/H/bool.h ++++ b/H/bool.h +@@ -30,10 +30,7 @@ + ****************************************************************************/ + + +-#if !defined( BOOL_DEFINED ) && !defined( bool ) && !(__WATCOMC__ >= 1070 && defined(__cplusplus)) +- #define BOOL_DEFINED +- typedef unsigned char bool; +-#endif ++#include <stdbool.h> + #ifndef TRUE + #define TRUE 1 + #endif diff --git a/dev-lang/uasm/uasm-2.56.2.ebuild b/dev-lang/uasm/uasm-2.56.2.ebuild index 5a0d38620ed2..71f4e7f3518f 100644 --- a/dev-lang/uasm/uasm-2.56.2.ebuild +++ b/dev-lang/uasm/uasm-2.56.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,6 +16,7 @@ KEYWORDS="amd64" PATCHES=( "${FILESDIR}/build-fix.patch" "${FILESDIR}/makefile-dep-fix.patch" + "${FILESDIR}/bool-fix.diff" ) src_prepare() { diff --git a/dev-lang/uasm/uasm-2.57.ebuild b/dev-lang/uasm/uasm-2.57.ebuild index bb8e70dfc0ff..4aff172e02f6 100644 --- a/dev-lang/uasm/uasm-2.57.ebuild +++ b/dev-lang/uasm/uasm-2.57.ebuild @@ -17,6 +17,7 @@ KEYWORDS="~amd64" PATCHES=( "${FILESDIR}/build-fix.patch" "${FILESDIR}/makefile-dep-fix-2.57.patch" + "${FILESDIR}/bool-fix.diff" ) src_prepare() {
