From d01310f24b42a9b06e28f1f4a5ef0eb6d67f34ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 4 Aug 2022 10:48:22 +0200 Subject: [PATCH] gnu: ungoogled-chromium: Update to 104.0.5112.81-1. * gnu/packages/chromium.scm (%chromium-version): Set to 104.0.5112.81. (%ungoogled-origin): Update hash. (ungoogled-chromium)[source](sha256): Likewise. [arguments]: Add snippet to fix build with system MINIZIP. Remove obsolete configure flag. --- gnu/packages/chromium.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 4f21335502..f27afc9743 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -316,7 +316,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "103.0.5060.134") +(define %chromium-version "104.0.5112.81") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") @@ -328,7 +328,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "00mpmyaa8bqxf1f4vhk1waxhjbhcwab8m1x1vf341al64f6bmr1r")))) + "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w")))) (define %debian-origin (origin @@ -477,7 +477,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4")) + "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -509,7 +509,6 @@ (define-public ungoogled-chromium "disable_fieldtrial_testing_config=true" "safe_browsing_mode=0" "enable_mdns=false" - "enable_one_click_signin=false" "enable_reading_list=false" "enable_remoting=false" "enable_reporting=false" @@ -596,6 +595,12 @@ (define-public ungoogled-chromium ;; This include path is added by Debians openjpeg patch. (("/usr/include/openjpeg-2.4") openjpeg)) + ;; Remove contrib/ prefix from minizip header inclusions. + (substitute* (find-files "third_party/tflite_support\ +/src/tensorflow_lite_support/metadata/cc") + (("contrib/minizip/") + "minizip/")) + (substitute* '("base/process/launch_posix.cc" "base/third_party/dynamic_annotations/dynamic_annotations.c"