commit: 240b3653573b321e4379379daaa97d33dad35bb2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sat Apr 5 21:54:11 2025 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sat Apr 5 21:54:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240b3653
dev-tcltk/tktable: Do not use bool as variable name Closes: https://bugs.gentoo.org/943985 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> .../tktable/files/tktable-2.10.8-nobool.patch | 39 ++++++++++++++++++++++ dev-tcltk/tktable/tktable-2.10.8.ebuild | 5 +-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dev-tcltk/tktable/files/tktable-2.10.8-nobool.patch b/dev-tcltk/tktable/files/tktable-2.10.8-nobool.patch new file mode 100644 index 000000000000..f9ff321bcdcf --- /dev/null +++ b/dev-tcltk/tktable/files/tktable-2.10.8-nobool.patch @@ -0,0 +1,39 @@ +From 78fdd693c43aec8595b6b8b122bd1dede218f85e Mon Sep 17 00:00:00 2001 +From: Christian Werner <[email protected]> +Date: Wed, 10 Jun 2020 01:12:58 +0000 +Subject: [PATCH] Do not use bool as variable name in tktable + +Imported from http://www.androwish.org/home/info/f2bd6de01c438a20 +--- + generic/tkTable.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/generic/tkTable.c b/generic/tkTable.c +index 2cb084a..4d89b3a 100644 +--- a/generic/tkTable.c ++++ b/generic/tkTable.c +@@ -3843,7 +3843,7 @@ TableValidateChange(tablePtr, r, c, old, new, index) + int index; /* index of insert/delete, -1 otherwise */ + { + register Tcl_Interp *interp = tablePtr->interp; +- int code, bool; ++ int code, flag; + Tk_RestrictProc *rstrct; + ClientData cdata; + Tcl_DString script; +@@ -3884,13 +3884,13 @@ TableValidateChange(tablePtr, r, c, old, new, index) + Tcl_BackgroundError(interp); + code = TCL_ERROR; + } else if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp), +- &bool) != TCL_OK) { ++ &flag) != TCL_OK) { + Tcl_AddErrorInfo(interp, + "\n\tboolean not returned by validation command"); + Tcl_BackgroundError(interp); + code = TCL_ERROR; + } else { +- code = (bool) ? TCL_OK : TCL_BREAK; ++ code = (flag) ? TCL_OK : TCL_BREAK; + } + Tcl_SetObjResult(interp, Tcl_NewObj()); + diff --git a/dev-tcltk/tktable/tktable-2.10.8.ebuild b/dev-tcltk/tktable/tktable-2.10.8.ebuild index 2215efce4811..238c52d64ebc 100644 --- a/dev-tcltk/tktable/tktable-2.10.8.ebuild +++ b/dev-tcltk/tktable/tktable-2.10.8.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 @@ -9,8 +9,8 @@ SRC_URI="https://github.com/wjoye/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" -KEYWORDS="amd64 ~arm64 ppc x86" SLOT="0" +KEYWORDS="amd64 ~arm64 ppc x86" RESTRICT="test" DEPEND=">=dev-lang/tk-8.0:=" @@ -26,6 +26,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-2.10-parallelMake.patch "${FILESDIR}"/${P}-clang6.patch + "${FILESDIR}"/${P}-nobool.patch ) src_prepare() {
