Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chromium: fix #3476

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions bucket/chromium-dev-nosync.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,41 @@
{
"version": "81.0.3998.0-r724962",
"description": "An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.",
"license": "BSD-3-Clause",
"version": "81.0.3998.0",
"description": "Browser aiming for safer, faster, and more stable way for all users to experience the web (macchrome's build)",
"homepage": "https://www.chromium.org",
"checkver": {
"url": "https://chromium.woolyss.com/api/v3/?os=windows&bit=64&type=dev-codecs-nosync&out=json",
"jsonpath": "$.chromium.windows.download",
"regex": "v([\\d.]+-r\\d+)-Win64"
"license": "BSD-3-Clause",
"architecture": {
"64bit": {
"url": "https://github.com/macchrome/chromium/releases/download/v81.0.3998.0-r724962-Win64/Chrome-bin.7z",
"hash": "sha1:b24e0e97324f4a1c1d8ae010144d90fbfd5725b3"
}
},
"bin": "chrome.exe",
"extract_dir": "Chrome-bin",
"bin": [
"chrome.exe",
[
"chrome.exe",
"chromium"
]
],
"shortcuts": [
[
"chrome.exe",
"Chromium (dev)"
]
],
"architecture": {
"64bit": {
"url": "https://github.com/macchrome/chromium/releases/download/v81.0.3998.0-r724962-Win64/Chrome-bin.7z",
"hash": "ac3a6a4519919e0a1a1895a49d61858a20bc539569b59e9a0759353b95abaf9e",
"extract_dir": "Chrome-bin"
}
"checkver": {
"url": "https://github.com/macchrome/chromium/releases",
"regex": "releases/tag/v([\\d.]+)-r(?<rev>\\d+)-Win64"
},
"autoupdate": {
"architecture": {
"64bit": {
"url": "https://github.com/macchrome/chromium/releases/download/v$version-Win64/Chrome-bin.7z"
"url": "https://github.com/macchrome/chromium/releases/download/v$version-r$matchRev-Win64/Chrome-bin.7z"
}
},
"hash": {
"url": "https://github.com/macchrome/chromium/releases/tag/v$version-r$matchRev-Win64",
"regex": "(?s)$basename.*?$sha1"
}
}
}
38 changes: 24 additions & 14 deletions bucket/chromium-dev.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,41 @@
{
"version": "74.0.3689.0-r627581",
"description": "An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.",
"license": "BSD-3-Clause",
"version": "81.0.3998.0",
"description": "Browser aiming for safer, faster, and more stable way for all users to experience the web (macchrome's build)",
"homepage": "https://www.chromium.org",
"checkver": {
"url": "https://chromium.woolyss.com/api/v3/?os=windows&bit=64&type=dev-codecs-sync&out=string",
"re": "v([\\d.]+-r(?:\\d+))-win64"
"license": "BSD-3-Clause",
"architecture": {
"64bit": {
"url": "https://github.com/macchrome/chromium/releases/download/v81.0.3998.0-r724962-Win64/Chrome-bin-sync.7z",
"hash": "sha1:19e61fbecc2587756cb13cc0ceb891211376555c"
}
},
"bin": "chrome.exe",
"extract_dir": "chrome-win32",
"extract_dir": "Chrome-bin-sync",
"bin": [
"chrome.exe",
[
"chrome.exe",
"chromium"
]
],
"shortcuts": [
[
"chrome.exe",
"Chromium (dev)"
]
],
"architecture": {
"64bit": {
"url": "https://github.com/henrypp/chromium/releases/download/v74.0.3689.0-r627581-win64/chromium-sync.zip",
"hash": "3553222dae406a0ab7203b5dac179dce811132861be0e51d3faca004b998b780"
}
"checkver": {
"url": "https://github.com/macchrome/chromium/releases",
"regex": "releases/tag/v([\\d.]+)-r(?<rev>\\d+)-Win64"
},
"autoupdate": {
"architecture": {
"64bit": {
"url": "https://github.com/henrypp/chromium/releases/download/v$version-win64/chromium-sync.zip"
"url": "https://github.com/macchrome/chromium/releases/download/v$version-r$matchRev-Win64/Chrome-bin-sync.7z"
}
},
"hash": {
"url": "https://github.com/macchrome/chromium/releases/tag/v$version-r$matchRev-Win64",
"regex": "(?s)$basename.*?$sha1"
}
}
}
52 changes: 33 additions & 19 deletions bucket/chromium-nosync.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,51 @@
{
"version": "67.0.3396.99-r550428",
"description": "An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.",
"license": "BSD-3-Clause",
"version": "79.0.3945.117",
"description": "Browser aiming for safer, faster, and more stable way for all users to experience the web (Hibbiki's build)",
"homepage": "https://www.chromium.org",
"checkver": {
"url": "https://chromium.woolyss.com/api/v3/?os=windows&bit=64&type=stable-codecs-nosync&out=string",
"re": "v([\\d.]+-r(?:\\d+))-win64"
"license": "BSD-3-Clause",
"architecture": {
"64bit": {
"url": "https://github.com/Hibbiki/chromium-win64/releases/download/v79.0.3945.117-r706915/mini_installer.nosync.exe#/dl.7z",
"hash": "sha1:3e0c10ac6fc36ecb61743b5381e57df77e7ceafe"
},
"32bit": {
"url": "https://github.com/Hibbiki/chromium-win32/releases/download/v79.0.3945.117-r706915/mini_installer.nosync.exe#/dl.7z",
"hash": "sha1:aa2572202362c272ad5f8eb47cd4aa0de14b1856"
}
},
"bin": "chrome.exe",
"extract_dir": "chrome-win32",
"pre_install": "Expand-7zipArchive \"$dir\\chrome.7z\" \"$dir\" -ExtractDir 'Chrome-bin' -Removal",
"bin": [
"chrome.exe",
[
"chrome.exe",
"chromium"
]
],
"shortcuts": [
[
"chrome.exe",
"Chromium"
]
],
"architecture": {
"64bit": {
"url": "https://github.com/henrypp/chromium/releases/download/v67.0.3396.99-r550428-win64/chromium-nosync.zip",
"hash": "ad3df8579b2cdf44d0b2263fd9d3e4547d91401a6bd18e29d601636948a80414"
},
"32bit": {
"url": "https://github.com/henrypp/chromium/releases/download/v67.0.3396.99-r550428-win32/chromium-nosync.zip",
"hash": "e7fe350de36614917d82582c205090dd3451041812d1f0fdfa54c33b8c08f825"
}
"checkver": {
"github": "https://github.com/Hibbiki/chromium-win64",
"regex": "v([\\d.]+)-r(?<rev>\\d+)"
},
"autoupdate": {
"architecture": {
"64bit": {
"url": "https://github.com/henrypp/chromium/releases/download/v$version-win64/chromium-nosync.zip"
"url": "https://github.com/Hibbiki/chromium-win64/releases/download/v$version-r$matchRev/mini_installer.nosync.exe#/dl.7z",
"hash": {
"url": "https://github.com/Hibbiki/chromium-win64/releases/v$version-r$matchRev",
"regex": "$sha1 /mnt/d/out/x64/$basename"
}
},
"32bit": {
"url": "https://github.com/henrypp/chromium/releases/download/v$version-win32/chromium-nosync.zip"
"url": "https://github.com/Hibbiki/chromium-win32/releases/download/v$version-r$matchRev/mini_installer.nosync.exe#/dl.7z",
"hash": {
"url": "https://github.com/Hibbiki/chromium-win32/releases/v$version-r$matchRev",
"regex": "$sha1 /mnt/d/out/x86/$basename"
}
}
}
}
Expand Down
38 changes: 19 additions & 19 deletions bucket/chromium.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
{
"##": "Check chromium.woolyss.com for different versions of Chromium releases.",
"version": "79.0.3945.117",
"description": "Browser aiming for safer, faster, and more stable way for all users to experience the web.",
"license": "BSD-3-Clause",
"description": "Browser aiming for safer, faster, and more stable way for all users to experience the web (Hibbiki's build)",
"homepage": "https://www.chromium.org",
"license": "BSD-3-Clause",
"architecture": {
"64bit": {
"url": "https://github.com/macchrome/winchrome/releases/download/v79.0.3945.117-r706915-Win64/ungoogled-chromium-79.0.3945.117-1_windows.7z",
"hash": "sha1:745c9dd30ec46cef517343bd953bb154ed44cbbb",
"extract_dir": "ungoogled-chromium-79.0.3945.117-1_windows"
"url": "https://github.com/Hibbiki/chromium-win64/releases/download/v79.0.3945.117-r706915/mini_installer.sync.exe#/dl.7z",
"hash": "sha1:4401d2d1e40a199ae6952e3f49bf1c3155fbbac8"
},
"32bit": {
"url": "https://github.com/macchrome/winchrome/releases/download/v79.0.3945.117-r706915-Win64/Ungoogled-Chromium-79.0.3945.117-Win32.7z",
"hash": "sha1:907094d8a3dd925b6db490bd8d65d50a3419f866",
"extract_dir": "Ungoogled-Chromium-79.0.3945.117-Win32"
"url": "https://github.com/Hibbiki/chromium-win32/releases/download/v79.0.3945.117-r706915/mini_installer.sync.exe#/dl.7z",
"hash": "sha1:9517b8d63728c71d78cd5d71ffd2528dd26064c4"
}
},
"pre_install": "Expand-7zipArchive \"$dir\\chrome.7z\" \"$dir\" -ExtractDir 'Chrome-bin' -Removal",
"bin": [
"chrome.exe",
[
Expand All @@ -30,23 +28,25 @@
]
],
"checkver": {
"github": "https://github.com/macchrome/winchrome",
"regex": "v([\\d.]+)-r(?<build>\\d+)-Win64"
"github": "https://github.com/Hibbiki/chromium-win64",
"regex": "v([\\d.]+)-r(?<rev>\\d+)"
},
"autoupdate": {
"architecture": {
"64bit": {
"url": "https://github.com/macchrome/winchrome/releases/download/v$version-r$matchBuild-Win64/ungoogled-chromium-$version-1_windows.7z",
"extract_dir": "ungoogled-chromium-$version-1_windows"
"url": "https://github.com/Hibbiki/chromium-win64/releases/download/v$version-r$matchRev/mini_installer.sync.exe#/dl.7z",
"hash": {
"url": "https://github.com/Hibbiki/chromium-win64/releases/v$version-r$matchRev",
"regex": "$sha1 /mnt/d/out/x64/$basename"
}
},
"32bit": {
"url": "https://github.com/macchrome/winchrome/releases/download/v$version-r$matchBuild-Win64/Ungoogled-Chromium-$version-Win32.7z",
"extract_dir": "Ungoogled-Chromium-$version-Win32"
"url": "https://github.com/Hibbiki/chromium-win32/releases/download/v$version-r$matchRev/mini_installer.sync.exe#/dl.7z",
"hash": {
"url": "https://github.com/Hibbiki/chromium-win32/releases/v$version-r$matchRev",
"regex": "$sha1 /mnt/d/out/x86/$basename"
}
}
},
"hash": {
"url": "https://github.com/macchrome/winchrome/releases/v$version-r$matchBuild-Win64",
"regex": "(?s)$basename.*?$sha1"
}
}
}
44 changes: 30 additions & 14 deletions bucket/ungoogled-chromium.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,51 @@
{
"version": "79.0.3945.117-1",
"description": "Modifications to Google Chromium for removing Google integration and enhancing privacy, control, and transparency.",
"version": "79.0.3945.117",
"description": "Modifications to Google Chromium for removing Google integration and enhancing privacy, control, and transparency (macchrome's build)",
"homepage": "https://github.com/Eloston/ungoogled-chromium",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we also change the homepage to "https://github.com/macchrome/winchrome"?

"license": {
"identifier": "BSD-3-Clause",
"url": "https://github.com/Eloston/ungoogled-chromium/blob/master/LICENSE"
},
"license": "BSD-3-Clause",
"architecture": {
"64bit": {
"url": "https://github.com/tangalbert919/ungoogled-chromium-binaries/releases/download/79.0.3945.117-1/ungoogled-chromium_79.0.3945.117-1.1_windows-x64.zip",
"hash": "64a20ae7bc8da0f987cb34dbd8430491cd5ec3082308498e479c8fd9db17e1bd",
"extract_dir": "ungoogled-chromium_79.0.3945.117-1.1_windows"
"url": "https://github.com/macchrome/winchrome/releases/download/v79.0.3945.117-r706915-Win64/ungoogled-chromium-79.0.3945.117-1_windows.7z",
"hash": "sha1:745c9dd30ec46cef517343bd953bb154ed44cbbb",
"extract_dir": "ungoogled-chromium-79.0.3945.117-1_windows"
},
"32bit": {
"url": "https://github.com/macchrome/winchrome/releases/download/v79.0.3945.117-r706915-Win64/Ungoogled-Chromium-79.0.3945.117-Win32.7z",
"hash": "sha1:907094d8a3dd925b6db490bd8d65d50a3419f866",
"extract_dir": "Ungoogled-Chromium-79.0.3945.117-Win32"
}
},
"bin": "chrome.exe",
"bin": [
"chrome.exe",
[
"chrome.exe",
"chromium"
]
],
"shortcuts": [
[
"chrome.exe",
"Ungoogled Chromium"
]
],
"checkver": {
"url": "https://ungoogled-software.github.io/ungoogled-chromium-binaries/releases/windows/64bit/",
"re": "\\d\">\\s*([\\d.-]+)<"
"github": "https://github.com/macchrome/winchrome",
"regex": "releases/tag/v([\\d.]+)-r(?<rev>\\d+)-Win64"
},
"autoupdate": {
"architecture": {
"64bit": {
"url": "https://github.com/tangalbert919/ungoogled-chromium-binaries/releases/download/$version/ungoogled-chromium_$version.1_windows-x64.zip",
"extract_dir": "ungoogled-chromium_$version.1_windows"
"url": "https://github.com/macchrome/winchrome/releases/download/v$version-r$matchRev-Win64/ungoogled-chromium-$version-1_windows.7z",
"extract_dir": "ungoogled-chromium-$version-1_windows"
},
"32bit": {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems the newest version of ungoogled-chromium has merged 32-bit version and 64-bit version.
Take this for example: https://github.com/macchrome/winchrome/releases/tag/v80.0.3987.132-r722274-Win64

Copy link
Contributor Author

@linsui linsui Mar 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the dev stop built 32 bit version for some reason.

"url": "https://github.com/macchrome/winchrome/releases/download/v$version-r$matchRev-Win64/Ungoogled-Chromium-$version-Win32.7z",
"extract_dir": "Ungoogled-Chromium-$version-Win32"
}
},
"hash": {
"url": "https://github.com/macchrome/winchrome/releases/tag/v$version-r$matchRev-Win64",
"regex": "(?s)$basename.*?$sha1"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the merge of 32-bit version and 64-bit version, the hash autoupdate will fail for 32-bit version.

}
}
}