Merge branch 'main' into rm-3.6

.appveyor.yml

@@ -10,7 +10,7 @@ environment:
   TEST_OPTIONS:
   DEPLOY: YES
   matrix:
-  - PYTHON: C:/Python39
+  - PYTHON: C:/Python310
     ARCHITECTURE: x86
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
   - PYTHON: C:/Python37-x64
@@ -19,6 +19,7 @@ environment:
 
 
 install:
+- '%PYTHON%\%EXECUTABLE% --version'
 - curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/main.zip
 - 7z x pillow-depends.zip -oc:\
 - mv c:\pillow-depends-main c:\pillow-depends

.github/workflows/test-docker.yml

@@ -23,6 +23,7 @@ jobs:
           centos-stream-8-amd64,
           debian-10-buster-x86,
           fedora-34-amd64,
+          fedora-35-amd64,
           ubuntu-18.04-bionic-amd64,
           ubuntu-20.04-focal-amd64,
         ]

CHANGES.rst

@@ -5,6 +5,9 @@ Changelog (Pillow)
 9.0.0 (unreleased)
 ------------------
 
+- Fix compilation on 64-bit Termux #5793
+  [landfillbaby]
+
 - Use title for display in ImageShow #5788
   [radarhere]
 

Makefile

@@ -96,7 +96,8 @@ release-test:
 
 .PHONY: sdist
 sdist:
-	python3 setup.py sdist --format=gztar
+	python3 -m build --help > /dev/null 2>&1 || python3 -m pip install build
+	python3 -m build --sdist
 
 .PHONY: test
 test:

docs/installation.rst

@@ -464,6 +464,8 @@ These platforms are built and tested for every change.
 +----------------------------------+----------------------------+---------------------+
 | Fedora 34                        | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
+| Fedora 35                        | 3.10                       | x86-64              |
++----------------------------------+----------------------------+---------------------+
 | macOS 10.15 Catalina             | 3.7, 3.8, 3.9, 3.10, PyPy3 | x86-64              |
 +----------------------------------+----------------------------+---------------------+
 | Ubuntu Linux 18.04 LTS (Bionic)  | 3.9                        | x86-64              |

setup.py

@@ -560,7 +560,11 @@ class pil_build_ext(build_ext):
                 # headers are at $PREFIX/include
                 # user libs are at $PREFIX/lib
                 _add_directory(
-                    library_dirs, os.path.join(os.environ["ANDROID_ROOT"], "lib")
+                    library_dirs,
+                    os.path.join(
+                        os.environ["ANDROID_ROOT"],
+                        "lib" if struct.calcsize("l") == 4 else "lib64",
+                    ),
                 )
 
         elif sys.platform.startswith("netbsd"):

src/PIL/ImageCms.py

@@ -34,9 +34,9 @@ pyCMS
     a Python / PIL interface to the littleCMS ICC Color Management System
     Copyright (C) 2002-2003 Kevin Cazabon
     kevin@cazabon.com
-    http://www.cazabon.com
+    https://www.cazabon.com
 
-    pyCMS home page:  http://www.cazabon.com/pyCMS
+    pyCMS home page:  https://www.cazabon.com/pyCMS
     littleCMS home page:  https://www.littlecms.com
     (littleCMS is Copyright (C) 1998-2001 Marti Maria)
 

src/PIL/ImageOps.py

@@ -439,7 +439,7 @@ def fit(image, size, method=Image.BICUBIC, bleed=0.0, centering=(0.5, 0.5)):
 
     # by Kevin Cazabon, Feb 17/2000
     # kevin@cazabon.com
-    # http://www.cazabon.com
+    # https://www.cazabon.com
 
     # ensure centering is mutable
     centering = list(centering)

src/_imagingcms.c

@@ -3,14 +3,14 @@
  * a Python / PIL interface to the littleCMS ICC Color Management System
  * Copyright (C) 2002-2003 Kevin Cazabon
  * kevin@cazabon.com
- * http://www.cazabon.com
+ * https://www.cazabon.com
  * Adapted/reworked for PIL by Fredrik Lundh
  * Copyright (c) 2009 Fredrik Lundh
  * Updated to LCMS2
  * Copyright (c) 2013 Eric Soroos
  *
- * pyCMS home page:  http://www.cazabon.com/pyCMS
- * littleCMS home page:  http://www.littlecms.com
+ * pyCMS home page:  https://www.cazabon.com/pyCMS
+ * littleCMS home page:  https://www.littlecms.com
  * (littleCMS is Copyright (C) 1998-2001 Marti Maria)
  *
  * Originally released under LGPL.  Graciously donated to PIL in
@@ -23,7 +23,7 @@ pyCMS\n\
 a Python / PIL interface to the littleCMS ICC Color Management System\n\
 Copyright (C) 2002-2003 Kevin Cazabon\n\
 kevin@cazabon.com\n\
-http://www.cazabon.com\n\
+https://www.cazabon.com\n\
 "
 
 #define PY_SSIZE_T_CLEAN