Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/python-pillow.git#b833376a9cd288710fb03c89716b30cee184e99f
This commit is contained in:
DistroBaker
parent
5689553ab0
commit
a72aa4b4e6
2
.gitignore
vendored
2
.gitignore
vendored
@ -53,3 +53,5 @@
|
||||
/Pillow-8.0.0.tar.gz
|
||||
/Pillow-8.0.1.tar.gz
|
||||
/Pillow-8.1.0.tar.gz
|
||||
/Pillow-8.1.1.tar.gz
|
||||
/Pillow-8.1.2.tar.gz
|
||||
|
||||
@ -1,104 +0,0 @@
|
||||
From cf190a3c2f166cf0a7dd004fee4b242ea29bf1f4 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Murray <radarhere@users.noreply.github.com>
|
||||
Date: Sat, 9 Jan 2021 11:33:26 +1100
|
||||
Subject: [PATCH 2/2] PyModule_AddObject fix for Python 3.10
|
||||
|
||||
---
|
||||
src/_imaging.c | 21 +++++++++++++++------
|
||||
src/_webp.c | 14 ++++++++++----
|
||||
2 files changed, 25 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/_imaging.c b/src/_imaging.c
|
||||
index a8741f6ad3..01dd22486e 100644
|
||||
--- a/src/_imaging.c
|
||||
+++ b/src/_imaging.c
|
||||
@@ -4172,26 +4172,32 @@ setup_module(PyObject* m) {
|
||||
}
|
||||
#endif
|
||||
|
||||
+ PyObject *have_libjpegturbo;
|
||||
#ifdef LIBJPEG_TURBO_VERSION
|
||||
- PyModule_AddObject(m, "HAVE_LIBJPEGTURBO", Py_True);
|
||||
+ have_libjpegturbo = Py_True;
|
||||
#define tostr1(a) #a
|
||||
#define tostr(a) tostr1(a)
|
||||
PyDict_SetItemString(d, "libjpeg_turbo_version", PyUnicode_FromString(tostr(LIBJPEG_TURBO_VERSION)));
|
||||
#undef tostr
|
||||
#undef tostr1
|
||||
#else
|
||||
- PyModule_AddObject(m, "HAVE_LIBJPEGTURBO", Py_False);
|
||||
-#endif
|
||||
+ have_libjpegturbo = Py_False;
|
||||
+ #endif
|
||||
+ Py_INCREF(have_libjpegturbo);
|
||||
+ PyModule_AddObject(m, "HAVE_LIBJPEGTURBO", have_libjpegturbo);
|
||||
|
||||
+ PyObject *have_libimagequant;
|
||||
#ifdef HAVE_LIBIMAGEQUANT
|
||||
- PyModule_AddObject(m, "HAVE_LIBIMAGEQUANT", Py_True);
|
||||
+ have_libimagequant = Py_True;
|
||||
{
|
||||
extern const char* ImagingImageQuantVersion(void);
|
||||
PyDict_SetItemString(d, "imagequant_version", PyUnicode_FromString(ImagingImageQuantVersion()));
|
||||
}
|
||||
#else
|
||||
- PyModule_AddObject(m, "HAVE_LIBIMAGEQUANT", Py_False);
|
||||
+ have_libimagequant = Py_False;
|
||||
#endif
|
||||
+ Py_INCREF(have_libimagequant);
|
||||
+ PyModule_AddObject(m, "HAVE_LIBIMAGEQUANT", have_libimagequant);
|
||||
|
||||
#ifdef HAVE_LIBZ
|
||||
/* zip encoding strategies */
|
||||
@@ -4222,11 +4228,14 @@ setup_module(PyObject* m) {
|
||||
}
|
||||
#endif
|
||||
|
||||
+ PyObject *have_xcb;
|
||||
#ifdef HAVE_XCB
|
||||
- PyModule_AddObject(m, "HAVE_XCB", Py_True);
|
||||
+ have_xcb = Py_True;
|
||||
#else
|
||||
- PyModule_AddObject(m, "HAVE_XCB", Py_False);
|
||||
+ have_xcb = Py_False;
|
||||
#endif
|
||||
+ Py_INCREF(have_xcb);
|
||||
+ PyModule_AddObject(m, "HAVE_XCB", have_xcb);
|
||||
|
||||
PyDict_SetItemString(d, "PILLOW_VERSION", PyUnicode_FromString(version));
|
||||
|
||||
diff --git a/src/_webp.c b/src/_webp.c
|
||||
index c7875fa368..4d51d99dfa 100644
|
||||
--- a/src/_webp.c
|
||||
+++ b/src/_webp.c
|
||||
@@ -861,19 +861,25 @@ static PyMethodDef webpMethods[] =
|
||||
};
|
||||
|
||||
void addMuxFlagToModule(PyObject* m) {
|
||||
+ PyObject *have_webpmux;
|
||||
#ifdef HAVE_WEBPMUX
|
||||
- PyModule_AddObject(m, "HAVE_WEBPMUX", Py_True);
|
||||
+ have_webpmux = Py_True;
|
||||
#else
|
||||
- PyModule_AddObject(m, "HAVE_WEBPMUX", Py_False);
|
||||
+ have_webpmux = Py_False;
|
||||
#endif
|
||||
+ Py_INCREF(have_webpmux);
|
||||
+ PyModule_AddObject(m, "HAVE_WEBPMUX", have_webpmux);
|
||||
}
|
||||
|
||||
void addAnimFlagToModule(PyObject* m) {
|
||||
+ PyObject *have_webpanim;
|
||||
#ifdef HAVE_WEBPANIM
|
||||
- PyModule_AddObject(m, "HAVE_WEBPANIM", Py_True);
|
||||
+ have_webpanim = Py_True;
|
||||
#else
|
||||
- PyModule_AddObject(m, "HAVE_WEBPANIM", Py_False);
|
||||
+ have_webpanim = Py_False;
|
||||
#endif
|
||||
+ Py_INCREF(have_webpanim);
|
||||
+ PyModule_AddObject(m, "HAVE_WEBPANIM", have_webpanim);
|
||||
}
|
||||
|
||||
void addTransparencyFlagToModule(PyObject* m) {
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
%global with_docs 1
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 8.1.0
|
||||
Release: 3%{?dist}
|
||||
Version: 8.1.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Python image processing library
|
||||
|
||||
# License: see http://www.pythonware.com/products/pil/license.htm
|
||||
@ -20,9 +20,6 @@ Source0: https://github.com/python-pillow/Pillow/archive/%{version}/Pillo
|
||||
Patch0: python-pillow_spinxwarn.patch
|
||||
# Drop sphinx-issues requirement, it's not packaged for Fedora
|
||||
Patch1: python-pillow_sphinx-issues.patch
|
||||
# PyModule_AddObject fix for Python 3.10
|
||||
# https://github.com/python-pillow/Pillow/pull/5194
|
||||
Patch2: 0001-PyModule_AddObject-fix-for-Python-3.10.patch
|
||||
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: gcc
|
||||
@ -192,6 +189,12 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Mar 06 2021 Sandro Mani <manisandro@gmail.com> - 8.1.2-1
|
||||
- Update to 8.1.2
|
||||
|
||||
* Tue Mar 02 2021 Sandro Mani <manisandro@gmail.com> - 8.1.1-1
|
||||
- Update to 8.1.1
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -rupN Pillow-8.1.0/docs/conf.py Pillow-8.1.0-new/docs/conf.py
|
||||
--- Pillow-8.1.0/docs/conf.py 2021-01-02 12:39:02.000000000 +0100
|
||||
+++ Pillow-8.1.0-new/docs/conf.py 2021-01-03 11:03:45.488353823 +0100
|
||||
diff -rupN --no-dereference Pillow-8.1.2/docs/conf.py Pillow-8.1.2-new/docs/conf.py
|
||||
--- Pillow-8.1.2/docs/conf.py 2021-03-06 03:38:55.000000000 +0100
|
||||
+++ Pillow-8.1.2-new/docs/conf.py 2021-03-06 11:02:15.818978346 +0100
|
||||
@@ -32,7 +32,6 @@ extensions = [
|
||||
"sphinx.ext.autodoc",
|
||||
"sphinx.ext.intersphinx",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -rupN --no-dereference Pillow-8.1.0/docs/Makefile Pillow-8.1.0-new/docs/Makefile
|
||||
--- Pillow-8.1.0/docs/Makefile 2021-01-02 12:39:02.000000000 +0100
|
||||
+++ Pillow-8.1.0-new/docs/Makefile 2021-01-03 10:55:47.317076044 +0100
|
||||
diff -rupN --no-dereference Pillow-8.1.2/docs/Makefile Pillow-8.1.2-new/docs/Makefile
|
||||
--- Pillow-8.1.2/docs/Makefile 2021-03-06 03:38:55.000000000 +0100
|
||||
+++ Pillow-8.1.2-new/docs/Makefile 2021-03-06 11:02:15.734978352 +0100
|
||||
@@ -42,7 +42,7 @@ clean:
|
||||
-rm -rf $(BUILDDIR)/*
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (Pillow-8.1.0.tar.gz) = 1014271d29e98c465e6882ed3f2f915f8955f5ada2a762c671a1f79389b25576ead2d144c6eaf42b4777f14438d15979d78d34dc32d984fd7defb53f0d209957
|
||||
SHA512 (Pillow-8.1.2.tar.gz) = 32ffedf8cc8f2c21c241f41938d0521626ea05206d1a762305ac38abedecdf9bc8a6e5e2ded7565340e54797a4395acefb3b4d939ebdde8fc9583a1998bae34d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user