Fix Tk builds against Tcl 8.7 and Tcl 9.1. See: [https://github.com/t…

…cltk/tk/actions/runs/12628690076]
tcltk · Jan 6, 2025 · 1c63482 · 1c63482
1 parent 4449b4d
commit 1c63482
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/linux-with-tcl8-build.yml b/.github/workflows/linux-with-tcl8-build.yml
@@ -23,7 +23,7 @@ jobs:
         compiler:
           - "gcc"
           - "clang"
-        cfgopt:
+        config:
           - ""
           - "CFLAGS=-DTK_NO_DEPRECATED=1"
           - "--disable-shared"
@@ -52,9 +52,9 @@ jobs:
           echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
         working-directory: "."
         env:
-          CFGOPT: ${{ matrix.cfgopt }}
+          CFGOPT: ${{ matrix.config }}
           COMPILER: ${{ matrix.compiler }}
-          OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }}
+          OPTS: ${{ matrix.compiler }}${{ matrix.config }}
       - name: Configure and Build Tcl
         run: |
           ./configure $CFGOPT "--prefix=$HOME/install dir" || {
@@ -68,7 +68,7 @@ jobs:
           }
           echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
         working-directory: tcl/unix
-      - name: Configure (opts=${{ matrix.cfgopt }})
+      - name: Configure (opts=${{ matrix.config }})
         run: |
           ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
             cat config.log
@@ -111,7 +111,7 @@ jobs:
       matrix:
         compiler:
           - "gcc"
-        cfgopt:
+        config:
           - ""
           - "--disable-xft"
           - "--enable-symbols"
@@ -128,14 +128,14 @@ jobs:
           path: tcl
       - name: Setup Environment (compiler=${{ matrix.compiler }})
         run: |
-          sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev
+          sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev xfonts-75dpi xfonts-100dpi xfonts-scalable libxfont2 unifont
           mkdir "$HOME/install dir"
           touch tk/doc/man.macros tk/generic/tkStubInit.c
           echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
           echo "CC=$COMPILER" >> $GITHUB_ENV
         working-directory: "."
         env:
-          CFGOPT: ${{ matrix.cfgopt }}
+          CFGOPT: ${{ matrix.config }}
           COMPILER: ${{ matrix.compiler }}
       - name: Configure and Build Tcl
         run: |
@@ -150,7 +150,7 @@ jobs:
           }
           echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
         working-directory: tcl/unix
-      - name: Configure ${{ matrix.cfgopt }}
+      - name: Configure ${{ matrix.config }}
         run: |
           ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
             cat config.log

diff --git a/.github/workflows/linux-with-tcl91-build.yml b/.github/workflows/linux-with-tcl91-build.yml
@@ -23,7 +23,7 @@ jobs:
         compiler:
           - "gcc"
           - "clang"
-        cfgopt:
+        config:
           - ""
           - "CFLAGS=-DTK_NO_DEPRECATED=1"
           - "--disable-shared"
@@ -52,9 +52,9 @@ jobs:
           echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
         working-directory: "."
         env:
-          CFGOPT: ${{ matrix.cfgopt }}
+          CFGOPT: ${{ matrix.config }}
           COMPILER: ${{ matrix.compiler }}
-          OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }}
+          OPTS: ${{ matrix.compiler }}${{ matrix.config }}
       - name: Configure and Build Tcl
         run: |
           ./configure $CFGOPT "--prefix=$HOME/install dir" || {
@@ -68,7 +68,7 @@ jobs:
           }
           echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
         working-directory: tcl/unix
-      - name: Configure (opts=${{ matrix.cfgopt }})
+      - name: Configure (opts=${{ matrix.config }})
         run: |
           ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
             cat config.log
@@ -111,7 +111,7 @@ jobs:
       matrix:
         compiler:
           - "gcc"
-        cfgopt:
+        config:
           - ""
           - "--disable-xft"
           - "--enable-symbols"
@@ -128,14 +128,14 @@ jobs:
           path: tcl
       - name: Setup Environment (compiler=${{ matrix.compiler }})
         run: |
-          sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev
+          sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev xfonts-75dpi xfonts-100dpi xfonts-scalable libxfont2 unifont
           mkdir "$HOME/install dir"
           touch tk/doc/man.macros tk/generic/tkStubInit.c
           echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
           echo "CC=$COMPILER" >> $GITHUB_ENV
         working-directory: "."
         env:
-          CFGOPT: ${{ matrix.cfgopt }}
+          CFGOPT: ${{ matrix.config }}
           COMPILER: ${{ matrix.compiler }}
       - name: Configure and Build Tcl
         run: |
@@ -150,7 +150,7 @@ jobs:
           }
           echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
         working-directory: tcl/unix
-      - name: Configure ${{ matrix.cfgopt }}
+      - name: Configure ${{ matrix.config }}
         run: |
           ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
             cat config.log