From b51e3592ba6c2e2fd5bea2eca071daaec9f29ba6 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Sun, 21 Dec 2025 21:10:36 +0800
Subject: [PATCH] revert all tk experiments

---
 .../kcpp-build-release-linux-olderpc.yaml     |  1 -
 .../workflows/kcpp-build-release-linux.yaml   |  1 -
 environment.yaml                              |  2 +-
 koboldcpp.sh                                  | 28 -------------------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/.github/workflows/kcpp-build-release-linux-olderpc.yaml b/.github/workflows/kcpp-build-release-linux-olderpc.yaml
index 315e683a5..b3f056858 100644
--- a/.github/workflows/kcpp-build-release-linux-olderpc.yaml
+++ b/.github/workflows/kcpp-build-release-linux-olderpc.yaml
@@ -13,7 +13,6 @@ env:
   NOAVX1: 1
   ARCHES_CU11: 1
   KCPP_CUDA: 11.5.0
-  TRANSPLANT_TK: 1
 
 jobs:
   linux:
diff --git a/.github/workflows/kcpp-build-release-linux.yaml b/.github/workflows/kcpp-build-release-linux.yaml
index 5a68a4bdb..decd67eeb 100644
--- a/.github/workflows/kcpp-build-release-linux.yaml
+++ b/.github/workflows/kcpp-build-release-linux.yaml
@@ -12,7 +12,6 @@ env:
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   KCPP_CUDA: 12.1.0
   ARCHES_CU12: 1
-  TRANSPLANT_TK: 1
 
 jobs:
   linux:
diff --git a/environment.yaml b/environment.yaml
index e3c930a45..bcc904e25 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -19,7 +19,7 @@ dependencies:
   - libcblas
   - ocl-icd-system
   - libvulkan-loader
-  - tk
+  - tk=*=xft_*
   - psutil
   - jinja2
   - pip:
diff --git a/koboldcpp.sh b/koboldcpp.sh
index 3e16f21b5..a40f6952b 100755
--- a/koboldcpp.sh
+++ b/koboldcpp.sh
@@ -27,34 +27,6 @@ fi
 KCPP_CUDA=$(<conda/envs/linux/cudaver)
 KCPP_CUDAAPPEND=-cuda${KCPP_CUDA//.}$KCPP_APPEND
 
-if [ -n "$TRANSPLANT_TK" ]; then
-	echo Check system tk and python
-	python3 --version
-	ldd "/usr/lib/x86_64-linux-gnu/libtk8.6.so"
-	python3 - <<'EOF'
-import tkinter
-print("System TK version:", tkinter.Tcl().call("info", "patchlevel"))
-EOF
-	echo Attempting to use a transplanted tkinter from ubuntu-24.04.3 to fix fontconfig issues
-	bin/micromamba run -r conda -p conda/envs/linux python - <<'EOF'
-import tkinter
-print("Before Tk version:", tkinter.Tcl().call("info", "patchlevel"))
-EOF
-	ldd "conda/envs/linux/lib/libtk8.6.so"
-	rm -f "conda/envs/linux/lib/libtcl8.6.so"
-	rm -f "conda/envs/linux/lib/libtk8.6.so"
-	curl -L https://github.com/LostRuins/koboldcpp/releases/download/cuda11_cublas_libraries/libtcl8.6.so --output conda/envs/linux/lib/libtcl8.6.so
-	curl -L https://github.com/LostRuins/koboldcpp/releases/download/cuda11_cublas_libraries/libtk8.6.so --output conda/envs/linux/lib/libtk8.6.so
-	chmod 755 "conda/envs/linux/lib/libtcl8.6.so" "conda/envs/linux/lib/libtk8.6.so"
-	ls -lah conda/envs/linux/lib
-	bin/micromamba run -r conda -p conda/envs/linux python - <<'EOF'
-import tkinter
-print("After Tk version:", tkinter.Tcl().call("info", "patchlevel"))
-EOF
-	ldd "conda/envs/linux/lib/libtk8.6.so"
-	echo Tkinter Transplant completed
-fi
-
 LLAMA_NOAVX1_FLAG=""
 LLAMA_NOAVX2_FLAG=""
 ARCHES_FLAG=""