From 0f97bcdc231dcad58ff956e1a16d93c1fc2508e1 Mon Sep 17 00:00:00 2001
From: Sergey Dolin <dsame@github.com>
Date: Fri, 17 Jun 2022 09:08:45 +0200
Subject: [PATCH 1/4] Explicity set tcl/tk library

---
 builders/macos-python-builder.psm1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builders/macos-python-builder.psm1 b/builders/macos-python-builder.psm1
index e434dc4..7c8a35c 100644
--- a/builders/macos-python-builder.psm1
+++ b/builders/macos-python-builder.psm1
@@ -59,6 +59,9 @@ class macOSPythonBuilder : NixPythonBuilder {
             $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/zlib/include"
         } else {
             $configureString += " --with-openssl=/usr/local/opt/openssl@1.1"
+            if ($this.Version -gt "3.7.12") {
+                $configureString += " --with-tcltk-includes='-I /usr/local/opt/tcl-tk/include' --with-tcltk-libs='-L/usr/local/opt/tcl-tk/lib -ltcl8.6 -ltk8.6'"
+	    }
         }
 
         ### Compile with support of loadable sqlite extensions. Unavailable for Python 2.*

From 65245322385412ac9b495284a27edc1bf42144d1 Mon Sep 17 00:00:00 2001
From: Sergey Dolin <dsame@github.com>
Date: Fri, 17 Jun 2022 11:50:52 +0200
Subject: [PATCH 2/4] Add test

---
 tests/python-tests.ps1    | 8 ++++++++
 tests/sources/tcltk-86.py | 8 ++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 tests/sources/tcltk-86.py

diff --git a/tests/python-tests.ps1 b/tests/python-tests.ps1
index 8cbb0bb..bc463e2 100644
--- a/tests/python-tests.ps1
+++ b/tests/python-tests.ps1
@@ -89,4 +89,12 @@ Describe "Tests" {
             "./dist/simple-test" | Should -ReturnZeroExitCode
         }
     }
+
+    if (($Platform -match "macos") -or ($Platform -match "darwin")) {
+        if ($Version -gt "3.7.12" ) {
+            It "Check if python above 3.7.12 use tcl/tk v8.6" {
+                "python ./sources/tcltk-86.py" | Should -ReturnZeroExitCode
+            }
+        }
+    }
 }
diff --git a/tests/sources/tcltk-86.py b/tests/sources/tcltk-86.py
new file mode 100644
index 0000000..42a226d
--- /dev/null
+++ b/tests/sources/tcltk-86.py
@@ -0,0 +1,8 @@
+import tkinter
+import _tkinter
+
+lib = tkinter.Tk().getvar('tk_version')
+header = _tkinter.TK_VERSION
+
+if lib != '8.6' or header != '8.6':
+  exit(1)

From 045abfcc3615cbba7c98fe000d8b359b9b406a05 Mon Sep 17 00:00:00 2001
From: Sergey Dolin <dsame@github.com>
Date: Fri, 17 Jun 2022 12:53:40 +0200
Subject: [PATCH 3/4] Print versions

---
 tests/sources/tcltk-86.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/sources/tcltk-86.py b/tests/sources/tcltk-86.py
index 42a226d..4ff04bb 100644
--- a/tests/sources/tcltk-86.py
+++ b/tests/sources/tcltk-86.py
@@ -1,8 +1,11 @@
 import tkinter
 import _tkinter
 
-lib = tkinter.Tk().getvar('tk_version')
 header = _tkinter.TK_VERSION
+lib = tkinter.Tk().getvar('tk_version')
+
+print('header version=' + header)
+print('lib version=' + lib)
 
 if lib != '8.6' or header != '8.6':
   exit(1)

From edcd32dbf1e32d8a033c824ceabff77dae17db59 Mon Sep 17 00:00:00 2001
From: Sergey Dolin <dsame@github.com>
Date: Fri, 17 Jun 2022 13:55:32 +0200
Subject: [PATCH 4/4] Check tcltk for any platform and version

---
 tests/python-tests.ps1                  | 15 +++++++--------
 tests/sources/{tcltk-86.py => tcltk.py} |  7 +++----
 2 files changed, 10 insertions(+), 12 deletions(-)
 rename tests/sources/{tcltk-86.py => tcltk.py} (53%)

diff --git a/tests/python-tests.ps1 b/tests/python-tests.ps1
index bc463e2..974cccb 100644
--- a/tests/python-tests.ps1
+++ b/tests/python-tests.ps1
@@ -49,6 +49,13 @@ Describe "Tests" {
         "python ./sources/simple-test.py" | Should -ReturnZeroExitCode
     }
 
+    # linux has no display name and no $DISPLAY environment variable - skip tk test
+    if (-not (($Platform -match "ubuntu") -or ($Platform -match "linux"))) {
+        It "Check if tcl/tk has the same headed and library versions" {
+	    "python ./sources/tcltk.py" | Should -ReturnZeroExitCode
+        }
+    }
+
     if (($Version -ge "3.2.0") -and -not ([semver]"$($Version.Major).$($Version.Minor)" -eq [semver]"3.11" -and $Version.PreReleaseLabel)) {
         It "Check if sqlite3 module is installed" {
             "python ./sources/python-sqlite3.py" | Should -ReturnZeroExitCode
@@ -89,12 +96,4 @@ Describe "Tests" {
             "./dist/simple-test" | Should -ReturnZeroExitCode
         }
     }
-
-    if (($Platform -match "macos") -or ($Platform -match "darwin")) {
-        if ($Version -gt "3.7.12" ) {
-            It "Check if python above 3.7.12 use tcl/tk v8.6" {
-                "python ./sources/tcltk-86.py" | Should -ReturnZeroExitCode
-            }
-        }
-    }
 }
diff --git a/tests/sources/tcltk-86.py b/tests/sources/tcltk.py
similarity index 53%
rename from tests/sources/tcltk-86.py
rename to tests/sources/tcltk.py
index 4ff04bb..292d9e9 100644
--- a/tests/sources/tcltk-86.py
+++ b/tests/sources/tcltk.py
@@ -4,8 +4,7 @@ import _tkinter
 header = _tkinter.TK_VERSION
 lib = tkinter.Tk().getvar('tk_version')
 
-print('header version=' + header)
-print('lib version=' + lib)
-
-if lib != '8.6' or header != '8.6':
+if lib != header:
+  print('header version=' + header)
+  print('lib version=' + lib)
   exit(1)