From 1b15f481f6f607d61ba03c010104d5f7dffdd4dd Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 26 Jan 2021 08:02:16 +1100
Subject: [PATCH] Deprecate Tk/Tcl 8.4, to be removed in Pillow 10 (2023-01-02)

---
 docs/deprecations.rst       |  8 ++++++++
 docs/releasenotes/8.2.0.rst | 40 +++++++++++++++++++++++++++++++++++++
 docs/releasenotes/index.rst |  1 +
 src/PIL/_tkinter_finder.py  | 10 ++++++++++
 4 files changed, 59 insertions(+)
 create mode 100644 docs/releasenotes/8.2.0.rst

diff --git a/docs/deprecations.rst b/docs/deprecations.rst
index 44aa2a7953f..fd2f5620e44 100644
--- a/docs/deprecations.rst
+++ b/docs/deprecations.rst
@@ -25,6 +25,14 @@ vulnerability introduced in FreeType 2.6 (:cve:`CVE-2020-15999`).
 
 .. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/
 
+Tk/Tcl 8.4
+~~~~~~~~~~
+
+.. deprecated:: 8.2.0
+
+Support for Tk/Tcl 8.4 is deprecated and will be removed in Pillow 10.0.0 (2023-01-02),
+when Tk/Tcl 8.5 will be the minimum supported.
+
 Image.show command parameter
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/releasenotes/8.2.0.rst b/docs/releasenotes/8.2.0.rst
new file mode 100644
index 00000000000..8ddbc7f542f
--- /dev/null
+++ b/docs/releasenotes/8.2.0.rst
@@ -0,0 +1,40 @@
+8.2.0
+-----
+
+Deprecations
+============
+
+Tk/Tcl 8.4
+^^^^^^^^^^
+
+Support for Tk/Tcl 8.4 is deprecated and will be removed in Pillow 10.0.0 (2023-01-02),
+when Tk/Tcl 8.5 will be the minimum supported.
+
+API Changes
+===========
+
+TODO
+^^^^
+
+TODO
+
+API Additions
+=============
+
+TODO
+^^^^
+
+TODO
+
+Security
+========
+
+TODO
+
+Other Changes
+=============
+
+TODO
+^^^^
+
+TODO
diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst
index cd73de81488..0930768e7ca 100644
--- a/docs/releasenotes/index.rst
+++ b/docs/releasenotes/index.rst
@@ -14,6 +14,7 @@ expected to be backported to earlier versions.
 .. toctree::
   :maxdepth: 2
 
+  8.2.0
   8.1.0
   8.0.1
   8.0.0
diff --git a/src/PIL/_tkinter_finder.py b/src/PIL/_tkinter_finder.py
index 7018a1b79a9..4de96af6b5e 100644
--- a/src/PIL/_tkinter_finder.py
+++ b/src/PIL/_tkinter_finder.py
@@ -1,9 +1,19 @@
 """ Find compiled module linking to Tcl / Tk libraries
 """
 import sys
+import tkinter
+import warnings
 from tkinter import _tkinter as tk
 
 if hasattr(sys, "pypy_find_executable"):
     TKINTER_LIB = tk.tklib_cffi.__file__
 else:
     TKINTER_LIB = tk.__file__
+
+if tkinter.TkVersion == 8.4:
+    warnings.warn(
+        "Support for Tk/Tcl 8.4 is deprecated and will be removed"
+        " in Pillow 10 (2023-01-02). Please upgrade to Tk/Tcl 8.5 "
+        "or newer.",
+        DeprecationWarning,
+    )