[rpms/gdb] gdb-17.2-rebase-f44: Fix testing w/Tcl 9.0

[rpms/gdb] gdb-17.2-rebase-f44: Fix testing w/Tcl 9.0

[Kevin Buettner]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : b0166d56c87546fd5497236f3afdad5d9fa87836
            Author : Kevin Buettner <kevinb@redhat.com>
            Date   : 2026-05-05T23:04:14-07:00
            Stats  : +56/-0 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/b0166d56c87546fd5497236f3afdad5d9fa87836?branch=gdb-17.2-rebase-f44

            Log:
            Fix testing w/Tcl 9.0

Backport upstream commit ef7727ae from Tom de Vries to
fix the test suite for newer Tcl releases.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index e306477..1f9e060 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -58,3 +58,7 @@ Patch011: gdb-rhbz2366461-missing-thread.patch
 # commit will drop out with GDB 18.
 Patch012: gdb-rhbz2366461-bad-solib-entry-addr.patch
 
+# Fix use of deprecated trace variable subcommand
+# (Tom de Vries)
+Patch013: gdb-fix-testsuite-newer-tcl.patch
+

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index dad4d0a..cb13330 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -10,3 +10,4 @@
 %patch -p1 -P010
 %patch -p1 -P011
 %patch -p1 -P012
+%patch -p1 -P013

diff --git a/_patch_order b/_patch_order
index ca215be..eb933e5 100644
--- a/_patch_order
+++ b/_patch_order
@@ -10,3 +10,4 @@ gdb-rhbz2413405-gcore-unreadable-pages.patch
 gdb-fileio-test-fixes.patch
 gdb-rhbz2366461-missing-thread.patch
 gdb-rhbz2366461-bad-solib-entry-addr.patch
+gdb-fix-testsuite-newer-tcl.patch

diff --git a/gdb-fix-testsuite-newer-tcl.patch b/gdb-fix-testsuite-newer-tcl.patch
new file mode 100644
index 0000000..5e0e16c
--- /dev/null
+++ b/gdb-fix-testsuite-newer-tcl.patch
@@ -0,0 +1,46 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Tom de Vries <tdevries@suse.de>
+Date: Fri, 20 Mar 2026 10:13:27 +0100
+Subject: gdb-fix-testsuite-newer-tcl.patch
+
+;; Fix use of deprecated trace variable subcommand
+;; (Tom de Vries)
+
+With Tcl 9.0, we get:
+...
+bad option "variable": must be add, info, or remove
+    while executing
+"trace variable "boards_dir" w append_gdb_boards_dir"
+    (file "lib/append_gdb_boards_dir.exp" line 48)
+...
+
+The trace subcommand "trace variable <name> <ops> <command>" [1]:
+- is equivalent to "trace add variable <name> <ops> <command>"
+- is for backwards compatibility,
+- uses "an older syntax in which array, read, write, unset are replaced by a,
+  r, w and u respectively",
+- has an ops argument which is "not a list, but simply a string concatenation
+  of the operations", and
+- is "deprecated and will likely be removed in a future version of Tcl".
+
+Fix this by using "trace add variable":
+...
+-trace variable "boards_dir" w append_gdb_boards_dir
++trace add variable "boards_dir" {write} append_gdb_boards_dir
+...
+
+Approved-By: Tom Tromey <tom@tromey.com>
+
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33948
+
+[1] https://www.tcl-lang.org/man/tcl8.6/TclCmd/trace.htm#M27
+
+diff --git a/gdb/testsuite/lib/append_gdb_boards_dir.exp b/gdb/testsuite/lib/append_gdb_boards_dir.exp
+--- a/gdb/testsuite/lib/append_gdb_boards_dir.exp
++++ b/gdb/testsuite/lib/append_gdb_boards_dir.exp
+@@ -45,4 +45,4 @@ proc append_gdb_boards_dir { name1 name2 op } {
+     }
+     lappend boards_dir "${gdb_boards_dir}"
+ }
+-trace variable "boards_dir" w append_gdb_boards_dir
++trace add variable "boards_dir" {write} append_gdb_boards_dir

diff --git a/gdb.spec b/gdb.spec
index e326265..fcfa711 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -932,6 +932,10 @@ fi
 # endif scl
 
 %changelog
+* Tue May 5 2026 Keith Seitz <keiths@redhat.com>
+- Backport upstream commit ef7727ae from Tom de Vries to
+  fix the test suite for newer Tcl releases.
+
 * Tue Apr 21 2026 Andrew Burgess <aburgess@redhat.com>
 - Backport upstream commits 8bd08ee92c4 and cd289df068e to address
   rhbz2366461.  These backports will not be needed once we rebase to