diff options
author | Mathieu Othacehe <othacehe@gnu.org> | 2020-08-26 18:35:14 +0200 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-08-26 18:35:14 +0200 |
commit | 17dddeeee560527a8f30d37761949d658056cb09 (patch) | |
tree | 15b0b19c55787f556eb9b42c28d173bddc5435db /gnu/packages/chromium.scm | |
parent | 331a09654eb7e9f6212b7e8469077fa7393e8b11 (diff) | |
parent | 6a9581741e4ee81226aeb2f1c997df76670a6aab (diff) | |
download | guix-patches-17dddeeee560527a8f30d37761949d658056cb09.tar guix-patches-17dddeeee560527a8f30d37761949d658056cb09.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/chromium.scm')
-rw-r--r-- | gnu/packages/chromium.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index d828c25bc2..cc75c3201a 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -227,6 +227,7 @@ "third_party/swiftshader/third_party/marl" ;ASL2.0 "third_party/swiftshader/third_party/subzero" ;NCSA "third_party/swiftshader/third_party/SPIRV-Headers" ;X11-style + "third_party/tcmalloc/chromium" ;BSD-3 "third_party/usb_ids" ;BSD-3 "third_party/usrsctp" ;BSD-2 "third_party/vulkan_memory_allocator" ;Expat @@ -288,7 +289,7 @@ (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %ungoogled-revision "df199c04ff367da59ce52a23a3f3b305dd3b00c3") +(define %ungoogled-revision "57244cdfc21dc05910862152d91cc528103c988a") (define %debian-revision "debian/83.0.4103.116-3") (define %gentoo-revision "f3f649046d31ebdbc8c4a302b2384504eff78027") @@ -330,7 +331,7 @@ chromium-fix-vaapi-on-intel.patch?h=packages/chromium\ (string-take %ungoogled-revision 7))) (sha256 (base32 - "1bqvcq3dj6615198j7cz3ylyyic5zpis06capvl6ybl1na3ainb0")))) + "15a1xpmabdxr1mn61m0jm9a5l987rxdji8b1b6zy39mr636vcwfi")))) ;; This is a source 'snippet' that does the following: ;; *) Applies various patches for unbundling purposes and libstdc++ compatibility. @@ -449,7 +450,7 @@ chromium-fix-vaapi-on-intel.patch?h=packages/chromium\ (define-public ungoogled-chromium (package (name "ungoogled-chromium") - (version (string-append "84.0.4147.89-0." + (version (string-append "84.0.4147.125-0." (string-take %ungoogled-revision 7))) (synopsis "Graphical web browser") (source (origin @@ -459,7 +460,7 @@ chromium-fix-vaapi-on-intel.patch?h=packages/chromium\ (car (string-split version #\-)) ".tar.xz")) (sha256 (base32 - "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp")) + "1xdg9pnnvbzasmra09rl7wdrir61rfcqml46jj7kv39drwk9chwq")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -490,7 +491,6 @@ chromium-fix-vaapi-on-intel.patch?h=packages/chromium\ "goma_dir=\"\"" "enable_nacl=false" "enable_nacl_nonsfi=false" - "use_allocator=\"none\"" "use_unofficial_version_number=false" "treat_warnings_as_errors=false" "use_official_google_api_keys=false" |