From 33f8e2b65ff3a9277d63ddf0b59afb6f8be78807 Mon Sep 17 00:00:00 2001 From: HaoCheng Date: Sun, 24 Nov 2024 17:59:58 +0800 Subject: [PATCH 1/2] Update freecad to version 1.0.0 --- bucket/freecad.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bucket/freecad.json b/bucket/freecad.json index ad39152d7a7384..3af90ac7e28387 100644 --- a/bucket/freecad.json +++ b/bucket/freecad.json @@ -1,12 +1,12 @@ { - "version": "0.21.2", + "version": "1.0.0-conda-py311", "description": "A free and open-source multi-platform parametric 3D modeler.", "homepage": "https://www.freecadweb.org", "license": "LGPL-2.0-or-later", "architecture": { "64bit": { - "url": "https://github.com/FreeCAD/FreeCAD/releases/download/0.21.2/FreeCAD-0.21.2-Windows-x86_64.7z", - "hash": "06a8f162e3fa9bd8cc98c0cf117d1b3507b9a6564d3da0d16bc5e5c11d7e7880" + "url": "https://github.com/FreeCAD/FreeCAD/releases/download/1.0.0/FreeCAD_1.0.0-conda-Windows-x86_64-py311.7z", + "hash": "c32c43897172c2669ade854a4e71b9e158e7e86dfaf728e2aba0b6e3104347ae" } }, "pre_install": "pushd $dir ; mv */* . ; rm FreeCAD_* ; popd", @@ -19,13 +19,13 @@ ], "checkver": { "url": "https://api.github.com/repositories/5736080/releases", - "regex": "FreeCAD-([\\d.]+)-Windows-x86_64((-\\d+)?)\\.7z", - "replace": "${1}${2}" + "regex": "FreeCAD_(?[\\w.-]+)-Windows-x86_64-(?[\\w.-]+)\\.7z", + "replace": "${1}-${2}" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/FreeCAD/FreeCAD/releases/download/$matchHead/FreeCAD-$matchHead-Windows-x86_64$matchTail.7z" + "url": "https://github.com/FreeCAD/FreeCAD/releases/download/$matchHead/FreeCAD_$matchPrefix-Windows-x86_64-$matchSuffix.7z" } }, "hash": { From 591a7e3bf9089579525d025eb0399190e010a285 Mon Sep 17 00:00:00 2001 From: Aliaksandr Belik Date: Mon, 2 Dec 2024 03:23:18 +0300 Subject: [PATCH 2/2] freecad@1.0.0: Enhance checkver & autoupdate --- bucket/freecad.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bucket/freecad.json b/bucket/freecad.json index 3af90ac7e28387..9b78f24883813d 100644 --- a/bucket/freecad.json +++ b/bucket/freecad.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-conda-py311", + "version": "1.0.0", "description": "A free and open-source multi-platform parametric 3D modeler.", "homepage": "https://www.freecadweb.org", "license": "LGPL-2.0-or-later", @@ -19,13 +19,12 @@ ], "checkver": { "url": "https://api.github.com/repositories/5736080/releases", - "regex": "FreeCAD_(?[\\w.-]+)-Windows-x86_64-(?[\\w.-]+)\\.7z", - "replace": "${1}-${2}" + "regex": "FreeCAD_([\\d.]+)-conda-Windows-x86_64-(?[\\w.-]+)\\.7z" }, "autoupdate": { "architecture": { "64bit": { - "url": "https://github.com/FreeCAD/FreeCAD/releases/download/$matchHead/FreeCAD_$matchPrefix-Windows-x86_64-$matchSuffix.7z" + "url": "https://github.com/FreeCAD/FreeCAD/releases/download/$matchHead/FreeCAD_$version-conda-Windows-x86_64-$matchSuffix.7z" } }, "hash": {