texlive[73297] Master: Compatibility fixes for Tcl/Tk 9

commits+siepo at tug.org commits+siepo at tug.org
Sat Jan 4 15:31:54 CET 2025 

Revision: 73297
          https://tug.org/svn/texlive?view=revision&revision=73297
Author:   siepo
Date:     2025-01-04 15:31:54 +0100 (Sat, 04 Jan 2025)
Log Message:
-----------
Compatibility fixes for Tcl/Tk 9

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/tlshell/tlshell.tcl
    trunk/Master/tlpkg/installer/install-tl-gui.tcl
    trunk/Master/tlpkg/tltcl/tltcl.tcl

Modified: trunk/Master/texmf-dist/scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Master/texmf-dist/scripts/tlshell/tlshell.tcl	2025-01-04 00:41:55 UTC (rev 73296)
+++ trunk/Master/texmf-dist/scripts/tlshell/tlshell.tcl	2025-01-04 14:31:54 UTC (rev 73297)
@@ -1,6 +1,6 @@
 #!/usr/bin/env wish
 
-# Copyright 2017-2024 Siep Kroonenberg
+# Copyright 2017-2025 Siep Kroonenberg
 
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -873,7 +873,7 @@
   wm title .loading [__ "Loading"]
 
   # wallpaper
-  pack [ttk::frame .loading.bg -padding 3pt] -fill both -expand 1
+  pack [ttk::frame .loading.bg -padding 3p] -fill both -expand 1
 
   set lbl [__ \
        "If loading takes too long, press Abort and choose another repository."]
@@ -1357,10 +1357,10 @@
   ### add/remove tlcontrib ###
   ttk::label .tlr.contribt -text [__ "tlcontrib additional repository"] \
       -font bfont
-  pack .tlr.contribt -in .tlr.bg -anchor w -padx 3pt -pady [list 10pt 3pt]
-  pack [ttk::label .tlr.contribl] -in .tlr.bg -anchor w -padx 3pt -pady 3pt
+  pack .tlr.contribt -in .tlr.bg -anchor w -padx 3p -pady [list 10p 3p]
+  pack [ttk::label .tlr.contribl] -in .tlr.bg -anchor w -padx 3p -pady 3p
   ttk::checkbutton .tlr.contribb -variable ::toggle_contrib
-  pack .tlr.contribb -in .tlr.bg -anchor w -padx 3pt -pady [list 3pt 10pt]
+  pack .tlr.contribb -in .tlr.bg -anchor w -padx 3p -pady [list 3p 10p]
   set ::toggle_contrib 0
   set has_contrib 0
   foreach nm [array names ::repos] {
@@ -1379,7 +1379,7 @@
   }
 
   # two ways to close the dialog
-  pack [ttk::frame .tlr.closebuttons] -pady [list 10pt 0pt] -in .tlr.bg -fill x
+  pack [ttk::frame .tlr.closebuttons] -pady [list 10p 0p] -in .tlr.bg -fill x
   ttk::button .tlr.save -text [__ "Save and Load"] -command save_load_repo
   ppack .tlr.save -in .tlr.closebuttons -side right
   dis_enable_reposave
@@ -2787,7 +2787,7 @@
   # with the default ttk::frame color, which seems to work
   # everywhere.
   pack [ttk::frame .bg] -expand 1 -fill both
-  .bg configure -padding 5pt
+  .bg configure -padding 5p
 
   # bottom of main window
   pack [ttk::frame .endbuttons] -in .bg -side bottom -fill x
@@ -2820,7 +2820,7 @@
   pack [ttk::frame .toprepo] -in .topfl -side top -anchor w
 
   # various info (left frame)
-  pack [ttk::frame .topfll] -in .topfl -side top -anchor nw -pady {6pt 0pt}
+  pack [ttk::frame .topfll] -in .topfl -side top -anchor nw -pady {6p 0p}
   ttk::label .topfll.lluptodate -text [__ "TL Manager up to date?"] -anchor w
   pgrid .topfll.lluptodate -row 2 -column 0 -sticky w
   ttk::label .topfll.luptodate -text [__ "Unknown"] -anchor w
@@ -2844,7 +2844,7 @@
   pack [ttk::label .topfr.lshell] -side top -anchor e
 
   pack [ttk::separator .sp -orient horizontal] \
-      -in .bg -side top -fill x -pady 3pt
+      -in .bg -side top -fill x -pady 3p
 
   # controls frame, between info frame and package list
   pack [ttk::frame .middle] -in .bg -side top -fill x
@@ -2854,17 +2854,17 @@
   # package list display options
   ttk::label .lpack -text [string toupper [__ "Package list"]] \
       -font hfont
