From 14fadfeb822c56ed04be523f781ffe6fa25cc4eb Mon Sep 17 00:00:00 2001 From: sitiom Date: Mon, 18 Jul 2022 13:12:13 +0800 Subject: [PATCH] qrencode: Switch to mingw-w64 builds (#3756) --- bucket/qrencode.json | 109 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 23 deletions(-) diff --git a/bucket/qrencode.json b/bucket/qrencode.json index 8cd6d0b27d..6bdfaf58c2 100644 --- a/bucket/qrencode.json +++ b/bucket/qrencode.json @@ -1,27 +1,47 @@ { - "version": "4.1.1-3", + "version": "4.1.1-2", "description": "Encode input data in a QR Code symbol", "homepage": "https://fukuchi.org/works/qrencode/", "license": "LGPL-2.1-only", - "notes": "PNG output is disabled for this build. See https://github.com/msys2/MSYS2-packages/issues/2214.", "architecture": { "64bit": { "url": [ - "https://mirror.msys2.org/msys/x86_64/libqrencode-4.1.1-3-x86_64.pkg.tar.zst", - "https://mirror.msys2.org/msys/x86_64/msys2-runtime-3.3.5-3-x86_64.pkg.tar.zst" + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-qrencode-4.1.1-2-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-10.0.0.r54.gb4116e310-1-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libpng-1.6.37-6-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.2.12-1-any.pkg.tar.zst" ], "hash": [ - "ead222db63fadf4c6ec67f6b7a95761eb9d0c4ffd92e18129ab11f7944e1e583", - "9e99486501905294eb01d7024d2cb96f658b609232878a990e469b5448ea4e11" + "d6e9664075934140c19a34c1bf53c67b69909e7feef97ba5cb7ddbe850312d81", + "58b73d8ed20bab747546bee69e7e1935da141f66ddcf936f87fcc11f1a691241", + "56f955ca5addd9acf51503e0e68efbca9e219d92264ce4cb2a6683f19afe3b4d", + "e728df08b4db7b291a52d8fd60b96f19016f059ab15170fc98120e5d580c86ac" + ] + }, + "32bit": { + "url": [ + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-qrencode-4.1.1-2-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libwinpthread-git-10.0.0.r54.gb4116e310-1-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libpng-1.6.37-6-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-zlib-1.2.12-1-any.pkg.tar.zst" + ], + "hash": [ + "fdec31c2c494ec025daff32c60db7a10f31ffbfb6348249fbb3c52059dab0786", + "8e7001333b9aff7e6d95cc015ef7dfe19c38783a077488251a4ccf05bd3b1df5", + "65891695da63ddb6fbb7e9540e243ede0f33b429587df0cda5496c48c3a14599", + "74ace327d8e28cdb0c777fffc6003f5097836c247be40cf3b483bd9fd1c23183" ] } }, "pre_install": [ - "$keep_files = @(\"$dir\\usr\\bin\\qrencode.exe\",", - " \"$dir\\usr\\bin\\msys-qrencode-4.dll\",", - " \"$dir\\usr\\bin\\msys-2.0.dll\",", - " \"$dir\\usr\\share\\licenses\\libqrencode\\COPYING\",", - " \"$dir\\usr\\share\\man\\man1\\qrencode.1.gz\")", + "movedir \"$dir\\$(if ($arch = '64bit') {'mingw64'} else {'mingw32'})\" \"$dir\" | Out-Null", + "$keep_files = @(\"$dir\\bin\\qrencode.exe\",", + " \"$dir\\bin\\libqrencode.dll\",", + " \"$dir\\bin\\libwinpthread-1.dll\",", + " \"$dir\\bin\\libpng16-16.dll\",", + " \"$dir\\bin\\zlib1.dll\",", + " \"$dir\\share\\licenses\\qrencode\\COPYING\",", + " \"$dir\\share\\man\\man1\\qrencode.1.gz\")", "", "Get-ChildItem \"$dir\" -Recurse", " | Select-Object -ExpandProperty FullName", @@ -29,37 +49,80 @@ " | Sort-Object Length -Descending", " | ForEach-Object { if ((Test-Path $_ -Type Container) -and (Get-ChildItem $_)) { return } Remove-Item $_ }" ], - "bin": "usr\\bin\\qrencode.exe", + "bin": "bin\\qrencode.exe", "checkver": { "script": [ - "$base_url = 'https://packages.msys2.org/package/'", - "$qrencode_page = (Invoke-WebRequest \"${base_url}libqrencode\" -UseBasicParsing).Content", - "$runtime_page = (Invoke-WebRequest \"${base_url}msys2-runtime\" -UseBasicParsing).Content", + "$base_url = 'https://packages.msys2.org/base/'", "$version_regex = \"Version:.+\\s+<.+>([\\d.-]+)\"", "", + "$qrencode_page = (Invoke-WebRequest \"${base_url}mingw-w64-qrencode\" -UseBasicParsing).Content", + "$libwinpthread_page = (Invoke-WebRequest \"${base_url}mingw-w64-winpthreads-git\" -UseBasicParsing).Content", + "$libpng_page = (Invoke-WebRequest \"${base_url}mingw-w64-libpng\" -UseBasicParsing).Content", + "$zlib_page = (Invoke-WebRequest \"${base_url}mingw-w64-zlib\" -UseBasicParsing).Content", + "", "if(!($qrencode_page -match $version_regex)) { error \"No match found for version\"; break }", "$scriptver = $matches[1]", - "if(!($runtime_page -match $version_regex)) { error \"No match found for version\"; break }", - "$msys2_runtime_version = $matches[1]", + "if(!($libwinpthread_page -match \"(?:\\d+.){3}(?:\\w+.){2}-\\d+\")) { error \"No match found for version\"; break }", + "$libwinpthread_version = $matches[0]", + "if(!($libpng_page -match $version_regex)) { error \"No match found for version\"; break }", + "$libpng_version = $matches[1]", + "if(!($zlib_page -match $version_regex)) { error \"No match found for version\"; break }", + "$zlib_version = $matches[1]", "", - "Write-Output $scriptver $msys2_runtime_version" + "Write-Output $scriptver $libwinpthread_version $libpng_version $zlib_version" ], - "regex": "(?[\\d.-]+)\\s(?[\\d.-]+)" + "regex": "(?[\\d.-]+)\\s(?(?:\\d+.){3}(?:\\w+.){2}-\\d+)\\s(?[\\d.-]+)\\s(?[\\d.-]+)" }, "autoupdate": { "architecture": { "64bit": { "url": [ - "https://mirror.msys2.org/msys/x86_64/libqrencode-$matchVersion-x86_64.pkg.tar.zst", - "https://mirror.msys2.org/msys/x86_64/msys2-runtime-$matchMsys2version-x86_64.pkg.tar.zst" + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-qrencode-$matchVersion-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-$matchLibwinpthreadversion-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libpng-$matchLibpngversion-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-$matchZlibversion-any.pkg.tar.zst" ], "hash": [ { - "url": "https://packages.msys2.org/package/libqrencode", + "url": "https://packages.msys2.org/package/mingw-w64-x86_64-qrencode", "regex": "SHA256:.+\\s+<.+>$sha256" }, { - "url": "https://packages.msys2.org/package/msys2-runtime", + "url": "https://packages.msys2.org/package/mingw-w64-x86_64-libwinpthread-git", + "regex": "SHA256:.+\\s+<.+>$sha256" + }, + { + "url": "https://packages.msys2.org/package/mingw-w64-x86_64-libpng", + "regex": "SHA256:.+\\s+<.+>$sha256" + }, + { + "url": "https://packages.msys2.org/package/mingw-w64-x86_64-zlib", + "regex": "SHA256:.+\\s+<.+>$sha256" + } + ] + }, + "32bit": { + "url": [ + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-qrencode-$matchVersion-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libwinpthread-git-$matchLibwinpthreadversion-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libpng-$matchLibpngversion-any.pkg.tar.zst", + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-zlib-$matchZlibversion-any.pkg.tar.zst" + ], + "hash": [ + { + "url": "https://packages.msys2.org/package/mingw-w64-i686-qrencode", + "regex": "SHA256:.+\\s+<.+>$sha256" + }, + { + "url": "https://packages.msys2.org/package/mingw-w64-i686-libwinpthread-git", + "regex": "SHA256:.+\\s+<.+>$sha256" + }, + { + "url": "https://packages.msys2.org/package/mingw-w64-i686-libpng", + "regex": "SHA256:.+\\s+<.+>$sha256" + }, + { + "url": "https://packages.msys2.org/package/mingw-w64-i686-zlib", "regex": "SHA256:.+\\s+<.+>$sha256" } ]