diff --git a/scripts/package/win-common.ps1 b/scripts/package/win-common.ps1 index 21c30a0fe..a6f25d70c 100644 --- a/scripts/package/win-common.ps1 +++ b/scripts/package/win-common.ps1 @@ -45,16 +45,16 @@ Function FinalizePackage { CodeSignBinary -BinaryPath (Join-Path -Path $Path -ChildPath fpcalc.exe) -ErrorAction Stop CodeSignBinary -BinaryPath (Join-Path -Path $Path -ChildPath discid.dll) -ErrorAction Stop - # Move all Qt5 DLLs into the main folder to avoid conflicts with system wide + # Move all Qt6 DLLs into the main folder to avoid conflicts with system wide # versions of those dependencies. Since some version PyInstaller tries to # maintain the file hierarchy of imported modules, but this easily breaks # DLL loading on Windows. # Workaround for https://tickets.metabrainz.org/browse/PICARD-2736 - $Qt5BinDir = (Join-Path -Path $Path -ChildPath PyQt5\Qt5\bin) - Move-Item -Path (Join-Path -Path $Qt5BinDir -ChildPath *.dll) -Destination $Path -Force - Remove-Item -Path $Qt5BinDir + $QtBinDir = (Join-Path -Path $Path -ChildPath PyQt6\Qt6\bin) + Move-Item -Path (Join-Path -Path $QtBinDir -ChildPath *.dll) -Destination $Path -Force + Remove-Item -Path $QtBinDir # Mitigate libwebp vulnerability allowing for arbitrary code execution (CVE-2023-4863). # Disable the Qt webp imageformat plugin. - Remove-Item -Path (Join-Path -Path $Path -ChildPath PyQt5\Qt5\plugins\imageformats\qwebp.dll) + Remove-Item -Path (Join-Path -Path $Path -ChildPath PyQt6\Qt6\plugins\imageformats\qwebp.dll) }