From b2626c56dedfbd7d6f516e53f2fc392a514a0b31 Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Fri, 2 Oct 2026 09:39:34 +0900
Subject: [PATCH] Drop parking_lot_core git patch and tkinter deps

Comment out the parking_lot_core git patch and use the crates.io
crate. Remove tcl-sys, tk-sys, and the tkinter feature.

Assisted-by: Grok:4.7
---
 Cargo.lock               | 53 +++-------------------------------------
 Cargo.toml               |  5 +---
 crates/stdlib/Cargo.toml |  6 -----
 crates/stdlib/src/lib.rs |  5 ----
 4 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c81a54585..1c6b825c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -281,7 +281,7 @@ version = "0.13.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c0e6249c249b8916c98ebae7bc06216c8dcab3002f32872b4abe642d17063b1"
 dependencies = [
- "bindgen 0.72.1",
+ "bindgen",
  "cc",
  "cmake",
  "dunce",
@@ -332,26 +332,6 @@ version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
-[[package]]
-name = "bindgen"
-version = "0.71.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
-dependencies = [
- "bitflags 2.13.1",
- "cexpr",
- "clang-sys",
- "itertools 0.10.5",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex 1.3.0",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.72.1"
@@ -2811,7 +2791,8 @@ dependencies = [
 [[package]]
 name = "parking_lot_core"
 version = "0.9.12"
-source = "git+https://github.com/youknowone/parking_lot?branch=rustpython#f4ee53a7b803354a8f0a6de2f28e93fc141240bf"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
@@ -4067,8 +4048,6 @@ dependencies = [
  "rustpython-unicode",
  "rustpython-vm",
  "scopeguard",
- "tcl-sys",
- "tk-sys",
  "uuid",
  "webpki-roots",
  "widestring",
@@ -4437,14 +4416,6 @@ dependencies = [
  "sponge-cursor",
 ]
 
-[[package]]
-name = "shared-build"
-version = "0.2.0"
-source = "git+https://github.com/arihant2math/tkinter.git?tag=v0.2.0#198fc35b1f18f4eda401f97a641908f321b1403a"
-dependencies = [
- "bindgen 0.71.1",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -4663,15 +4634,6 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
-[[package]]
-name = "tcl-sys"
-version = "0.2.0"
-source = "git+https://github.com/arihant2math/tkinter.git?tag=v0.2.0#198fc35b1f18f4eda401f97a641908f321b1403a"
-dependencies = [
- "pkg-config",
- "shared-build",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.27.0"
@@ -4803,15 +4765,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
-[[package]]
-name = "tk-sys"
-version = "0.2.0"
-source = "git+https://github.com/arihant2math/tkinter.git?tag=v0.2.0#198fc35b1f18f4eda401f97a641908f321b1403a"
-dependencies = [
- "pkg-config",
- "shared-build",
-]
-
 [[package]]
 name = "toml"
 version = "1.1.2+spec-1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 2511b011d..7e0db0672 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,6 @@ ssl-rustls-aws-lc = ["ssl-rustls", "dep:rustls", "rustls/aws_lc_rs"]
 ssl-rustls-aws-lc-fips = ["ssl-rustls-aws-lc", "rustls/fips"]
 ssl-openssl = ["ssl", "rustpython-stdlib/ssl-openssl"]
 ssl-openssl-vendor = ["ssl-openssl", "rustpython-stdlib/ssl-openssl-vendor"]
-tkinter = ["rustpython-stdlib/tkinter"]
 
 [build-dependencies]
 winresource = "0.1"
@@ -129,7 +128,7 @@ strip = true
 panic = "abort"
 
 [patch.crates-io]
-parking_lot_core = { git = "https://github.com/youknowone/parking_lot", branch = "rustpython" }
+# parking_lot_core = { git = "https://github.com/youknowone/parking_lot", branch = "rustpython" }
 # REDOX START, Uncomment when you want to compile/check with redoxer
 # REDOX END
 
@@ -298,12 +297,10 @@ strum_macros = "0.28"
 syn = "2"
 syn-ext = "0.5.0"
 system-configuration = "0.8.0"
-tcl-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
 textwrap = { version = "0.16.2", default-features = false }
 termios = "0.3.3"
 thiserror = "2.0"
 thin-vec = "0.2.14"
-tk-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
 icu_casemap = "2"
 icu_locale = "2"
 icu_properties = "2"
diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml
index 64e926fb6..26bd045e7 100644
--- a/crates/stdlib/Cargo.toml
+++ b/crates/stdlib/Cargo.toml
@@ -22,7 +22,6 @@ ssl = ["rustpython-host_env/ssl"]
 ssl-rustls = ["__ssl-rustls", "host_env", "rustls/custom-provider"]
 ssl-openssl = ["ssl", "host_env", "openssl", "openssl-sys", "foreign-types-shared", "rustpython-host_env/native-certs"]
 ssl-openssl-vendor = ["ssl-openssl", "openssl/vendored"]
-tkinter = ["dep:tk-sys", "dep:tcl-sys", "dep:widestring"]
 flame-it = ["flame"]
 
 __ssl-rustls = ["ssl", "rustpython-host_env/ssl", "rustpython-host_env/rustls", "rustpython-host_env/native-certs", "rustls", "rustls-pemfile", "x509-parser", "pem-rfc7468", "webpki-roots"]
@@ -71,11 +70,6 @@ constant_time_eq = { workspace = true }
 # compression
 adler32 = { workspace = true }
 
-# tkinter
-tk-sys = { workspace = true, optional = true }
-tcl-sys = { workspace = true, optional = true }
-widestring = { workspace = true, optional = true }
-
 # uuid
 [target.'cfg(not(any(target_os = "ios", target_os = "android", target_os = "windows", target_arch = "wasm32", target_os = "redox")))'.dependencies]
 uuid = { workspace = true, features = ["v1"] }
diff --git a/crates/stdlib/src/lib.rs b/crates/stdlib/src/lib.rs
index bc3350231..0db88f5ff 100644
--- a/crates/stdlib/src/lib.rs
+++ b/crates/stdlib/src/lib.rs
@@ -181,9 +181,6 @@ mod termios;
 ))]
 mod uuid;
 
-#[cfg(all(feature = "host_env", feature = "tkinter"))]
-mod tkinter;
-
 use rustpython_common as common;
 use rustpython_vm as vm;
 
@@ -309,8 +306,6 @@ pub fn stdlib_module_defs(ctx: &Context) -> Vec<&'static builtins::PyModuleDef>
             not(any(target_os = "ios", target_os = "redox"))
         ))]
         termios::module_def(ctx),
-        #[cfg(all(feature = "host_env", feature = "tkinter"))]
-        tkinter::module_def(ctx),
         unicodedata::module_def(ctx),
         #[cfg(all(
             feature = "host_env",