gentoo auto-resync : 06:04:2025 - 01:34:40

4 files changed, 44 insertions, 3 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 387c3d095eb4..ac82257d7ae5 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tktable/Manifest b/dev-tcltk/tktable/Manifest
index b63508b48c02..a3069356d498 100644
--- a/dev-tcltk/tktable/Manifest
+++ b/dev-tcltk/tktable/Manifest
@@ -1,8 +1,9 @@
 AUX tktable-2.10-clang6.patch 3234 BLAKE2B d74fee13f1a1be1038870be73e1ef84a1ce09a1604098f6e701441a5650aeeb8354acd78612bdcf1e55308b539bb7574a5fddb2a31152aa0a2412d763da14417 SHA512 6887ce462df67cc470873fffc31fbc411c0218e6974d13f24c6a9355d5eb665f374f8883670e057b26adbe4c00394353c54670e836ffec5340656c1159865a66
 AUX tktable-2.10-parallelMake.patch 505 BLAKE2B d43564e6a93a450c03e699b82d5e8b63eecc0cc1895ff673074c2317e4a6217cf44124e626bca5061bc4c13078e86297899c655ec86e515975ec00b6217f112c SHA512 d59d664e5719949d683245773dded610857e8b057e13b6353dca0c800e16869822b3c7fb8f365af6e72496023bc51e0f555e5e0f0739bc386bd1d73015cfbc6f
 AUX tktable-2.10.8-clang6.patch 875 BLAKE2B 919ad13b0427940bbe72a26f4bb5817806e80f40edc2f7def629765136944e159f3b2964e3aa0257b6c3ebd238b5267a041779d9dc02f3b81c6529d4867f285e SHA512 2902ff98f8f08f13e66d750bea5f86afe49ebe8d11e12f062c6dc17647df9398ba0231b3a78db2ce05512886698e9857bd9dfb7e3893b8504070957036b2b725
+AUX tktable-2.10.8-nobool.patch 1343 BLAKE2B 4ddf5ece0213a6ca4637304b7f3d61c02fe21788ab1a599bf2bd7b1483d5193fa4d17e17d94d991b18305d3c781293134fc4693867a3deba49215faf8fbf08bb SHA512 33697dc242f3deaca32e45528aa20b98c0dfe7a372540ba555a1d6164f0e2c29131a40ce2f5524b125d95644f1b731d8e6a03cd9bd1fb5c65222282e64eb7ca2
 DIST Tktable2.10.tar.gz 284135 BLAKE2B ff3a37aac53418e7993a310d38ae23b7ec2673e0b44c118ff558a6c3c3805b39bf77f099287e91298fb4a6afacebde68a09171c6b90ecd11f48ac2a33fa3b312 SHA512 d69b1c766abb2833f48c900ca4d4fd3927f138ddf728dd76f2087a784604daa4356ec60a146e71d2fb2508a644598711e0373cb81dbfb0272b7ad16a0754e899
 DIST tktable-2.10.8.tar.gz 308245 BLAKE2B 4ede838e8553244dabd71d9543094bf5dfc82bd74f31ac9b4d4eea7bb2ee7406d90b16198d700eddfccd236160be1b7ed9a1f72f4760a71cddde5e01927ebb42 SHA512 927dad616306f0af477d1ce801ded962d966f7b46904b0a6b6772d1c9140310ff4c93a90ad4cb228495febae8be5f3ded9a328f621ba34195a339fc29d000f04
 EBUILD tktable-2.10-r2.ebuild 696 BLAKE2B 3a0b55bc72e5ebd463db05a8ed0b5b1ec3d56ac85b11f61ccc832a9376d6e3c48e840ad08644bff4a768fb2388f89a60ee73cdd105a0c6e65f6b9c2aa7e1c721 SHA512 9bc6b04e2758792d68c08388328e19212569a2ae71965cfc243b38eb37c17121e8b2dbf97dfee3a2a160e886437db784b72982701548e2466e68704c1a4a1519
-EBUILD tktable-2.10.8.ebuild 790 BLAKE2B 653350e059213ce0e0b9a245665002663770f49d7e9feb2625fd0dc3f3bac3fcccbc49e632570abc98b51fec4313589874f8dd501201579b4280f31648734fd0 SHA512 a3313009c849e17d2fcf63c64b49e190a128cec53763321a2ca65821aeb570770d572521f9eaeee8ea3232e84c329919a122fbcf2674757c837122cffdde489b
+EBUILD tktable-2.10.8.ebuild 823 BLAKE2B 0eba3647d82a3027dcb662bbd49ca9f3912b5ac090ebac78ff67d6a14bacb758f94636d8dabe52d45e5904d93321efb0de6bebead223575de7a3b21055ad7a2a SHA512 a2a98d074457af19fa3b8c0f2d57579132d1d8a98275f533bd0fcbaf3c99e6e0fa52f28622d359c8241ff9516b7881b7011eb8653e1bfe91fa11fb3372174268
 MISC metadata.xml 384 BLAKE2B 4826a9a23f5810e2f88f1921240131b66e452ddd2f8ff22fd7a607825b2427210708a8df21270404af552636539333bf4388cac554d45a7fe0bceddaad278637 SHA512 cbc92dd70f46bc728a6f1d793d1ca33f9b186ae2e115944a3d263ce5f8007971037f67c3f5393dc84b239dda0750276d5834e7c70ffd6d6e03c0e9da935ee6aa
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 <chw@ch-werner.de>
+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() {