[gimp/wip/Jehan/incremental-win-installer-improvements] build: MSYS2 python package is now Python 3.9.

[Jehan <jehanp src gnome org>]

commit 69b4546105442cd85c1172f48ff553832778454a
Author: Jehan <jehan girinstud io>
Date:   Fri Jul 16 22:33:13 2021 +0200

    build: MSYS2 python package is now Python 3.9.
    
    The MSYS2 package got recently bumped from 3.8 to 3.9.6. Update our
    packaging and installer scripts to be more generic (so that they should
    work now and should continue to work even if bumping to a higher minor
    version in the future).

 build/windows/gitlab-ci/package-gimp-msys2.sh | 4 ++--
 build/windows/installer/files.isi             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index 92357c505b..f68701111a 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -101,7 +101,7 @@ cp -fr ${GIMP_PREFIX}/lib/gio ${GIMP_DISTRIB}/lib/
 cp -fr ${MSYS_PREFIX}/lib/gdk-pixbuf-2.0 ${GIMP_DISTRIB}/lib/
 cp -fr ${GIMP_PREFIX}/lib/gtk-3.0 ${GIMP_DISTRIB}/lib/
 
-cp -fr ${MSYS_PREFIX}/lib/python3.8 ${GIMP_DISTRIB}/lib/
+cp -fr ${MSYS_PREFIX}/lib/python3.* ${GIMP_DISTRIB}/lib/
 
 cp -fr ${MSYS_PREFIX}/share/ghostscript ${GIMP_DISTRIB}/share/
 cp -fr ${GIMP_PREFIX}/share/glib-2.0 ${GIMP_DISTRIB}/share/
@@ -230,7 +230,7 @@ cp -fr ${MSYS_PREFIX}/bin/libgirepository-1.0-1.dll ${GIMP_DISTRIB}/bin/
 python3 build/windows/gitlab-ci/dll_link.py ${GIMP_DISTRIB}/bin/libgirepository-1.0-1.dll ${GIMP_PREFIX}/ 
${GIMP_DISTRIB}
 python3 build/windows/gitlab-ci/dll_link.py ${GIMP_DISTRIB}/bin/libgirepository-1.0-1.dll ${MSYS_PREFIX}/ 
${GIMP_DISTRIB}
 
-for dll in ${GIMP_DISTRIB}/lib/python3.8/site-packages/*/*.dll; do
+for dll in ${GIMP_DISTRIB}/lib/python3.*/site-packages/*/*.dll; do
   python3 build/windows/gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
   python3 build/windows/gitlab-ci/dll_link.py $dll ${MSYS_PREFIX}/ ${GIMP_DISTRIB};
 done
diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi
index ea2633718d..28dfb2a431 100644
--- a/build/windows/installer/files.isi
+++ b/build/windows/installer/files.isi
@@ -48,8 +48,8 @@ Source: "{#DEPS_DIR}\{#DDIR}\lib\gio\*.dll"; DestDir: "{app}\lib\gio"; Component
 #ifdef PYTHON
 Source: "{#DEPS_DIR}\{#DDIR}\bin\python3w.exe"; DestDir: "{app}\bin"; DestName: "pythonw.exe"; Components: 
py and gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion
 Source: "{#DEPS_DIR}\{#DDIR}\bin\python3.exe"; DestDir: "{app}\bin"; DestName: "python.exe"; Components: py 
and gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion
-Source: "{#DEPS_DIR}\{#DDIR}\bin\libpython3.8.dll"; DestDir: "{app}\bin"; Components: py and 
gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion
-Source: "{#DEPS_DIR}\{#DDIR}\lib\python3.8\*"; DestDir: "{app}\lib\python3.8"; Components: py and 
gimp{#PLATFORM}; Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
+Source: "{#DEPS_DIR}\{#DDIR}\bin\libpython3.*.dll"; DestDir: "{app}\bin"; Components: py and 
gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion
+Source: "{#DEPS_DIR}\{#DDIR}\lib\python3.*"; DestDir: "{app}\lib"; Components: py and gimp{#PLATFORM}; 
Flags: recursesubdirs restartreplace uninsrestartdelete ignoreversion
 #endif
 
 #ifdef LUA