rdobuilder 464eb7
diff -rupN --no-dereference Pillow-9.2.0/setup.py Pillow-9.2.0-new/setup.py
rdobuilder 464eb7
--- Pillow-9.2.0/setup.py	2022-07-01 15:19:51.000000000 +0200
rdobuilder 464eb7
+++ Pillow-9.2.0-new/setup.py	2022-07-20 16:40:23.805366371 +0200
rdobuilder 464eb7
@@ -135,7 +135,7 @@ class RequiredDependencyException(Except
rdobuilder 464eb7
     pass
rdobuilder 464eb7
 
rdobuilder 464eb7
 
rdobuilder 464eb7
-PLATFORM_MINGW = os.name == "nt" and "GCC" in sys.version
rdobuilder 464eb7
+PLATFORM_MINGW = "mingw32" in os.getenv("CC", "")
rdobuilder 464eb7
 PLATFORM_PYPY = hasattr(sys, "pypy_version_info")
rdobuilder 464eb7
 
rdobuilder 464eb7
 
rdobuilder 464eb7
@@ -503,7 +503,7 @@ class pil_build_ext(build_ext):
rdobuilder 464eb7
         #
rdobuilder 464eb7
         # add platform directories
rdobuilder 464eb7
 
rdobuilder 464eb7
-        if self.disable_platform_guessing:
rdobuilder 464eb7
+        if self.disable_platform_guessing or PLATFORM_MINGW:
rdobuilder 464eb7
             pass
rdobuilder 464eb7
 
rdobuilder 464eb7
         elif sys.platform == "cygwin":
rdobuilder 464eb7
@@ -595,7 +595,7 @@ class pil_build_ext(build_ext):
rdobuilder 464eb7
         # FIXME: check /opt/stuff directories here?
rdobuilder 464eb7
 
rdobuilder 464eb7
         # standard locations
rdobuilder 464eb7
-        if not self.disable_platform_guessing:
rdobuilder 464eb7
+        if not self.disable_platform_guessing and not PLATFORM_MINGW:
rdobuilder 464eb7
             _add_directory(library_dirs, "/usr/local/lib")
rdobuilder 464eb7
             _add_directory(include_dirs, "/usr/local/include")
rdobuilder 464eb7
 
rdobuilder 464eb7
@@ -841,7 +841,7 @@ class pil_build_ext(build_ext):
rdobuilder 464eb7
         if feature.xcb:
rdobuilder 464eb7
             libs.append(feature.xcb)
rdobuilder 464eb7
             defs.append(("HAVE_XCB", None))
rdobuilder 464eb7
-        if sys.platform == "win32":
rdobuilder 464eb7
+        if sys.platform == "win32" or PLATFORM_MINGW:
rdobuilder 464eb7
             libs.extend(["kernel32", "user32", "gdi32"])
rdobuilder 464eb7
         if struct.unpack("h", b"\0\1")[0] == 1:
rdobuilder 464eb7
             defs.append(("WORDS_BIGENDIAN", None))
rdobuilder 464eb7
@@ -863,6 +863,8 @@ class pil_build_ext(build_ext):
rdobuilder 464eb7
         if feature.freetype:
rdobuilder 464eb7
             srcs = []
rdobuilder 464eb7
             libs = ["freetype"]
rdobuilder 464eb7
+            if sys.platform == "win32" or PLATFORM_MINGW:
rdobuilder 464eb7
+                libs.extend(["dl"])
rdobuilder 464eb7
             defs = []
rdobuilder 464eb7
             if feature.raqm:
rdobuilder 464eb7
                 if not feature.want_vendor("raqm"):  # using system Raqm
rdobuilder 464eb7
@@ -885,7 +887,7 @@ class pil_build_ext(build_ext):
rdobuilder 464eb7
 
rdobuilder 464eb7
         if feature.lcms:
rdobuilder 464eb7
             extra = []
rdobuilder 464eb7
-            if sys.platform == "win32":
rdobuilder 464eb7
+            if sys.platform == "win32" or PLATFORM_MINGW:
rdobuilder 464eb7
                 extra.extend(["user32", "gdi32"])
rdobuilder 464eb7
             self._update_extension("PIL._imagingcms", [feature.lcms] + extra)
rdobuilder 464eb7
         else:
rdobuilder 464eb7
@@ -904,7 +906,7 @@ class pil_build_ext(build_ext):
rdobuilder 464eb7
         else:
rdobuilder 464eb7
             self._remove_extension("PIL._webp")
rdobuilder 464eb7
 
rdobuilder 464eb7
-        tk_libs = ["psapi"] if sys.platform in ("win32", "cygwin") else []
rdobuilder 464eb7
+        tk_libs = ["psapi"] if sys.platform in ("win32", "cygwin") or PLATFORM_MINGW else []
rdobuilder 464eb7
         self._update_extension("PIL._imagingtk", tk_libs)
rdobuilder 464eb7
 
rdobuilder 464eb7
         build_ext.build_extensions(self)
rdobuilder 464eb7
diff -rupN --no-dereference Pillow-9.2.0/src/libImaging/ImPlatform.h Pillow-9.2.0-new/src/libImaging/ImPlatform.h
rdobuilder 464eb7
--- Pillow-9.2.0/src/libImaging/ImPlatform.h	2022-07-01 15:19:51.000000000 +0200
rdobuilder 464eb7
+++ Pillow-9.2.0-new/src/libImaging/ImPlatform.h	2022-07-20 16:40:23.806366371 +0200
rdobuilder 464eb7
@@ -28,7 +28,7 @@
rdobuilder 464eb7
 #if defined(_WIN32) || defined(__CYGWIN__)
rdobuilder 464eb7
 
rdobuilder 464eb7
 #define WIN32_LEAN_AND_MEAN
rdobuilder 464eb7
-#include <Windows.h>
rdobuilder 464eb7
+#include <windows.h>
rdobuilder 464eb7
 
rdobuilder 464eb7
 #ifdef __CYGWIN__
rdobuilder 464eb7
 #undef _WIN64