diff options
| author | Marius Bakke <marius@gnu.org> | 2023-04-29 11:00:34 +0800 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2023-04-30 23:25:46 +0800 |
| commit | 7207c372fba172d7c0da70d9b2b5e54018dc3d00 (patch) | |
| tree | ec0506e5d518a6c6f0cfad8c129775e8e4790bbd /gnu/packages/chromium.scm | |
| parent | 8807828ff097cfe54dfb840ffe7e7b5ce3b0b65d (diff) | |
gnu: ungoogled-chromium: Update to 111.0.5563.146-1.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for M111.
(%chromium-version): Set to 111.0.5563.146.
(%ungoogled-origin): Update hash.
(%chromium-gcc-patchset, gcc-patch, %gcc-patches): Remove variables.
(%arch-patches): Remove obsolete.
(ungoogled-chromium)[source](sha256): Update hash.
Diffstat (limited to 'gnu/packages/chromium.scm')
| -rw-r--r-- | gnu/packages/chromium.scm | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 83c812c0fe3..2353b798fc4 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm | |||
| @@ -91,7 +91,9 @@ | |||
| 91 | "third_party/abseil-cpp" ;ASL2.0 | 91 | "third_party/abseil-cpp" ;ASL2.0 |
| 92 | "third_party/angle" ;BSD-3 | 92 | "third_party/angle" ;BSD-3 |
| 93 | "third_party/angle/src/common/third_party/xxhash" ;BSD-2 | 93 | "third_party/angle/src/common/third_party/xxhash" ;BSD-2 |
| 94 | "third_party/angle/src/third_party/ceval" ;Expat | ||
| 94 | "third_party/angle/src/third_party/libXNVCtrl" ;Expat | 95 | "third_party/angle/src/third_party/libXNVCtrl" ;Expat |
| 96 | "third_party/angle/src/third_party/systeminfo" ;BSD-2 | ||
| 95 | "third_party/angle/src/third_party/volk" ;Expat | 97 | "third_party/angle/src/third_party/volk" ;Expat |
| 96 | "third_party/apple_apsl" ;APSL2.0 | 98 | "third_party/apple_apsl" ;APSL2.0 |
| 97 | "third_party/axe-core" ;MPL2.0 | 99 | "third_party/axe-core" ;MPL2.0 |
| @@ -148,6 +150,8 @@ | |||
| 148 | "third_party/devtools-frontend/src/front_end/third_party/puppeteer" ;ASL2.0 | 150 | "third_party/devtools-frontend/src/front_end/third_party/puppeteer" ;ASL2.0 |
| 149 | "third_party/devtools-frontend/src/front_end/third_party/puppeteer\ | 151 | "third_party/devtools-frontend/src/front_end/third_party/puppeteer\ |
| 150 | /package/lib/esm/third_party/mitt" ;Expat | 152 | /package/lib/esm/third_party/mitt" ;Expat |
| 153 | "third_party/devtools-frontend/src/front_end/third_party\ | ||
| 154 | /vscode.web-custom-data" ;Expat | ||
| 151 | "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0 | 155 | "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0 |
| 152 | "third_party/devtools-frontend/src/third_party/i18n" ;ASL2.0 | 156 | "third_party/devtools-frontend/src/third_party/i18n" ;ASL2.0 |
| 153 | "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0 | 157 | "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0 |
| @@ -205,6 +209,7 @@ | |||
| 205 | "third_party/lss" ;BSD-3 | 209 | "third_party/lss" ;BSD-3 |
| 206 | "third_party/mako" ;Expat | 210 | "third_party/mako" ;Expat |
| 207 | "third_party/markupsafe" ;BSD-3 | 211 | "third_party/markupsafe" ;BSD-3 |
| 212 | "third_party/material_color_utilities" ;ASL2.0 | ||
| 208 | "third_party/mesa_headers" ;Expat, SGI | 213 | "third_party/mesa_headers" ;Expat, SGI |
| 209 | "third_party/metrics_proto" ;BSD-3 | 214 | "third_party/metrics_proto" ;BSD-3 |
| 210 | "third_party/minigbm" ;BSD-3 | 215 | "third_party/minigbm" ;BSD-3 |
| @@ -233,7 +238,6 @@ | |||
| 233 | "third_party/private_membership" ;ASL2.0 | 238 | "third_party/private_membership" ;ASL2.0 |
| 234 | "third_party/private-join-and-compute" ;ASL2.0 | 239 | "third_party/private-join-and-compute" ;ASL2.0 |
| 235 | "third_party/protobuf" ;BSD-3 | 240 | "third_party/protobuf" ;BSD-3 |
| 236 | "third_party/protobuf/third_party/six" ;Expat | ||
| 237 | "third_party/pthreadpool" ;BSD-2 | 241 | "third_party/pthreadpool" ;BSD-2 |
| 238 | "third_party/pyjson5" ;ASL2.0 | 242 | "third_party/pyjson5" ;ASL2.0 |
| 239 | "third_party/qcms" ;Expat | 243 | "third_party/qcms" ;Expat |
| @@ -313,7 +317,7 @@ | |||
| 313 | ;; run the Blink performance tests, just remove everything to save ~70MiB. | 317 | ;; run the Blink performance tests, just remove everything to save ~70MiB. |
| 314 | '("third_party/blink/perf_tests")) | 318 | '("third_party/blink/perf_tests")) |
| 315 | 319 | ||
| 316 | (define %chromium-version "110.0.5481.177") | 320 | (define %chromium-version "111.0.5563.146") |
| 317 | (define %ungoogled-revision (string-append %chromium-version "-1")) | 321 | (define %ungoogled-revision (string-append %chromium-version "-1")) |
| 318 | (define %debian-revision "debian/110.0.5481.177-1") | 322 | (define %debian-revision "debian/110.0.5481.177-1") |
| 319 | (define %arch-revision "a0b214b3bdfbc7ee3d9004a70494a2b9e3da2c80") | 323 | (define %arch-revision "a0b214b3bdfbc7ee3d9004a70494a2b9e3da2c80") |
| @@ -326,7 +330,7 @@ | |||
| 326 | (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) | 330 | (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) |
| 327 | (sha256 | 331 | (sha256 |
| 328 | (base32 | 332 | (base32 |
| 329 | "0rsvkbsrnfkdp3iw4s54kddw8r771h14hf1ivgahmn42yjafkk3n")))) | 333 | "14mlyygbqcys71y8dv2c9zszbrkfkmhk79y1synqzfd25biixd6m")))) |
| 330 | 334 | ||
| 331 | (define %debian-origin | 335 | (define %debian-origin |
| 332 | (origin | 336 | (origin |
| @@ -356,28 +360,6 @@ | |||
| 356 | "system/zlib.patch" | 360 | "system/zlib.patch" |
| 357 | "system/openjpeg.patch"))) | 361 | "system/openjpeg.patch"))) |
| 358 | 362 | ||
| 359 | (define %chromium-gcc-patchset | ||
| 360 | (let ((commit "chromium-110-patchset-4")) | ||
| 361 | (origin | ||
| 362 | (method git-fetch) | ||
| 363 | (uri (git-reference | ||
| 364 | (url "https://github.com/stha09/chromium-patches") | ||
| 365 | (commit commit))) | ||
| 366 | (file-name (git-file-name "chromium-gcc-patches" | ||
| 367 | (string-drop commit 9))) | ||
| 368 | (sha256 | ||
| 369 | (base32 | ||
| 370 | "1q36zgazw50rn2vgjdllw20hp400kvknfhp0ibc515r64hdzfdgy"))))) | ||
| 371 | |||
| 372 | (define (gcc-patch name) | ||
| 373 | (origin-file %chromium-gcc-patchset name)) | ||
| 374 | |||
| 375 | (define %gcc-patches | ||
| 376 | (map gcc-patch | ||
| 377 | '("chromium-110-NativeThemeBase-fabs.patch" | ||
| 378 | "chromium-110-CredentialUIEntry-const.patch" | ||
| 379 | "chromium-110-DarkModeLABColorSpace-pow.patch"))) | ||
| 380 | |||
| 381 | (define (arch-patch revision name hash) | 363 | (define (arch-patch revision name hash) |
| 382 | (origin | 364 | (origin |
| 383 | (method url-fetch) | 365 | (method url-fetch) |
| @@ -396,9 +378,7 @@ | |||
| 396 | (define %arch-patches | 378 | (define %arch-patches |
| 397 | (list | 379 | (list |
| 398 | (arch-patch %arch-revision "disable-GlobalMediaControlsCastStartStop.patch" | 380 | (arch-patch %arch-revision "disable-GlobalMediaControlsCastStartStop.patch" |
| 399 | "00m361ka38d60zpbss7qnfw80vcwnip2pjcz3wf46wd2sqi1nfvz") | 381 | "00m361ka38d60zpbss7qnfw80vcwnip2pjcz3wf46wd2sqi1nfvz"))) |
| 400 | (arch-patch %arch-revision "fix-the-way-to-handle-codecs-in-the-system-icu.patch" | ||
| 401 | "1qy7ldw7lnfbg0dl49m7myrflw0ps80adaisq5dqjndhn0rcbmd5"))) | ||
| 402 | 382 | ||
| 403 | (define %guix-patches | 383 | (define %guix-patches |
| 404 | (list (local-file | 384 | (list (local-file |
| @@ -418,7 +398,7 @@ | |||
| 418 | (search-patch "ungoogled-chromium-system-nspr.patch"))))) | 398 | (search-patch "ungoogled-chromium-system-nspr.patch"))))) |
| 419 | 399 | ||
| 420 | (define %patches | 400 | (define %patches |
| 421 | (append %debian-patches %arch-patches %gcc-patches %guix-patches)) | 401 | (append %debian-patches %arch-patches %guix-patches)) |
| 422 | 402 | ||
| 423 | ;; This is a source 'snippet' that does the following: | 403 | ;; This is a source 'snippet' that does the following: |
| 424 | ;; *) Applies various patches for unbundling purposes and libstdc++ compatibility. | 404 | ;; *) Applies various patches for unbundling purposes and libstdc++ compatibility. |
| @@ -511,7 +491,7 @@ | |||
| 511 | %chromium-version ".tar.xz")) | 491 | %chromium-version ".tar.xz")) |
| 512 | (sha256 | 492 | (sha256 |
| 513 | (base32 | 493 | (base32 |
| 514 | "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv")) | 494 | "1zmm926fsifqaw60ilfav017xxnvnhvqbbq7qcrhdyjm3fiiyw0y")) |
| 515 | (modules '((guix build utils))) | 495 | (modules '((guix build utils))) |
| 516 | (snippet (force ungoogled-chromium-snippet)))) | 496 | (snippet (force ungoogled-chromium-snippet)))) |
| 517 | (build-system gnu-build-system) | 497 | (build-system gnu-build-system) |
