commit: 088b424f14b496d93768114a58aacb8ffcf0dcbb Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon May 5 15:37:43 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon May 5 15:37:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088b424f
dev-scheme/guile-ssh: fix build w/ c23 Closes: https://bugs.gentoo.org/942958 Signed-off-by: Sam James <sam <AT> gentoo.org> .../guile-ssh/files/guile-ssh-0.16.4-c23.patch | 33 ++++++++++++++++++++++ dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.ebuild | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dev-scheme/guile-ssh/files/guile-ssh-0.16.4-c23.patch b/dev-scheme/guile-ssh/files/guile-ssh-0.16.4-c23.patch new file mode 100644 index 000000000000..1e7502060b89 --- /dev/null +++ b/dev-scheme/guile-ssh/files/guile-ssh-0.16.4-c23.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/942958 +https://github.com/artyom-poptsov/guile-ssh/pull/43 + +From 30fc103c67f3bf6cd30b17379ba966b260cfa534 Mon Sep 17 00:00:00 2001 +From: Peter Tillemans <[email protected]> +Date: Wed, 18 Sep 2024 15:52:46 +0200 +Subject: [PATCH] fix compile error caused by bool identifier + +confusion of variable name with typename is now an error. +--- + libguile-ssh/session-func.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libguile-ssh/session-func.c b/libguile-ssh/session-func.c +index 7006b62..836cd27 100644 +--- a/libguile-ssh/session-func.c ++++ b/libguile-ssh/session-func.c +@@ -234,12 +234,12 @@ set_int32_opt (ssh_session session, int type, SCM value) + static inline int + set_bool_opt (ssh_session session, int type, SCM value) + { +- int32_t bool; ++ int32_t bool_value; + + SCM_ASSERT (scm_is_bool (value), value, SCM_ARG3, "session-set!"); + +- bool = scm_to_bool (value); +- return ssh_options_set (session, type, &bool); ++ bool_value = scm_to_bool (value); ++ return ssh_options_set (session, type, &bool_value); + } + + /* Convert VALUE to a socket file descriptor and pass it to diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.ebuild index 2de52a2e3291..3202fdb834b5 100644 --- a/dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.ebuild +++ b/dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.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 @@ -43,6 +43,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) PATCHES=( "${FILESDIR}/${PN}-0.16.2-tests.patch" + "${FILESDIR}/${PN}-0.16.4-c23.patch" ) src_prepare() {