-  pack .lpack -in .pkcontrol -side top -padx 3pt -pady {6pt 6pt} -anchor w
+  pack .lpack -in .pkcontrol -side top -padx 3p -pady {6p 6p} -anchor w
 
-  pack [ttk::frame .pkfilter -relief groove -borderwidth 2 -padding 3pt] \
+  pack [ttk::frame .pkfilter -relief groove -borderwidth 2 -padding 3p] \
     -in .pkcontrol -side top -anchor nw
   # on my current linux, groove works only with a dimensionless borderwidth
 
   # separator columns
-  grid columnconfigure .pkfilter 1 -minsize 20pt
+  grid columnconfigure .pkfilter 1 -minsize 20p
   grid [ttk::separator .pkfilter.sep1 -orient vertical] \
     -column 1 -row 0 -rowspan 5 -sticky ns
-  grid columnconfigure .pkfilter 3 -minsize 20pt
+  grid columnconfigure .pkfilter 3 -minsize 20p
   grid [ttk::separator .pkfilter.sep3 -orient vertical] \
     -column 3 -row 0 -rowspan 5 -sticky ns
 
@@ -2887,7 +2887,7 @@
         if {! $::have_remote} get_packages_info_remote
         collect_and_display_filtered
       }
-  grid  .pkfilter.lstat  -column 0 -row 0 -sticky w -padx {3pt 50pt}
+  grid  .pkfilter.lstat  -column 0 -row 0 -sticky w -padx {3p 50p}
   pgrid .pkfilter.inst   -column 0 -row 1 -sticky w
   pgrid .pkfilter.notins -column 0 -row 2 -sticky w
   pgrid .pkfilter.alls   -column 0 -row 3 -sticky w
@@ -2947,14 +2947,14 @@
 
   # marking all/none
   pack [ttk::frame .pksel] \
-      -in .bg -pady 6pt -side top -fill x
+      -in .bg -pady 6p -side top -fill x
   pack [ttk::button .mrk_all -text [__ "Mark all displayed"] \
        -command mark_displayed] -in .pksel -side left
   pack [ttk::button .mrk_none -text [__ "Mark none"] -command unmark_all] \
-      -in .pksel -padx 6pt -side left
+      -in .pksel -padx 6p -side left
   ttk::label .binwarn \
     -text [__ "Only packages for installed platforms are displayed"]
-  pack .binwarn -in .pksel -padx 3pt -side right -anchor s
+  pack .binwarn -in .pksel -padx 3p -side right -anchor s
 
   # packages list itself
   pack [ttk::frame .fpkg] -in .bg -side top -fill both -expand 1

Modified: trunk/Master/tlpkg/installer/install-tl-gui.tcl
===================================================================
--- trunk/Master/tlpkg/installer/install-tl-gui.tcl	2025-01-04 00:41:55 UTC (rev 73296)
+++ trunk/Master/tlpkg/installer/install-tl-gui.tcl	2025-01-04 14:31:54 UTC (rev 73297)
@@ -1,6 +1,6 @@
 #!/usr/bin/env wish
 
-# Copyright 2018-2022 Siep Kroonenberg
+# Copyright 2018-2025 Siep Kroonenberg
 
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -334,7 +334,7 @@
   }
 
   # wallpaper for remaining widgets
-  pack [ttk::frame .bg -padding 3pt] -fill both -expand 1
+  pack [ttk::frame .bg -padding 3p] -fill both -expand 1
 
   # frame for buttons (abort button, mirrors dropdown menu)
   pack [ttk::frame .splfb] -in .bg -side bottom -fill x
@@ -389,7 +389,7 @@
   }
 
   # wallpaper
-  pack [ttk::frame .bg -padding 3pt] -fill both -expand 1
+  pack [ttk::frame .bg -padding 3p] -fill both -expand 1
 
   # buttons at bottom
   pack [ttk::frame .bottom] -in .bg -side bottom -fill x
@@ -471,14 +471,14 @@
   if $::plain_unix {wm attributes .tled -type dialog}
 
   # wallpaper
-  pack [ttk::frame .tled.bg -padding 3pt] -fill both -expand 1
+  pack [ttk::frame .tled.bg -padding 3p] -fill both -expand 1
 
   # widgets
   ttk::label .tled.l -text [__ "Change name (slashes not allowed)"]
-  pack .tled.l -in .tled.bg -padx 5pt -pady 5pt
+  pack .tled.l -in .tled.bg -padx 5p -pady 5p
   ttk::entry .tled.e -width 20
   .tled.e state !disabled
-  pack .tled.e -in .tled.bg -pady 5pt
+  pack .tled.e -in .tled.bg -pady 5p
   .tled.e insert 0 [.tltd.name_l cget -text]
 
   # now frame with ok and cancel buttons
