From 06092bd380bacd51f67d2f6ae859522fda43a91a Mon Sep 17 00:00:00 2001
From: Patrick Storz <eduard.braun2@gmx.de>
Date: Fri, 25 Oct 2019 19:19:39 +0200
Subject: CMake/MSYS2: Fix for Python 3.8 update

---
 CMakeScripts/InstallMSYS2.cmake | 14 ++++++++------
 buildtools/msys2checkdeps.py    |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index e631464b1..9d731901d 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -37,7 +37,6 @@ if(WIN32)
     ${MINGW_BIN}/libenchant-[0-9]*.dll
     ${MINGW_BIN}/libepoxy-[0-9]*.dll
     ${MINGW_BIN}/libexpat-[0-9]*.dll
-    ${MINGW_BIN}/libexslt-[0-9]*.dll
     ${MINGW_BIN}/libffi-[0-9]*.dll
     ${MINGW_BIN}/libfftw3-[0-9]*.dll
     ${MINGW_BIN}/libfontconfig-[0-9]*.dll
@@ -250,6 +249,9 @@ if(WIN32)
   endif()
 
   # Python (use executable names without version number for compatibility with python from python.org)
+  file(GLOB python_version ${MINGW_BIN}/libpython3.[0-9]*.dll)
+  string(REGEX REPLACE "${MINGW_BIN}/libpython(3\.[0-9]+)\.dll" "\\1" python_version ${python_version})
+
   install(FILES
     ${MINGW_BIN}/python3.exe
     RENAME python.exe
@@ -259,16 +261,16 @@ if(WIN32)
     RENAME pythonw.exe
     DESTINATION bin)
   install(FILES
-    ${MINGW_BIN}/libpython3.7m.dll
+    ${MINGW_BIN}/libpython${python_version}.dll
     DESTINATION bin)
-  install(DIRECTORY ${MINGW_LIB}/python3.7
+  install(DIRECTORY ${MINGW_LIB}/python${python_version}
     DESTINATION lib
-    PATTERN "python3.7/site-packages" EXCLUDE # specify individual packages to install below
-    PATTERN "python3.7/test" EXCLUDE # we don't need the Python testsuite
+    PATTERN "python${python_version}/site-packages" EXCLUDE # specify individual packages to install below
+    PATTERN "python${python_version}/test" EXCLUDE # we don't need the Python testsuite
     PATTERN "*.pyc" EXCLUDE
   )
 
-  set(site_packages "lib/python3.7/site-packages")
+  set(site_packages "lib/python${python_version}/site-packages")
   # Python packages installed via pacman
   set(packages "python3-lxml" "python3-numpy" "python3-pillow" "python3-six" "python3-cairo" "python3-gobject")
   foreach(package ${packages})
diff --git a/buildtools/msys2checkdeps.py b/buildtools/msys2checkdeps.py
index 68176286c..31f7d5f02 100644
--- a/buildtools/msys2checkdeps.py
+++ b/buildtools/msys2checkdeps.py
@@ -93,7 +93,7 @@ def collect_dependencies(path):
         deps = get_dependencies(path, deps)
     elif os.path.isdir(path):
         extensions = ['.exe', '.pyd', '.dll']
-        exclusions = ['python3.7/distutils/command/wininst']
+        exclusions = ['distutils/command/wininst']  # python
         for base, dirs, files in os.walk(path):
             for f in files:
                 filepath = os.path.join(base, f)
-- 
cgit v1.2.3