From c47d870fb2c72d2c86b3db652728a581de15f7c7 Mon Sep 17 00:00:00 2001 From: RCJacH Date: Sat, 16 Oct 2021 03:13:45 +0800 Subject: [PATCH 1/4] gimp: Update to version 2.10.28 add autoupdate section --- bucket/gimp.json | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/bucket/gimp.json b/bucket/gimp.json index 71513ee78107a8..bbdef60148308b 100644 --- a/bucket/gimp.json +++ b/bucket/gimp.json @@ -1,10 +1,10 @@ { - "version": "2.10.20-1", + "version": "2.10.28", "description": "GNU Image Manipulation Program", "homepage": "https://www.gimp.org", "license": "GPL-3.0-only", - "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-2.10.20-setup-1.exe", - "hash": "430b1a709cd89b5cddb857032a7a5b93199d076ff8cd83ebdd0112330b65ba51", + "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-2.10.28-setup.exe", + "hash": "2c2e081ce541682be1abdd8bc6df13768ad9482d68000b4a7a60c764d6cec74e", "innosetup": true, "installer": { "script": [ @@ -65,7 +65,18 @@ ], "checkver": { "url": "https://www.gimp.org/downloads/", - "regex": "gimp-([\\d.]+)-setup(-\\d)?\\.exe", - "replace": "${1}${2}" + "regex": "gimp-(?[\\d.]+)-setup(?-\\d)?\\.exe", + "replace": "${version}${build}" + }, + "autoupdate": { + "architecture": { + "64bit": { + "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-$version-setup$build.exe", + "hash": { + "url": "https://www.gimp.org/downloads/", + "xpath": "//h3[text()='Hash Sum']/following-sibling::p/kbd/text()" + } + } + } } } From 6c92cc65c1bc1133eab1f01612dca9e4ae616259 Mon Sep 17 00:00:00 2001 From: RCJacH Date: Mon, 1 Nov 2021 07:32:26 +0800 Subject: [PATCH 2/4] gimp: Update to version 2.10.28 checked with checkver.ps1 add separation of major, minor, and patch version numbers add another URL with hashes --- bucket/gimp.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/bucket/gimp.json b/bucket/gimp.json index bbdef60148308b..b54dccebe054bc 100644 --- a/bucket/gimp.json +++ b/bucket/gimp.json @@ -3,8 +3,12 @@ "description": "GNU Image Manipulation Program", "homepage": "https://www.gimp.org", "license": "GPL-3.0-only", - "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-2.10.28-setup.exe", - "hash": "2c2e081ce541682be1abdd8bc6df13768ad9482d68000b4a7a60c764d6cec74e", + "architecture": { + "64bit": { + "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-2.10.28-setup.exe", + "hash": "2c2e081ce541682be1abdd8bc6df13768ad9482d68000b4a7a60c764d6cec74e" + } + }, "innosetup": true, "installer": { "script": [ @@ -65,16 +69,15 @@ ], "checkver": { "url": "https://www.gimp.org/downloads/", - "regex": "gimp-(?[\\d.]+)-setup(?-\\d)?\\.exe", - "replace": "${version}${build}" + "regex": "gimp-(?\\d+).(?\\d+).(?\\d+)-setup(?-\\d)?\\.exe", + "replace": "${major}.${minor}.${patch}${build}" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-$version-setup$build.exe", + "url": "https://download.gimp.org/mirror/pub/gimp/v$matchMajor.$matchMinor/windows/gimp-$matchMajor.$matchMinor.$matchPatch-setup$matchBuild.exe", "hash": { - "url": "https://www.gimp.org/downloads/", - "xpath": "//h3[text()='Hash Sum']/following-sibling::p/kbd/text()" + "url": "$baseurl/SHA256SUMS" } } } From 54f1a1bb92145404837a187300b4fc1dcc1345dc Mon Sep 17 00:00:00 2001 From: RCJacH Date: Wed, 3 Nov 2021 15:54:00 +0800 Subject: [PATCH 3/4] gimp: Update to version 2.10.28 remove architecture blocks (since both 32bit and 64bit uses the same file) simplify checkver and autoupdate block to use $majorVersion and $minorVersion variables --- bucket/gimp.json | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/bucket/gimp.json b/bucket/gimp.json index b54dccebe054bc..fed1945239db66 100644 --- a/bucket/gimp.json +++ b/bucket/gimp.json @@ -3,12 +3,8 @@ "description": "GNU Image Manipulation Program", "homepage": "https://www.gimp.org", "license": "GPL-3.0-only", - "architecture": { - "64bit": { - "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-2.10.28-setup.exe", - "hash": "2c2e081ce541682be1abdd8bc6df13768ad9482d68000b4a7a60c764d6cec74e" - } - }, + "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-2.10.28-setup.exe", + "hash": "2c2e081ce541682be1abdd8bc6df13768ad9482d68000b4a7a60c764d6cec74e", "innosetup": true, "installer": { "script": [ @@ -69,17 +65,13 @@ ], "checkver": { "url": "https://www.gimp.org/downloads/", - "regex": "gimp-(?\\d+).(?\\d+).(?\\d+)-setup(?-\\d)?\\.exe", - "replace": "${major}.${minor}.${patch}${build}" + "regex": "gimp-(?[\\d.]+)-setup(?-\\d)?\\.exe", + "replace": "${version}${build}" }, "autoupdate": { - "architecture": { - "64bit": { - "url": "https://download.gimp.org/mirror/pub/gimp/v$matchMajor.$matchMinor/windows/gimp-$matchMajor.$matchMinor.$matchPatch-setup$matchBuild.exe", - "hash": { - "url": "$baseurl/SHA256SUMS" - } - } + "url": "https://download.gimp.org/mirror/pub/gimp/v$majorVersion.$minorVersion/windows/gimp-$version-setup$matchBuild.exe", + "hash": { + "url": "$baseurl/SHA256SUMS" } } } From e4da7342ee429169128a5ffc559beafe8a28ff6e Mon Sep 17 00:00:00 2001 From: RCJacH Date: Wed, 3 Nov 2021 21:35:26 +0800 Subject: [PATCH 4/4] gimp: Update to version 2.10.28 fix autoupdate.url for cases with build number --- bucket/gimp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bucket/gimp.json b/bucket/gimp.json index fed1945239db66..6c6e11e8a8e8c8 100644 --- a/bucket/gimp.json +++ b/bucket/gimp.json @@ -69,7 +69,7 @@ "replace": "${version}${build}" }, "autoupdate": { - "url": "https://download.gimp.org/mirror/pub/gimp/v$majorVersion.$minorVersion/windows/gimp-$version-setup$matchBuild.exe", + "url": "https://download.gimp.org/mirror/pub/gimp/v$majorVersion.$minorVersion/windows/gimp-$matchHead-setup$matchTail.exe", "hash": { "url": "$baseurl/SHA256SUMS" }