@@ -492,9 +492,9 @@
       end_dlg "" .tled
     }
   }
-  ppack .tled.ok_b -in .tled.buttons -side right -padx 5pt -pady 5pt
+  ppack .tled.ok_b -in .tled.buttons -side right -padx 5p -pady 5p
   ttk::button .tled.cancel_b -text [__ "Cancel"] -command {end_dlg "" .tled}
-  ppack .tled.cancel_b -in .tled.buttons -side right -padx 5pt -pady 5pt
+  ppack .tled.cancel_b -in .tled.buttons -side right -padx 5p -pady 5p
   bind .tled <Escape> {.tled.cancel_b invoke}
 
   wm protocol .tled WM_DELETE_WINDOW \
@@ -570,14 +570,14 @@
   wm title .tltd [__ "Installation root"]
 
   # wallpaper
-  pack [ttk::frame .tltd.bg -padding 3pt] -expand 1 -fill both
+  pack [ttk::frame .tltd.bg -padding 3p] -expand 1 -fill both
 
   # full path
   pack [ttk::label .tltd.path_l -font lfont -anchor center] \
-      -in .tltd.bg -pady 10pt -fill x -expand 1
+      -in .tltd.bg -pady 10p -fill x -expand 1
 
   # installation root components, gridded
-  pack [ttk::frame .tltd.fr1 -borderwidth 2pt -relief groove] \
+  pack [ttk::frame .tltd.fr1 -borderwidth 2p -relief groove] \
       -in .tltd.bg -fill x -expand 1
   grid columnconfigure .tltd.fr1 0 -weight 1
   grid columnconfigure .tltd.fr1 2 -weight 1
@@ -620,7 +620,7 @@
   }
 
   # ok/cancel buttons
-  pack [ttk::frame .tltd.frbt] -in .tltd.bg -pady {10pt 0pt} -fill x
+  pack [ttk::frame .tltd.frbt] -in .tltd.bg -pady {10p 0p} -fill x
   ttk::button .tltd.ok_b -text [__ "Ok"] -command commit_root
   ppack .tltd.ok_b -in .tltd.frbt -side right
   ttk::button .tltd.cancel_b -text [__ "Cancel"] \
@@ -684,7 +684,7 @@
   if $::plain_unix {wm attributes .td -type dialog}
 
   # wallpaper
-  pack [ttk::frame .td.bg -padding 3pt] -fill both -expand 1
+  pack [ttk::frame .td.bg -padding 3p] -fill both -expand 1
 
   if {$d eq "TEXMFHOME"} {
     # explain tilde
@@ -889,7 +889,7 @@
   wm title .tlbin [__ "Binaries"]
 
   # wallpaper
-  pack [ttk::frame .tlbin.bg -padding 3pt] -expand 1 -fill both
+  pack [ttk::frame .tlbin.bg -padding 3p] -expand 1 -fill both
 
   # ok, cancel buttons
   pack [ttk::frame .tlbin.buts] -in .tlbin.bg -side bottom -fill x
@@ -939,7 +939,7 @@
   wm title .tlschm [__ "Schemes"]
 
   # wallpaper
-  pack [ttk::frame .tlschm.bg -padding 3pt] -fill both -expand 1
+  pack [ttk::frame .tlschm.bg -padding 3p] -fill both -expand 1
 
   # buttons at bottom
   pack [ttk::frame .tlschm.buts] -in .tlschm.bg -side bottom -fill x
@@ -1027,7 +1027,7 @@
   wm title .tlcoll [__ "Collections"]
 
   # wallpaper
-  pack [ttk::frame .tlcoll.bg -padding 3pt] -fill both -expand 1
+  pack [ttk::frame .tlcoll.bg -padding 3p] -fill both -expand 1
 
   # frame at bottom with ok and cancel buttons
   pack [ttk::frame .tlcoll.butf] -in .tlcoll.bg -side bottom -fill x
@@ -1047,14 +1047,14 @@
     set wgb .tlcoll.b$t
     ttk::frame $wgb
     ttk::label ${wgb}sel -text [__ "Select"]
-    ttk::button ${wgb}all -text [__ "All"] -padding 1pt -command \
+    ttk::button ${wgb}all -text [__ "All"] -padding 1p -command \
       "foreach c \[.tlcoll.$t children {}\] \{
         .tlcoll.$t set \$c mk \[mark_sym 1\]\}"
-    ttk::button ${wgb}none -text [__ "None"] -padding 1pt -command \
+    ttk::button ${wgb}none -text [__ "None"] -padding 1p -command \
       "foreach c \[.tlcoll.$t children {}\] \{
         .tlcoll.$t set \$c mk \[mark_sym 0\]\}"
     pack ${wgb}sel ${wgb}all ${wgb}none -in $wgb \
