Add more dlls

Author: ddelange

.github/workflows/wheels.yml

@@ -91,7 +91,7 @@ jobs:
 
     - name: Setup MSYS2 and install file
       if: runner.os == 'Windows'
-      uses: msys2/setup-msys2@v2
+      uses: msys2/setup-msys2@v2.27.0
       with:
         msystem: ${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}
         update: true
@@ -105,6 +105,16 @@ jobs:
         cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/share/misc/magic.mgc" "magic"
         cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libmagic-1.dll" "magic"
         cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libsystre-0.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libtre-5.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libasprintf-0.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libintl-8.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libatomic-1.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libgcc_s_seh-1.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libgomp-1.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libquadmath-0.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libstdc++-6.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libcharset-1.dll" "magic"
+        cp "/msys64/${{ endsWith(matrix.only, '32') && 'mingw32' || 'mingw64' }}/bin/libiconv-2.dll" "magic"
 
     - uses: pypa/cibuildwheel@v2.17.0  # sync version with pip install cibuildwheel above
       timeout-minutes: 10

add_libmagic.sh

@@ -26,7 +26,6 @@ install_precompiled() {
     # Debian https://packages.ubuntu.com/libmagic1
     # Alpine https://pkgs.alpinelinux.org/package/libmagic
     # RHEL https://git.almalinux.org/rpms/file
-    # Windows https://packages.msys2.org/base/mingw-w64-file
     if [ -n "$(which brew)" ]; then
         brew install libmagic
     elif [ -n "$(which apt-get)" ]; then
@@ -36,12 +35,6 @@ install_precompiled() {
         apk add --update libmagic
     elif [ -n "$(which dnf)" ]; then
         dnf --setopt install_weak_deps=false -y install file-libs
-    elif python -c 'import platform; assert platform.system() == "Windows"'; then
-        pkg="mingw-w64-$(python -c 'import sysconfig; print("i686" if sysconfig.get_platform() == "win32" else "x86_64")')-file"
-        pip install msys2dl
-        msys2dl extract --output / ${pkg}
-        # this is a libmagic dependency which also needs to be packaged
-        cp "/mingw64/bin/libsystre-0.dll" "magic"
     fi
 }
 
@@ -52,7 +45,7 @@ copy_libmagic() {
     libmagic_path="$(python -c 'from magic.loader import load_lib; print(load_lib()._name)')" &&
     cp "${libmagic_path}" "magic" &&
     # additionally copy compiled db into magic dir (prefer the one installed by install_source)
-    ( ( ( cp "/usr/local/share/misc/magic.mgc" "magic" || cp "/usr/share/misc/magic.mgc" "magic" ) || cp "/mingw64/share/misc/magic.mgc" "magic" ) || true ) &&
+    ( ( cp "/usr/local/share/misc/magic.mgc" "magic" || cp "/usr/share/misc/magic.mgc" "magic" ) || true ) &&
     # check what was copied
     ls -ltra magic
 }