commit 03f5f82a71a9edde119d01667bbe9859bfc7cde2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Mar 16 15:52:38 2025 +0100
- up to 11.1.0, needs numpy-devel for tests
python3-pillow-subpackage.patch | 34 ----------------------------------
python3-pillow.spec | 16 ++++++----------
python3.13.patch | 15 ---------------
3 files changed, 6 insertions(+), 59 deletions(-)
---
diff --git a/python3-pillow.spec b/python3-pillow.spec
index 4c2336a..2704e2c 100644
--- a/python3-pillow.spec
+++ b/python3-pillow.spec
@@ -11,17 +11,15 @@
Summary: Python 3 image processing library
Summary(pl.UTF-8): Biblioteka do przetwarzania obrazów dla Pythona 3
Name: python3-%{module}
-Version: 8.4.0
-Release: 5
+Version: 11.1.0
+Release: 1
# License: see http://www.pythonware.com/products/pil/license.htm
License: MIT
Group: Libraries/Python
#Source0Download: https://pypi.org/simple/pillow/
-Source0: https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-%{version}.tar.gz
-# Source0-md5: 7a1eb5a250c7ccbd549a89e16404f09f
-Patch0: %{name}-subpackage.patch
+Source0: https://files.pythonhosted.org/packages/source/P/Pillow/pillow-%{version}.tar.gz
+# Source0-md5: ede5dce0bbbeff02099e2e297919a82a
Patch1: x32.patch
-Patch2: python3.13.patch
URL: https://python-pillow.org/
BuildRequires: freetype-devel >= 2
BuildRequires: ghostscript
@@ -36,7 +34,7 @@ BuildRequires: openjpeg2-devel >= 2
BuildRequires: pkgconfig
BuildRequires: python3-cffi
BuildRequires: python3-devel >= 1:3.6
-BuildRequires: python3-numpy
+BuildRequires: python3-numpy-devel
BuildRequires: python3-setuptools
BuildRequires: python3-tkinter
BuildRequires: rpmbuild(macros) >= 1.752
@@ -137,12 +135,10 @@ PIL image wrapper for Qt.
Obudowanie obrazów PIL dla Qt.
%prep
-%setup -q -n Pillow-%{version}
-%patch -P 0 -p1
+%setup -q -n pillow-%{version}
%if "%{_lib}" == "libx32"
%patch -P 1 -p1
%endif
-%patch -P 2 -p1
%build
%py3_build
diff --git a/python3-pillow-subpackage.patch b/python3-pillow-subpackage.patch
deleted file mode 100644
index 814f4b7..0000000
--- a/python3-pillow-subpackage.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urNp -x '*.orig' Pillow-8.1.0.org/src/PIL/__init__.py Pillow-8.1.0/src/PIL/__init__.py
---- Pillow-8.1.0.org/src/PIL/__init__.py 2021-01-02 20:54:29.000000000 +0100
-+++ Pillow-8.1.0/src/PIL/__init__.py 2021-02-28 11:37:59.771120362 +0100
-@@ -82,6 +82,13 @@ else:
- del _version
-
-
-+def _get_optional_plugins():
-+ try:
-+ import SpiderImagePlugin
-+ return ['SpiderImagePlugin']
-+ except:
-+ return []
-+
- _plugins = [
- "BlpImagePlugin",
- "BmpImagePlugin",
-@@ -119,7 +126,6 @@ _plugins = [
- "PpmImagePlugin",
- "PsdImagePlugin",
- "SgiImagePlugin",
-- "SpiderImagePlugin",
- "SunImagePlugin",
- "TgaImagePlugin",
- "TiffImagePlugin",
-@@ -128,7 +134,7 @@ _plugins = [
- "XbmImagePlugin",
- "XpmImagePlugin",
- "XVThumbImagePlugin",
--]
-+] + _get_optional_plugins()
-
-
- class UnidentifiedImageError(OSError):
diff --git a/python3.13.patch b/python3.13.patch
deleted file mode 100644
index a97d8c2..0000000
--- a/python3.13.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Pillow-8.4.0/setup.py.orig 2021-10-15 08:26:23.000000000 +0200
-+++ Pillow-8.4.0/setup.py 2025-03-15 00:46:27.183061465 +0100
-@@ -21,9 +21,10 @@
-
- def get_version():
- version_file = "src/PIL/_version.py"
-+ vars = dict()
- with open(version_file) as f:
-- exec(compile(f.read(), version_file, "exec"))
-- return locals()["__version__"]
-+ exec(compile(f.read(), version_file, "exec"), locals=vars)
-+ return vars["__version__"]
-
-
- NAME = "Pillow"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python3-pillow.git/commitdiff/03f5f82a71a9edde119d01667bbe9859bfc7cde2