-        -side left -padx 3pt -pady 3pt
+        -side left -padx 3p -pady 3p
 
     # trees with collections and markers, lang and other separately
     set wgt ".tlcoll.$t"
@@ -1213,7 +1213,7 @@
     create_dlg .edsyms .
     wm title .edsyms [__ "Symlinks"]
 
-    pack [ttk::frame .edsyms.bg -padding 3pt] -expand 1 -fill both
+    pack [ttk::frame .edsyms.bg -padding 3p] -expand 1 -fill both
     set rw -1
 
     pack [ttk::frame .edsyms.fr0] -in .edsyms.bg -expand 1 -fill both
@@ -1345,7 +1345,7 @@
   menu .mn
   . configure -menu .mn
   if $::plain_unix {
-    .mn configure -borderwidth 1pt
+    .mn configure -borderwidth 1p
     .mn configure -background $::default_bg
   }
   .mn add command -command abort_menu -label [__ "Abort"]
@@ -1387,20 +1387,20 @@
   }
 
   # wallpaper, for a uniform background
-  pack [ttk::frame .bg -padding 3pt] -fill both -expand 1
+  pack [ttk::frame .bg -padding 3p] -fill both -expand 1
 
   # title
   ttk::label .title -text [__ "TeX Live %s Installer" $::release_year] \
       -font titlefont
-  pack .title -pady {10pt 1pt} -in .bg
+  pack .title -pady {10p 1p} -in .bg
   pack [ttk::label .svn -text "r. $::svn"] -in .bg
 
   pack [ttk::separator .seph0 -orient horizontal] \
-      -in .bg -pady 3pt -fill x
+      -in .bg -pady 3p -fill x
 
   # frame at bottom with install/quit buttons
   pack [ttk::frame .final] \
-      -in .bg -side bottom -pady {5pt 2pt} -fill x
+      -in .bg -side bottom -pady {5p 2p} -fill x
   ppack [ttk::button .install -text [__ "Install"] -command maybe_install] \
     -in .final -side right
   ppack [ttk::button .quit -text [__ "Quit"] -command {
@@ -1414,7 +1414,7 @@
     }] -in .final -side left
   }
   pack [ttk::separator .seph1 -orient horizontal] \
-      -in .bg -side bottom -pady 3pt -fill x
+      -in .bg -side bottom -pady 3p -fill x
 
   # directories, selections
   # advanced and basic have different frame setups
@@ -1610,7 +1610,7 @@
   if $::advanced {
 
     pack [ttk::separator .sepv -orient vertical] \
-        -in .bg -side left -padx 3pt -fill y
+        -in .bg -side left -padx 3p -fill y
     pack [ttk::frame .options] -in .bg -side right -fill both -expand 1
 
     set curf .options

Modified: trunk/Master/tlpkg/tltcl/tltcl.tcl
===================================================================
--- trunk/Master/tlpkg/tltcl/tltcl.tcl	2025-01-04 00:41:55 UTC (rev 73296)
+++ trunk/Master/tlpkg/tltcl/tltcl.tcl	2025-01-04 14:31:54 UTC (rev 73297)
@@ -1,6 +1,6 @@
 #!/usr/bin/env wish
 
-# Copyright 2018-2020 Siep Kroonenberg
+# Copyright 2018-2025 Siep Kroonenberg
 
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -8,7 +8,8 @@
 # common declarations for tlshell.tcl and install-tl-gui.tcl
 
 set ::plain_unix 0
-if {$::tcl_platform(platform) eq "unix" && $::tcl_platform(os) ne "Darwin"} {
+if {$::tcl_platform(platform) eq "unix" &&
+  [string range $::tcl_version 0 1] eq "8." && $::tcl_platform(os) ne "Darwin"} {
   set ::plain_unix 1
 }
 
@@ -495,11 +496,11 @@
 # 'default' padding
 
 proc ppack {wdg args} { ; # pack command with padding
-  pack $wdg {*}$args -padx 3pt -pady 3pt
+  pack $wdg {*}$args -padx 3p -pady 3p
 }
 
 proc pgrid {wdg args} { ; # grid command with padding
-  grid $wdg {*}$args -padx 3pt -pady 3pt
+  grid $wdg {*}$args -padx 3p -pady 3p
 }
 
 # unicode symbols as fake checkboxes in ttk::treeview widgets
@@ -682,7 +683,7 @@
     wm title .browser [__ "Browse..."]
 
     # wallpaper
-    pack [ttk::frame .browser.bg -padding 3pt] -fill both -expand 1
+    pack [ttk::frame .browser.bg -padding 3p] -fill both -expand 1
 
     # ok and cancel buttons
     pack [ttk::frame .browser.fr1] \

More information about the tex-live-commits mailing list.