From 6335f8b0fba959cc4a1dc3873601efa59f90d73b Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Fri, 5 Jan 2024 09:00:38 +0100
Subject: [PATCH] upgpkg: python-pydicom 2.4.4-1

upstream release

Implement patch from https://github.com/pydicom/pydicom/pull/1908 to
deal with newer Pillow version in arch repos
---
 python-pydicom/.SRCINFO          |  8 +++++---
 python-pydicom/PKGBUILD          | 16 +++++++++++++---
 python-pydicom/pillow-10.1.patch | 16 ++++++++++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 python-pydicom/pillow-10.1.patch

diff --git a/python-pydicom/.SRCINFO b/python-pydicom/.SRCINFO
index b576e0b..8d4cb7b 100644
--- a/python-pydicom/.SRCINFO
+++ b/python-pydicom/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 2.4.3
+	pkgver = 2.4.4
 	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
@@ -15,7 +15,9 @@ pkgbase = python-pydicom
 	optdepends = python-pylibjpeg: for working with compressed JPEG images
 	optdepends = python-pylibjpeg-openjpeg: for working with compressed JPEG-LS or JPEG 2000 images
 	optdepends = python-pylibjpeg-rle: for working with compressed RLE images
-	source = python-pydicom-2.4.3.tar.gz::https://github.com/pydicom/pydicom/archive/v2.4.3.tar.gz
-	md5sums = 699086918b267894f303d101b833406a
+	source = python-pydicom-2.4.4.tar.gz::https://github.com/pydicom/pydicom/archive/v2.4.4.tar.gz
+	source = pillow-10.1.patch
+	md5sums = 748bfd7ad12373675c9df4e088f38dd1
+	md5sums = 837949b3e4505c3fee9c43e8d5665251
 
 pkgname = python-pydicom
diff --git a/python-pydicom/PKGBUILD b/python-pydicom/PKGBUILD
index ba3897b..100ac21 100644
--- a/python-pydicom/PKGBUILD
+++ b/python-pydicom/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=python-pydicom
-pkgver=2.4.3
+pkgver=2.4.4
 pkgrel=1
 pkgdesc="Pure python package for working with DICOM files"
 arch=("any")
@@ -18,8 +18,18 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pylibjpeg-rle: for working with compressed RLE images'
             )
 checkdepends=('python-pytest')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
-md5sums=('699086918b267894f303d101b833406a')
+source=(
+"$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz"
+"pillow-10.1.patch"
+)
+md5sums=('748bfd7ad12373675c9df4e088f38dd1'
+         '837949b3e4505c3fee9c43e8d5665251')
+
+prepare()
+{
+	cd "$srcdir/pydicom-$pkgver"
+	patch --forward --strip=1 --input="$srcdir/pillow-10.1.patch"
+}
 
 build()
 {
diff --git a/python-pydicom/pillow-10.1.patch b/python-pydicom/pillow-10.1.patch
new file mode 100644
index 0000000..54a687e
--- /dev/null
+++ b/python-pydicom/pillow-10.1.patch
@@ -0,0 +1,16 @@
+diff --git a/pydicom/pixel_data_handlers/pillow_handler.py b/pydicom/pixel_data_handlers/pillow_handler.py
+index ff781025d..adcab9c80 100644
+--- a/pydicom/pixel_data_handlers/pillow_handler.py
++++ b/pydicom/pixel_data_handlers/pillow_handler.py
+@@ -129,7 +129,10 @@ def _decompress_single_frame(
+                 image.tile[0][2],
+                 (color_mode, ''),
+             )]
+-            image.mode = color_mode
++            if hasattr(image, "_mode"):
++                image._mode = color_mode
++            else:
++                image.mode = color_mode
+             image.rawmode = color_mode
+     return image
+