commit: 87ddc20097e83681eb63a808641790a9f0ce642e
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 6 10:46:59 2026 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar 6 10:47:16 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ddc200
dev-tcltk/bwidget: Fix test for tcl-9
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/bwidget/bwidget-1.10.1.ebuild | 10 +++++---
dev-tcltk/bwidget/files/bwidget-1.10.1-tcl9.patch | 30 +++++++++++++++++++++++
2 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/dev-tcltk/bwidget/bwidget-1.10.1.ebuild
b/dev-tcltk/bwidget/bwidget-1.10.1.ebuild
index c146f6362a30..83cc618de9c8 100644
--- a/dev-tcltk/bwidget/bwidget-1.10.1.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,10 +19,14 @@ DEPEND="dev-lang/tk:0"
RDEPEND="${DEPEND}"
BDEPEND="app-arch/unzip"
-PATCHES=( "${FILESDIR}"/${PN}-1.9.8-test.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.8-test.patch
+ "${FILESDIR}"/${P}-tcl9.patch
+)
src_test() {
- TCLLIBPATH=${S} virtx tclsh tests/entry.test
+ TCLLIBPATH=${S} virtx tclsh tests/entry.test | tee test.out
+ grep -q "Failed\s\+0$" test.out || die
}
src_install() {
diff --git a/dev-tcltk/bwidget/files/bwidget-1.10.1-tcl9.patch
b/dev-tcltk/bwidget/files/bwidget-1.10.1-tcl9.patch
new file mode 100644
index 000000000000..b3a481414836
--- /dev/null
+++ b/dev-tcltk/bwidget/files/bwidget-1.10.1-tcl9.patch
@@ -0,0 +1,30 @@
+--- a/tests/entry.test 2026-03-06 11:01:27.368490500 +0100
++++ b/tests/entry.test 2026-03-06 11:34:18.284747899 +0100
+@@ -14,6 +14,9 @@
+ pack .e
+ update
+ set i 0
++# Check if we are running Tk 9.0 or higher
++set isTk9 [expr {[package vcompare [package provide Tk] 9.0] >= 0}]
++
+ foreach test {
+ {-background #ff0000 #ff0000 non-existent \
+ {unknown color name "non-existent"}}
+@@ -55,10 +58,15 @@
+ {-xscrollcommand {Some command} {Some command} {} {}}
+ } {
+ set name [lindex $test 0]
++ set value [lindex $test 1]
++ set expected [lindex $test 2]
++ if {$isTk9 && [string match "-*borderwidth" $name]} {
++ set expected $value
++ }
+ test entry-1.$i {configuration options} {
+- .e configure $name [lindex $test 1]
++ .e configure $name $value
+ list [lindex [.e configure $name] 4] [.e cget $name]
+- } [list [lindex $test 2] [lindex $test 2]]
++ } [list $expected $expected]
+ incr i
+ }
+ destroy .e
