From 023d017da00f8adb8de86719509145c405369ac8 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 22 Apr 2024 18:26:20 +1000
Subject: [PATCH 1/4] Deprecate libtiff < 4

---
 docs/deprecations.rst      | 8 ++++++++
 src/PIL/TiffImagePlugin.py | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/docs/deprecations.rst b/docs/deprecations.rst
index c3d1ba4f028..91bc150b342 100644
--- a/docs/deprecations.rst
+++ b/docs/deprecations.rst
@@ -100,6 +100,14 @@ ImageMath eval()
 ``ImageMath.eval()`` has been deprecated. Use :py:meth:`~PIL.ImageMath.lambda_eval` or
 :py:meth:`~PIL.ImageMath.unsafe_eval` instead.
 
+Support for libtiff earlier than 4
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. deprecated:: 10.4.0
+
+Support for libtiff earlier than 4 has been deprecated. Upgrade to a newer version of
+libtiff instead.
+
 Removed features
 ----------------
 
diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
index 10ac9ea3a2a..13bcf5d8606 100644
--- a/src/PIL/TiffImagePlugin.py
+++ b/src/PIL/TiffImagePlugin.py
@@ -56,6 +56,7 @@
 from ._binary import i16be as i16
 from ._binary import i32be as i32
 from ._binary import o8
+from ._deprecate import deprecate
 from .TiffTags import TYPES
 
 logger = logging.getLogger(__name__)
@@ -276,6 +277,9 @@
     b"II\x2B\x00",  # BigTIFF with little-endian byte order
 ]
 
+if not getattr(Image.core, "libtiff_support_custom_tags", True):
+    deprecate("Support for libtiff earlier than 4", 12)
+
 
 def _accept(prefix: bytes) -> bool:
     return prefix[:4] in PREFIXES

From e144e418791eb205765b74da793487a038675984 Mon Sep 17 00:00:00 2001
From: Andrew Murray <3112309+radarhere@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:14:23 +1000
Subject: [PATCH 2/4] Updated wording

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 docs/deprecations.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/deprecations.rst b/docs/deprecations.rst
index 91bc150b342..7882ec5ee2b 100644
--- a/docs/deprecations.rst
+++ b/docs/deprecations.rst
@@ -100,13 +100,13 @@ ImageMath eval()
 ``ImageMath.eval()`` has been deprecated. Use :py:meth:`~PIL.ImageMath.lambda_eval` or
 :py:meth:`~PIL.ImageMath.unsafe_eval` instead.
 
-Support for libtiff earlier than 4
+Support for LibTIFF earlier than 4
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. deprecated:: 10.4.0
 
-Support for libtiff earlier than 4 has been deprecated. Upgrade to a newer version of
-libtiff instead.
+Support for LibTIFF earlier than version 4 has been deprecated.
+Upgrade to a newer version of LibTIFF instead.
 
 Removed features
 ----------------

From 2e1d2b2029eefe7255c1c11f81a53f862a7861e1 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:15:38 +1000
Subject: [PATCH 3/4] Updated deprecation message

---
 src/PIL/TiffImagePlugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
index 13bcf5d8606..82ac47647fa 100644
--- a/src/PIL/TiffImagePlugin.py
+++ b/src/PIL/TiffImagePlugin.py
@@ -278,7 +278,7 @@
 ]
 
 if not getattr(Image.core, "libtiff_support_custom_tags", True):
-    deprecate("Support for libtiff earlier than 4", 12)
+    deprecate("Support for LibTIFF earlier than version 4", 12)
 
 
 def _accept(prefix: bytes) -> bool:

From 5a0a288dd048097d2ffa62fb2d5a24cf5727bbb9 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:16:55 +1000
Subject: [PATCH 4/4] Added release notes

---
 docs/releasenotes/10.4.0.rst | 54 ++++++++++++++++++++++++++++++++++++
 docs/releasenotes/index.rst  |  1 +
 2 files changed, 55 insertions(+)
 create mode 100644 docs/releasenotes/10.4.0.rst

diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst
new file mode 100644
index 00000000000..0c2926732e4
--- /dev/null
+++ b/docs/releasenotes/10.4.0.rst
@@ -0,0 +1,54 @@
+10.4.0
+------
+
+Security
+========
+
+TODO
+^^^^
+
+TODO
+
+:cve:`YYYY-XXXXX`: TODO
+^^^^^^^^^^^^^^^^^^^^^^^
+
+TODO
+
+Backwards Incompatible Changes
+==============================
+
+TODO
+^^^^
+
+Deprecations
+============
+
+Support for LibTIFF earlier than 4
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Support for LibTIFF earlier than version 4 has been deprecated.
+Upgrade to a newer version of LibTIFF instead.
+
+API Changes
+===========
+
+TODO
+^^^^
+
+TODO
+
+API Additions
+=============
+
+TODO
+^^^^
+
+TODO
+
+Other Changes
+=============
+
+TODO
+^^^^
+
+TODO
diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst
index 089d44b9075..6ee5fb6c8f4 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
 
+  10.4.0
   10.3.0
   10.2.0
   10.1.0