diff options
Diffstat (limited to 'dev-python/pillow')
-rw-r--r-- | dev-python/pillow/Manifest | 3 | ||||
-rw-r--r-- | dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch | 50 | ||||
-rw-r--r-- | dev-python/pillow/pillow-10.1.0-r1.ebuild (renamed from dev-python/pillow/pillow-10.1.0.ebuild) | 7 |
3 files changed, 58 insertions, 2 deletions
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index dbee6a741f11..0966e8d68c6e 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,5 +1,6 @@ +AUX pillow-10.1.0-olefile-0.47.patch 1456 BLAKE2B de5fda5245b9674f7a695bcde5125eeb326fdfa29c6cca2a7406c12b31af1d8e4b4ef2919c99e2ce8ed08dc6cb441b7728190cce23b7d4e1a384605a584a086b SHA512 3eef1572704eba1fa5047f866c11b563f0c79e04ae1da5f70aa2fb9876dbf21583376326c47d44691732492c092b0c4821fbd18f62de4de9a1970b6e177384dd DIST pillow-10.0.1.gh.tar.gz 50539264 BLAKE2B 83c3bf4abc9c3eab210576dc28d6f8926ce0998ec344e792433afc05190bb248a926902ce7706e3569cd6cbf8deb640cafda86f102166cf6492ec00b66f9392f SHA512 27e2f0d86563c3b7f5a2e0ba2bbe98fc2cb2fa5871d0b6cbb5a0014e9d9eb03dde9969301419d806d1a22cd4881e624465a355ba9bc42b95746226e1f95712a9 DIST pillow-10.1.0.gh.tar.gz 50798274 BLAKE2B a69be8187e7206b50350af399b73b5c43b29c249a4a5a6bb23438dae9967bb84f1d487f52b188811cb3d2e550245f8d5a765668d8d5de1375a84fcd96fc531d9 SHA512 01c97b68d4167d10539a2d29fb82676fb417ee5003f0acd9f602ed13d41b200579497cc0ef0949b2c1549b684f76f2d43895a52abdb1367345d2affd544c5b5a EBUILD pillow-10.0.1.ebuild 3501 BLAKE2B 9f690f40ca87ce944906fd315fa702735587500b2c3948431206803aad95a09895920819eb5a44f39c2b12c01de7400042743e516fbf5c86615c39d62b067d16 SHA512 ae4ddcfdf4e60fe86eb2643f839e3a0d72dcb1e7b2d78ce6a9f476945e81d673d1b2319b09d1f69bfd6d1f27b6ed693355e1fd85536f51d6b2220484f65bdeb5 -EBUILD pillow-10.1.0.ebuild 3501 BLAKE2B 9f690f40ca87ce944906fd315fa702735587500b2c3948431206803aad95a09895920819eb5a44f39c2b12c01de7400042743e516fbf5c86615c39d62b067d16 SHA512 ae4ddcfdf4e60fe86eb2643f839e3a0d72dcb1e7b2d78ce6a9f476945e81d673d1b2319b09d1f69bfd6d1f27b6ed693355e1fd85536f51d6b2220484f65bdeb5 +EBUILD pillow-10.1.0-r1.ebuild 3606 BLAKE2B bcec30251d71e5c9cc439bad1fef9e701721af432a05187165880ee2ba9e776ac6c7208275168e6843727d33987a7482977aacd1d6e7f77b492bd74d9ee10ebd SHA512 4ced9aa36035a8c9865497378df8fead39e50c9d61b8b47fb218031a1ba9f6ea9086d9104b594e75936ef41870e435601ee51d621f61cd1531dc6d99a1ce61cd MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582 diff --git a/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch b/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch new file mode 100644 index 000000000000..e3b6a6473dfc --- /dev/null +++ b/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch @@ -0,0 +1,50 @@ +From 0e523d986858e7c0b4acd45ea1c5a3a639e39b4b Mon Sep 17 00:00:00 2001 +From: Andrew Murray <radarhere@users.noreply.github.com> +Date: Sat, 2 Dec 2023 10:57:16 +1100 +Subject: [PATCH] Fixed closing file pointer with olefile 0.47 + +--- + src/PIL/FpxImagePlugin.py | 1 + + src/PIL/MicImagePlugin.py | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py +index a878cbfd2..3027ef45b 100644 +--- a/src/PIL/FpxImagePlugin.py ++++ b/src/PIL/FpxImagePlugin.py +@@ -227,6 +227,7 @@ class FpxImageFile(ImageFile.ImageFile): + break # isn't really required + + self.stream = stream ++ self._fp = self.fp + self.fp = None + + def load(self): +diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py +index 801318930..e4154902f 100644 +--- a/src/PIL/MicImagePlugin.py ++++ b/src/PIL/MicImagePlugin.py +@@ -66,6 +66,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): + self._n_frames = len(self.images) + self.is_animated = self._n_frames > 1 + ++ self.__fp = self.fp + self.seek(0) + + def seek(self, frame): +@@ -87,10 +88,12 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): + return self.frame + + def close(self): ++ self.__fp.close() + self.ole.close() + super().close() + + def __exit__(self, *args): ++ self.__fp.close() + self.ole.close() + super().__exit__() + +-- +2.43.0 + diff --git a/dev-python/pillow/pillow-10.1.0.ebuild b/dev-python/pillow/pillow-10.1.0-r1.ebuild index 1e25a3391179..0c65cdff5b1c 100644 --- a/dev-python/pillow/pillow-10.1.0.ebuild +++ b/dev-python/pillow/pillow-10.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -70,6 +70,11 @@ EPYTEST_DESELECT=( Tests/test_qt_image_qapplication.py::test_sanity ) +PATCHES=( + # https://github.com/python-pillow/pillow/pull/7594 + "${FILESDIR}/${P}-olefile-0.47.patch" +) + usepil() { usex "${1}" enable disable } |