From 7c3294c3e901e2ccc51405bcf525acc802823f5a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Jul 2023 08:45:26 +0200 Subject: [PATCH] Update to 10.0.0 --- .gitignore | 1 + pillow_mingw.patch | 132 +++++++++++++++++++++++++++++++++++++++------ python-pillow.spec | 7 ++- sources | 2 +- 4 files changed, 124 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index bd0748c..719267b 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /Pillow-9.3.0.tar.gz /Pillow-9.4.0.tar.gz /Pillow-9.5.0.tar.gz +/Pillow-10.0.0.tar.gz diff --git a/pillow_mingw.patch b/pillow_mingw.patch index e126913..2878e01 100644 --- a/pillow_mingw.patch +++ b/pillow_mingw.patch @@ -1,16 +1,16 @@ -diff -rupN --no-dereference Pillow-9.5.0/setup.py Pillow-9.5.0-new/setup.py ---- Pillow-9.5.0/setup.py 2023-04-01 09:49:41.000000000 +0200 -+++ Pillow-9.5.0-new/setup.py 2023-04-03 09:25:21.948393861 +0200 -@@ -135,7 +135,7 @@ class RequiredDependencyException(Except +diff -rupN Pillow-10.0.0/setup.py Pillow-10.0.0-new/setup.py +--- Pillow-10.0.0/setup.py 2023-07-01 14:08:11.000000000 +0200 ++++ Pillow-10.0.0-new/setup.py 2023-07-05 20:54:06.603404501 +0200 +@@ -136,7 +136,7 @@ class RequiredDependencyException(Except pass -PLATFORM_MINGW = os.name == "nt" and "GCC" in sys.version +PLATFORM_MINGW = "mingw32" in os.getenv("CC", "") - PLATFORM_PYPY = hasattr(sys, "pypy_version_info") -@@ -504,7 +504,7 @@ class pil_build_ext(build_ext): + def _dbg(s, tp=None): +@@ -509,7 +509,7 @@ class pil_build_ext(build_ext): # # add platform directories @@ -19,7 +19,7 @@ diff -rupN --no-dereference Pillow-9.5.0/setup.py Pillow-9.5.0-new/setup.py pass elif sys.platform == "cygwin": -@@ -594,7 +594,7 @@ class pil_build_ext(build_ext): +@@ -600,7 +600,7 @@ class pil_build_ext(build_ext): # FIXME: check /opt/stuff directories here? # standard locations @@ -28,7 +28,7 @@ diff -rupN --no-dereference Pillow-9.5.0/setup.py Pillow-9.5.0-new/setup.py _add_directory(library_dirs, "/usr/local/lib") _add_directory(include_dirs, "/usr/local/include") -@@ -840,7 +840,7 @@ class pil_build_ext(build_ext): +@@ -842,7 +842,7 @@ class pil_build_ext(build_ext): if feature.xcb: libs.append(feature.xcb) defs.append(("HAVE_XCB", None)) @@ -37,7 +37,7 @@ diff -rupN --no-dereference Pillow-9.5.0/setup.py Pillow-9.5.0-new/setup.py libs.extend(["kernel32", "user32", "gdi32"]) if struct.unpack("h", b"\0\1")[0] == 1: defs.append(("WORDS_BIGENDIAN", None)) -@@ -862,6 +862,8 @@ class pil_build_ext(build_ext): +@@ -857,6 +857,8 @@ class pil_build_ext(build_ext): if feature.freetype: srcs = [] libs = ["freetype"] @@ -46,7 +46,7 @@ diff -rupN --no-dereference Pillow-9.5.0/setup.py Pillow-9.5.0-new/setup.py defs = [] if feature.raqm: if not feature.want_vendor("raqm"): # using system Raqm -@@ -884,7 +886,7 @@ class pil_build_ext(build_ext): +@@ -879,7 +881,7 @@ class pil_build_ext(build_ext): if feature.lcms: extra = [] @@ -55,7 +55,7 @@ diff -rupN --no-dereference Pillow-9.5.0/setup.py Pillow-9.5.0-new/setup.py extra.extend(["user32", "gdi32"]) self._update_extension("PIL._imagingcms", [feature.lcms] + extra) else: -@@ -903,7 +905,7 @@ class pil_build_ext(build_ext): +@@ -898,7 +900,7 @@ class pil_build_ext(build_ext): else: self._remove_extension("PIL._webp") @@ -64,11 +64,11 @@ diff -rupN --no-dereference Pillow-9.5.0/setup.py Pillow-9.5.0-new/setup.py self._update_extension("PIL._imagingtk", tk_libs) build_ext.build_extensions(self) -diff -rupN --no-dereference Pillow-9.5.0/src/libImaging/ImPlatform.h Pillow-9.5.0-new/src/libImaging/ImPlatform.h ---- Pillow-9.5.0/src/libImaging/ImPlatform.h 2023-04-01 09:49:41.000000000 +0200 -+++ Pillow-9.5.0-new/src/libImaging/ImPlatform.h 2023-04-03 09:25:21.949393602 +0200 +diff -rupN Pillow-10.0.0/src/libImaging/ImPlatform.h Pillow-10.0.0-new/src/libImaging/ImPlatform.h +--- Pillow-10.0.0/src/libImaging/ImPlatform.h 2023-07-01 14:08:11.000000000 +0200 ++++ Pillow-10.0.0-new/src/libImaging/ImPlatform.h 2023-07-05 20:05:24.129483278 +0200 @@ -28,7 +28,7 @@ - #if defined(_WIN32) || defined(__CYGWIN__) + #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ #define WIN32_LEAN_AND_MEAN -#include @@ -76,3 +76,105 @@ diff -rupN --no-dereference Pillow-9.5.0/src/libImaging/ImPlatform.h Pillow-9.5. #ifdef __CYGWIN__ #undef _WIN64 +diff -rupN Pillow-10.0.0/src/libImaging/ImPlatform.h.orig Pillow-10.0.0-new/src/libImaging/ImPlatform.h.orig +--- Pillow-10.0.0/src/libImaging/ImPlatform.h.orig 1970-01-01 01:00:00.000000000 +0100 ++++ Pillow-10.0.0-new/src/libImaging/ImPlatform.h.orig 2023-07-01 14:08:11.000000000 +0200 +@@ -0,0 +1,98 @@ ++/* ++ * The Python Imaging Library ++ * $Id$ ++ * ++ * platform declarations for the imaging core library ++ * ++ * Copyright (c) Fredrik Lundh 1995-2003. ++ */ ++ ++#include "Python.h" ++ ++/* Check that we have an ANSI compliant compiler */ ++#ifndef HAVE_PROTOTYPES ++#error Sorry, this library requires support for ANSI prototypes. ++#endif ++#ifndef STDC_HEADERS ++#error Sorry, this library requires ANSI header files. ++#endif ++ ++#if defined(PIL_NO_INLINE) ++#define inline ++#else ++#if defined(_MSC_VER) && !defined(__GNUC__) ++#define inline __inline ++#endif ++#endif ++ ++#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */ ++ ++#define WIN32_LEAN_AND_MEAN ++#include ++ ++#ifdef __CYGWIN__ ++#undef _WIN64 ++#undef _WIN32 ++#undef __WIN32__ ++#undef WIN32 ++#endif ++ ++#else /* not WIN */ ++/* For System that are not Windows, we'll need to define these. */ ++/* We have to define them instead of using typedef because the JPEG lib also ++ defines their own types with the same names, so we need to be able to undef ++ ours before including the JPEG code. */ ++ ++#if __STDC_VERSION__ >= 199901L /* C99+ */ ++ ++#include ++ ++#define INT8 int8_t ++#define UINT8 uint8_t ++#define INT16 int16_t ++#define UINT16 uint16_t ++#define INT32 int32_t ++#define UINT32 uint32_t ++ ++#else /* < C99 */ ++ ++#define INT8 signed char ++ ++#if SIZEOF_SHORT == 2 ++#define INT16 short ++#elif SIZEOF_INT == 2 ++#define INT16 int ++#else ++#error Cannot find required 16-bit integer type ++#endif ++ ++#if SIZEOF_SHORT == 4 ++#define INT32 short ++#elif SIZEOF_INT == 4 ++#define INT32 int ++#elif SIZEOF_LONG == 4 ++#define INT32 long ++#else ++#error Cannot find required 32-bit integer type ++#endif ++ ++#define UINT8 unsigned char ++#define UINT16 unsigned INT16 ++#define UINT32 unsigned INT32 ++ ++#endif /* < C99 */ ++ ++#endif /* not WIN */ ++ ++/* assume IEEE; tweak if necessary (patches are welcome) */ ++#define FLOAT16 UINT16 ++#define FLOAT32 float ++#define FLOAT64 double ++ ++#ifdef _MSC_VER ++typedef signed __int64 int64_t; ++#endif ++ ++#ifdef __GNUC__ ++#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) ++#endif diff --git a/python-pillow.spec b/python-pillow.spec index ca022a7..b0e37da 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -12,8 +12,8 @@ %endif Name: python-%{srcname} -Version: 9.5.0 -Release: 2%{?dist} +Version: 10.0.0 +Release: 1%{?dist} Summary: Python image processing library # License: see http://www.pythonware.com/products/pil/license.htm @@ -295,6 +295,9 @@ popd %changelog +* Wed Jul 05 2023 Sandro Mani - 10.0.0-1 +- Update to 10.0.0 + * Fri Jun 16 2023 Python Maint - 9.5.0-2 - Rebuilt for Python 3.12 diff --git a/sources b/sources index aa75bd3..6e5c496 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Pillow-9.5.0.tar.gz) = da0c7a1bde4741ced168c013fdc7afa8af1100bba878bdaeeb9804fed4dcf70c07ed62004ab2c73694eae3d28e2d72d46c155f78b540075aafb36c8e7a5649ff +SHA512 (Pillow-10.0.0.tar.gz) = a963ae8398c609569e1b23d2362f6382cd888698492ba2349f9c931a04c463fbdc27a43e53d1dee8bbb1b5e88c0d5eb655f6f5e9df7d489c206b6acda0adec3a