From patchwork Tue Apr 5 12:20:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 38332 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ACA2827BBEA; Tue, 5 Apr 2022 13:22:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2048F27BBE9 for ; Tue, 5 Apr 2022 13:22:28 +0100 (BST) Received: from localhost ([::1]:52800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nbiCY-0001bm-2i for patchwork@mira.cbaines.net; Tue, 05 Apr 2022 08:22:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbiCA-0001Zk-Ox for guix-patches@gnu.org; Tue, 05 Apr 2022 08:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60130) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbiCA-00039r-FX for guix-patches@gnu.org; Tue, 05 Apr 2022 08:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nbiCA-0002pf-BJ for guix-patches@gnu.org; Tue, 05 Apr 2022 08:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54725] [PATCH 2/2] gnu: ungoogled-chromium: Update to 99.0.4844.84-1. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Apr 2022 12:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54725 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54725@debbugs.gnu.org Received: via spool by 54725-submit@debbugs.gnu.org id=B54725.164916127510799 (code B ref 54725); Tue, 05 Apr 2022 12:22:02 +0000 Received: (at 54725) by debbugs.gnu.org; 5 Apr 2022 12:21:15 +0000 Received: from localhost ([127.0.0.1]:54026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbiBJ-0002nw-PX for submit@debbugs.gnu.org; Tue, 05 Apr 2022 08:21:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbiBI-0002nS-M6 for 54725@debbugs.gnu.org; Tue, 05 Apr 2022 08:21:09 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbiBD-000312-FB for 54725@debbugs.gnu.org; Tue, 05 Apr 2022 08:21:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=gWiGBOnvNCIeNzQkqgUWtgvlsYsx84CMLR2lLgfurdQ=; b=mCV+QYtxdjgsjlAtcwCy 3+mrbviUqBvQU3AfZm4PPg/EI4t71zD5ioB56nhBSD3DPyTLjMSeC+dcYqjjt/agLkwNS1Di2RmBl SWjCPvAqvr6fe6gGalCaNCoofzh9XFPg2zSsUU+VuPIMnK1pAgQoTa10Q0HrCHyUCx6kglAUytqSa Tcp4QVhI+Q9MYhOpT5IRmUtzf1ojAai5MsR6ZI/ewdH5zuR7zWueGtb57d9NI0o8j/7K1Z2MuhM2v u2I/JQ53EiuZ31U0XH2RmrVF4SbJDrK3drmMeCM9aMTwf5mu08yivkDmf1YtLTvuSu4k2mfmMLZN+ 5mrfynjL/Emg5g==; Received: from eduroam-193-157-181-199.wlan.uio.no ([193.157.181.199]:54012 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbiBB-0005AO-NR for 54725@debbugs.gnu.org; Tue, 05 Apr 2022 08:21:03 -0400 From: Marius Bakke Date: Tue, 5 Apr 2022 14:20:55 +0200 Message-Id: <20220405122055.26649-2-marius@gnu.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220405122055.26649-1-marius@gnu.org> References: <20220405122055.26649-1-marius@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 99. (%chromium-version): Set to 99.0.4844.84. (%ungoogled-origin): Update hash. (ungoogled-chromium): Likewise. [arguments]: Patch absolute file names to GTK libraries. Patch one more Opus header inclusion. Remove labels in wrapping phase. [native-inputs]: Change from CLANG-13 to CLANG-14. [inputs]: Add AT-SPI2-ATK. --- gnu/packages/chromium.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 7ef1e5ac1b..75c48905db 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -133,6 +133,8 @@ (define %preserved-third-party-files "third_party/depot_tools/owners.py" ;BSD-3 "third_party/devtools-frontend" ;BSD-3 "third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat + "third_party/devtools-frontend/src/front_end/third_party\ +/additional_readme_paths.json" ;no explicit license; trivial "third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0 "third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3 "third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat @@ -310,7 +312,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "98.0.4758.102") +(define %chromium-version "99.0.4844.84") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/90.0.4430.85-1") @@ -322,7 +324,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0")))) + "1j02zcam09mdw7wg30r1mx27b8bw0s9dvk4qjl6vrhp24rbmscs7")))) (define* (debian-patch name hash #:optional (revision %debian-revision)) (origin @@ -451,7 +453,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1")) + "05bma8lsm5lad58mlfiv8bg0fw5k5mxh0v6g1ik7xp2bsd71iv10")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -595,6 +597,9 @@ (define-public ungoogled-chromium "#include \"opus/opus_types.h\""))) (find-files (string-append "third_party/webrtc/modules" "/audio_coding/codecs/opus"))) + (substitute* "media/audio/audio_opus_encoder.h" + (("\"third_party/opus/src/include/opus.h\"") + "")) (substitute* "third_party/webrtc/rtc_base/strings/json.h" (("#include \"third_party/jsoncpp/") @@ -637,7 +642,16 @@ (define-public ungoogled-chromium (libvulkan.so.1 (search-input-file inputs "/lib/libvulkan.so.1")) (mesa-lib (dirname (search-input-file inputs - "/lib/libGL.so.1")))) + "/lib/libGL.so.1"))) + (gtk-libs '("libgio-2.0.so.0" + "libgdk_pixbuf-2.0.so.0" + "libgdk-3.so.0" + "libgtk-3.so.0"))) + (for-each (lambda (lib) + (substitute* "ui/gtk/gtk_compat.cc" + ((lib) (search-input-file + inputs (string-append "lib/" lib))))) + gtk-libs) (substitute* "printing/cups_config_helper.py" (("cups_config =.*") (string-append "cups_config = '" cups-config "'\n"))) @@ -738,8 +752,9 @@ (define-public ungoogled-chromium #$(local-file (search-auxiliary-file "chromium/master-preferences.json"))) - (gtk+ (assoc-ref inputs "gtk+")) - (xdg-utils (assoc-ref inputs "xdg-utils"))) + (gtk (dirname (dirname + (search-input-file inputs "lib/libgtk-3.so")))) + (xdg-utils (dirname (search-input-file inputs "bin/xdg-open")))) (substitute* '("chrome/app/resources/manpage.1.in" "chrome/installer/linux/common/desktop.template") @@ -775,8 +790,8 @@ (define-public ungoogled-chromium (wrap-program exe ;; Avoid file manager crash. See . - `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))) - `("PATH" ":" prefix (,(string-append xdg-utils "/bin"))))) + `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk "/share"))) + `("PATH" ":" prefix (,xdg-utils)))) (with-directory-excursion "chrome/app/theme/chromium" (for-each @@ -789,7 +804,7 @@ (define-public ungoogled-chromium '("24" "48" "64" "128" "256"))))))))) (native-inputs (list bison - clang-13 + clang-14 gn gperf lld-as-ld-wrapper @@ -804,6 +819,7 @@ (define-public ungoogled-chromium (inputs (list alsa-lib atk + at-spi2-atk cups curl dbus