From patchwork Mon Apr 21 22:24:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 41908 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 E407A27BC4A; Mon, 21 Apr 2025 23:27:43 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 E8E8927BC49 for ; Mon, 21 Apr 2025 23:27:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6zbv-0003Vf-Jj; Mon, 21 Apr 2025 18:27:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6zbh-0003S4-7x for guix-patches@gnu.org; Mon, 21 Apr 2025 18:27:20 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u6zbg-0007Wt-GC for guix-patches@gnu.org; Mon, 21 Apr 2025 18:27:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=/BfgKikVG84nFaVQhjG/H+4twNrwzl+wHn++mVzVo4c=; b=WwgbE8PKpYhhewZ6mLnhsD+sxQgNLPNIMyIIHMHzv531n9rLpon36hVFA45m0KSFl9/0gwNrJ+uV1eORdfs+PxdU8mcyi60tZkYLdM3GbrEeYKunMBLjRpS4tIsGMae5KajLWQfDZtR1+0Qji0siFrwLg8AnycYd299o5tdMv0wnl+/DvvMHsgynwU2eD91QECJfVUh17qFt+HjN1nNZIQD/Kf5z2xdj7k21gCoQrA38Tv5NbcDekeNesfcE1eRn1U32QJ0ntQbqBB/Mdhgmlsd5TAmpVfKTA9JZkUYAfuAyeHusBMNdT536Pdy/vMGKHsimT4VXwiJvm29yLND+sA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6zbS-0004JC-S6; Mon, 21 Apr 2025 18:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77976] [PATCH 1/3] gnu: torbrowser: Update to 14.5. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: nandre@riseup.net, clement@lassieur.org, hako@ultrarare.space, ian@retrospec.tv, jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Mon, 21 Apr 2025 22:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77976 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77976@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista , nandre@riseup.net, clement@lassieur.org, hako@ultrarare.space, ian@retrospec.tv, jonathan.brielmaier@web.de, mhw@netris.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: nandre@riseup.net, clement@lassieur.org, hako@ultrarare.space, ian@retrospec.tv, jonathan.brielmaier@web.de, mhw@netris.org Received: via spool by submit@debbugs.gnu.org id=B.174527436416147 (code B ref -1); Mon, 21 Apr 2025 22:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Apr 2025 22:26:04 +0000 Received: from localhost ([127.0.0.1]:40514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6zaU-0004C5-MP for submit@debbugs.gnu.org; Mon, 21 Apr 2025 18:26:04 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49660) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u6zaR-0004BV-HI for submit@debbugs.gnu.org; Mon, 21 Apr 2025 18:26:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6zaL-0002w6-Ce for guix-patches@gnu.org; Mon, 21 Apr 2025 18:25:53 -0400 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6zaH-0007P4-0j for guix-patches@gnu.org; Mon, 21 Apr 2025 18:25:53 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4ZhKhB1zrqzDqVc for ; Mon, 21 Apr 2025 22:25:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1745274346; bh=RX7/C1UR6bKwIo95Y/udaZ5X9DkpJj+jrYAHCS/U0mw=; h=From:To:Cc:Subject:Date:From; b=givHQdBbvbazovFmgrecu2UmU6jOsTl1zJlH06nr27JlOqXIaPcjbhGZLnDJxteLy /E8dgPZ/rwX4L5TDGcWFJy20eh6ekQh7Oro6UhmSPnXRgjqWtdZDDoDGhg1P818rWe Ns6klEpysD09Vr2f9MSkmi2+gKecLGBRwcRECgD0= X-Riseup-User-ID: 3C1D884CBBCB69160355DC505B3DAACB27FA83C60753355BAEF3470D520AA0A6 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4ZhKh86h0HzFw57; Mon, 21 Apr 2025 22:25:44 +0000 (UTC) From: =?utf-8?b?QW5kcsOp?= Batista Date: Mon, 21 Apr 2025 19:24:08 -0300 Message-ID: <20250421222418.4671-1-nandre@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=nandre@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to 20250414190325. (%torbrowser-version): Update to 14.5. (%torbrowser-firefox-version): Update to 128.9.0esr-14.5-1-build4. (%torbrowser-locales): Add be, bg and pt-PT. (torbrowser-translation-base): Update to 86442427facf038d5706644221de7e2fb733550b. (torbrowser-translation-specific): Update to 2c0b448503d52c3b512d1e7a55ccc78ac19db146. (torbrowser-assets)[arguments]<#:install-plan>: Remove fontconfig/fonts.conf, as fonts.conf was moved to fonts directory. (make-torbrowser)[native-inputs]: Update llvm, clang and lld to v18. [arguments]<#:phases> 'copy-basebrowser-locales & 'copy-torbrowser-locales: Adjust to follow upstream changes. 'deploy-fonts: Adjust to new fonts.conf location. Change-Id: I81768c1680d8a3200fb360f1e7a45d7d16aca91d --- gnu/packages/tor-browsers.scm | 89 +++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 40 deletions(-) base-commit: 4488cca17c9c02add8366dce9e8dd2f528c15a58 diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 62f64baeee..644bdac5ee 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -116,22 +116,23 @@ (define firefox-locales ;; We copy the official build id, which is defined at ;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20250331180000") +(define %torbrowser-build-date "20250414190325") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "14.0.9") +(define %torbrowser-version "14.5") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "128.9.0esr-14.0-2-build2") +(define %torbrowser-firefox-version "128.9.0esr-14.5-1-build4") ;; See tor-browser-build/rbm.conf for the list. -(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" - "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" - "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" - "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) +(define %torbrowser-locales (list "ar" "be" "bg" "ca" "cs" "da" "de" "el" "es-ES" "fa" + "fi" "fr" "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" + "ko" "lt" "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" + "pt-PT" "ro" "ru" "sq" "sv-SE" "th" "tr" "uk" "vi" + "zh-CN" "zh-TW")) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base @@ -139,11 +140,11 @@ (define torbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "d687be19490caa48a46a3e2193bda95d57cbb96d"))) + (commit "86442427facf038d5706644221de7e2fb733550b"))) (file-name "translation-base-browser") (sha256 (base32 - "0hb4v0d898h7zxg9iwjvxjzh776wa65inysh4wdla51r0ib91w1b")))) + "0s3zyz3hx88accvs31pnia4pq218hc8wvcyrym0525624iyqbld1")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -151,11 +152,11 @@ (define torbrowser-translation-specific (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "95b60f2679611d39b035f2e45555c2c3d64d991f"))) + (commit "2c0b448503d52c3b512d1e7a55ccc78ac19db146"))) (file-name "translation-tor-browser") (sha256 (base32 - "1lvdy586v0p84lilvx1z0x5y6ng1yy6aw12lg3xphfh0kr1ygi16")))) + "08rdykhf98vcp5xflmkf15ax0zfn0nicdhp3zijjhfd0238rdjb9")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -171,14 +172,13 @@ (define torbrowser-assets version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1s65fr8crhlmgx449686f0s5k28gjia9wdq6d5rhif3d3r696cx1")))) + "0v2nbw3glfp5597jpz190qi5rc6nd5j779jq1miv9c69ycs6cb61")))) (arguments (list #:install-plan ''(("Browser" "." #:include-regexp ("^\\./TorBrowser/Data/Tor/torrc-defaults" - "^\\./fonts/" - "^\\./fontconfig/fonts.conf"))))) + "^\\./fonts/"))))) (build-system copy-build-system) (home-page "https://www.torproject.org") (synopsis "Tor Browser assets") @@ -187,8 +187,8 @@ (define torbrowser-assets (license license:silofl1.1))) ;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld. -(define lld-as-ld-wrapper-16 - (make-lld-wrapper lld-16 #:lld-as-ld? #t)) +(define lld-as-ld-wrapper-18 + (make-lld-wrapper lld-18 #:lld-as-ld? #t)) (define* (make-torbrowser #:key moz-app-name @@ -213,7 +213,7 @@ (define* (make-torbrowser #:key ".tar.xz")) (sha256 (base32 - "1jq6jaiwr2jk7ayylnaha7rqk9g14ryybld817zhcqpldr0xmvyr")))) + "1wns37fr9kbs2p2is3gc21r0ff69awryxwl25isr1fc2glksdlv7")))) (build-system mozilla-build-system) (inputs (list lyrebird @@ -269,9 +269,9 @@ (define* (make-torbrowser #:key rust `(,rust "cargo") rust-cbindgen-0.26 - lld-as-ld-wrapper-16 ; for cargo rustc - llvm-16 - clang-16 + lld-as-ld-wrapper-18 ; for cargo rustc + llvm-18 + clang-18 perl node-lts python-wrapper @@ -530,7 +530,7 @@ (define (runpaths-of-input label) (for-each (lambda (flag) (format #t "ac_add_options ~a~%" flag)) configure-flags))))) - ;; See tor-browser-build/projects/firefox/build. + ;; See tor-browser-build/projects/common/browser-localization. (add-before 'configure 'copy-firefox-locales (lambda _ (let ((l10ncentral ".mozbuild/l10n-central") @@ -545,7 +545,7 @@ (define (runpaths-of-input label) (lambda _ (let ((l10ncentral ".mozbuild/l10n-central")) ;; Temporary copy so that we can use ‘mv’ to mimic - ;; tor-browser-build/projects/firefox/build. + ;; tor-browser-build/projects/common/browser-localization (copy-recursively #$translation-base "translation-base-browser") (for-each @@ -556,20 +556,13 @@ (define (runpaths-of-input label) '("mv" "translation-base-browser/~a/base-browser.ftl" "~a/~a/toolkit/toolkit/global/")) - lang l10ncentral lang)) - (system - (format - #f (string-join - '("mv" - "translation-base-browser/~a/*" - "~a/~a/browser/chrome/browser/")) lang l10ncentral lang))) (list #$@locales))))) (add-after 'copy-basebrowser-locales 'copy-torbrowser-locales (lambda _ (let ((l10ncentral ".mozbuild/l10n-central")) ;; Temporary copy so that we can use ‘mv’ to mimic - ;; tor-browser-build/projects/firefox/build. + ;; tor-browser-build/projects/common/browser-localization (copy-recursively #$translation-specific "translation-tor-browser") (for-each @@ -581,13 +574,31 @@ (define (runpaths-of-input label) "translation-tor-browser/~a/tor-browser.ftl" "~a/~a/toolkit/toolkit/global/")) lang l10ncentral lang)) + (mkdir-p (string-append l10ncentral "/" lang + "/" #$branding-directory)) + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a/branding/brand.ftl" + "~a/~a/~a/")) + lang l10ncentral lang #$branding-directory)) (system (format #f (string-join '("mv" - "translation-tor-browser/~a" - "toolkit/torbutton/chrome/locale/")) - lang)) + "translation-tor-browser/~a/brand.properties" + "~a/~a/~a/")) + lang l10ncentral lang #$branding-directory)) + (mkdir-p (string-append "toolkit/torbutton/chrome/locale/" + lang)) + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a/*.properties" + "toolkit/torbutton/chrome/locale/~a/")) + lang lang)) (let ((port (open-file "toolkit/torbutton/jar.mn" "a"))) (format port "% locale torbutton ~a %locale/~a/~%" lang lang) @@ -645,7 +656,7 @@ (define (runpaths-of-input label) (lambda* (#:key inputs #:allow-other-keys) (let* ((gtk #$(this-package-input "gtk+")) (gtk-share (string-append gtk "/share")) - (fonts.conf (format #f "~a/lib/~a/fontconfig/fonts.conf" + (fonts.conf (format #f "~a/lib/~a/fonts/fonts.conf" #$output #$moz-app-name)) (ld-libs '#$(cons (file-append @@ -699,14 +710,12 @@ (define (runpaths-of-input label) (lambda* (#:key inputs #:allow-other-keys) (let ((lib (string-append #$output "/lib/" #$moz-app-name))) ;; Fonts - (copy-recursively (in-vicinity #$assets "fontconfig") - (in-vicinity lib "fontconfig")) - (substitute* (in-vicinity lib "fontconfig/fonts.conf") - (("fonts") - (format #f "~a" (in-vicinity lib "fonts")))) (delete-file-recursively (in-vicinity lib "fonts")) (copy-recursively (in-vicinity #$assets "fonts") - (in-vicinity lib "fonts"))))) + (in-vicinity lib "fonts")) + (substitute* (in-vicinity lib "fonts/fonts.conf") + (("fonts") + (format #f "~a" (in-vicinity lib "fonts"))))))) (add-after 'deploy-fonts 'deploy-tor-assets (lambda* (#:key inputs #:allow-other-keys) (let ((lib (in-vicinity #$output "lib/torbrowser"))