amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: torbrowser: Update to 14.5.

Browse source 
* 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
Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
André Batista 2025-04-21 19:24:08 -03:00 • committed by Christopher Baines
parent 83074828a6
commit ed03e264ee
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 49 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

89
gnu/packages/tor-browsers.scm
View file

@ -116,22 +116,23 @@ Firefox locales.")
;; We copy the official build id, which is defined at ;; We copy the official build id, which is defined at
;; tor-browser-build/rbm.conf (browser_release_date). ;; 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/. ;; 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 ;; To find the last Firefox version, browse
;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> ;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version>
;; There should be only one archive that starts with ;; There should be only one archive that starts with
;; "src-firefox-tor-browser-". ;; "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. ;; See tor-browser-build/rbm.conf for the list.
(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" (define %torbrowser-locales (list "ar" "be" "bg" "ca" "cs" "da" "de" "el" "es-ES" "fa"
"ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" "fi" "fr" "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka"
"mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" "ko" "lt" "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR"
"sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) "pt-PT" "ro" "ru" "sq" "sv-SE" "th" "tr" "uk" "vi"
"zh-CN" "zh-TW"))
;; See tor-browser-build/projects/translation/config. ;; See tor-browser-build/projects/translation/config.
(define torbrowser-translation-base (define torbrowser-translation-base
@ -139,11 +140,11 @@ Firefox locales.")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.torproject.org/tpo/translation.git") (url "https://gitlab.torproject.org/tpo/translation.git")
(commit "d687be19490caa48a46a3e2193bda95d57cbb96d"))) (commit "86442427facf038d5706644221de7e2fb733550b")))
(file-name "translation-base-browser") (file-name "translation-base-browser")
(sha256 (sha256
(base32 (base32
"0hb4v0d898h7zxg9iwjvxjzh776wa65inysh4wdla51r0ib91w1b")))) "0s3zyz3hx88accvs31pnia4pq218hc8wvcyrym0525624iyqbld1"))))
;; See tor-browser-build/projects/translation/config. ;; See tor-browser-build/projects/translation/config.
(define torbrowser-translation-specific (define torbrowser-translation-specific
@ -151,11 +152,11 @@ Firefox locales.")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.torproject.org/tpo/translation.git") (url "https://gitlab.torproject.org/tpo/translation.git")
(commit "95b60f2679611d39b035f2e45555c2c3d64d991f"))) (commit "2c0b448503d52c3b512d1e7a55ccc78ac19db146")))
(file-name "translation-tor-browser") (file-name "translation-tor-browser")
(sha256 (sha256
(base32 (base32
"1lvdy586v0p84lilvx1z0x5y6ng1yy6aw12lg3xphfh0kr1ygi16")))) "08rdykhf98vcp5xflmkf15ax0zfn0nicdhp3zijjhfd0238rdjb9"))))
(define torbrowser-assets (define torbrowser-assets
;; This is a prebuilt Torbrowser from which we take the assets we need. ;; This is a prebuilt Torbrowser from which we take the assets we need.
@ -171,14 +172,13 @@ Firefox locales.")
version "/tor-browser-linux-x86_64-" version ".tar.xz")) version "/tor-browser-linux-x86_64-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1s65fr8crhlmgx449686f0s5k28gjia9wdq6d5rhif3d3r696cx1")))) "0v2nbw3glfp5597jpz190qi5rc6nd5j779jq1miv9c69ycs6cb61"))))
(arguments (arguments
(list (list
#:install-plan #:install-plan
''(("Browser" "." #:include-regexp ''(("Browser" "." #:include-regexp
("^\\./TorBrowser/Data/Tor/torrc-defaults" ("^\\./TorBrowser/Data/Tor/torrc-defaults"
"^\\./fonts/" "^\\./fonts/")))))
"^\\./fontconfig/fonts.conf")))))
(build-system copy-build-system) (build-system copy-build-system)
(home-page "https://www.torproject.org") (home-page "https://www.torproject.org")
(synopsis "Tor Browser assets") (synopsis "Tor Browser assets")
@ -187,8 +187,8 @@ Browser.")
(license license:silofl1.1))) (license license:silofl1.1)))
;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld. ;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld.
(define lld-as-ld-wrapper-16 (define lld-as-ld-wrapper-18
(make-lld-wrapper lld-16 #:lld-as-ld? #t)) (make-lld-wrapper lld-18 #:lld-as-ld? #t))
(define* (make-torbrowser #:key (define* (make-torbrowser #:key
moz-app-name moz-app-name
@ -213,7 +213,7 @@ Browser.")
".tar.xz")) ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1jq6jaiwr2jk7ayylnaha7rqk9g14ryybld817zhcqpldr0xmvyr")))) "1wns37fr9kbs2p2is3gc21r0ff69awryxwl25isr1fc2glksdlv7"))))
(build-system mozilla-build-system) (build-system mozilla-build-system)
(inputs (inputs
(list lyrebird (list lyrebird
@ -269,9 +269,9 @@ Browser.")
rust rust
`(,rust "cargo") `(,rust "cargo")
rust-cbindgen-0.26 rust-cbindgen-0.26
lld-as-ld-wrapper-16 ; for cargo rustc lld-as-ld-wrapper-18 ; for cargo rustc
llvm-16 llvm-18
clang-16 clang-18
perl perl
node-lts node-lts
python-wrapper python-wrapper
@ -530,7 +530,7 @@ Browser.")
(for-each (lambda (flag) (for-each (lambda (flag)
(format #t "ac_add_options ~a~%" flag)) (format #t "ac_add_options ~a~%" flag))
configure-flags))))) configure-flags)))))
;; See tor-browser-build/projects/firefox/build. ;; See tor-browser-build/projects/common/browser-localization.
(add-before 'configure 'copy-firefox-locales (add-before 'configure 'copy-firefox-locales
(lambda _ (lambda _
(let ((l10ncentral ".mozbuild/l10n-central") (let ((l10ncentral ".mozbuild/l10n-central")
@ -545,7 +545,7 @@ Browser.")
(lambda _ (lambda _
(let ((l10ncentral ".mozbuild/l10n-central")) (let ((l10ncentral ".mozbuild/l10n-central"))
;; Temporary copy so that we can use ‘mv’ to mimic ;; 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 (copy-recursively #$translation-base
"translation-base-browser") "translation-base-browser")
(for-each (for-each
@ -556,20 +556,13 @@ Browser.")
'("mv" '("mv"
"translation-base-browser/~a/base-browser.ftl" "translation-base-browser/~a/base-browser.ftl"
"~a/~a/toolkit/toolkit/global/")) "~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))) lang l10ncentral lang)))
(list #$@locales))))) (list #$@locales)))))
(add-after 'copy-basebrowser-locales 'copy-torbrowser-locales (add-after 'copy-basebrowser-locales 'copy-torbrowser-locales
(lambda _ (lambda _
(let ((l10ncentral ".mozbuild/l10n-central")) (let ((l10ncentral ".mozbuild/l10n-central"))
;; Temporary copy so that we can use ‘mv’ to mimic ;; 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 (copy-recursively #$translation-specific
"translation-tor-browser") "translation-tor-browser")
(for-each (for-each
@ -581,13 +574,31 @@ Browser.")
"translation-tor-browser/~a/tor-browser.ftl" "translation-tor-browser/~a/tor-browser.ftl"
"~a/~a/toolkit/toolkit/global/")) "~a/~a/toolkit/toolkit/global/"))
lang l10ncentral lang)) lang l10ncentral lang))
(mkdir-p (string-append l10ncentral "/" lang
"/" #$branding-directory))
(system (system
(format (format
#f (string-join #f (string-join
'("mv" '("mv"
"translation-tor-browser/~a" "translation-tor-browser/~a/branding/brand.ftl"
"toolkit/torbutton/chrome/locale/")) "~a/~a/~a/"))
lang)) lang l10ncentral lang #$branding-directory))
(system
(format
#f (string-join
'("mv"
"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"))) (let ((port (open-file "toolkit/torbutton/jar.mn" "a")))
(format port "% locale torbutton ~a %locale/~a/~%" (format port "% locale torbutton ~a %locale/~a/~%"
lang lang) lang lang)
@ -645,7 +656,7 @@ Browser.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((gtk #$(this-package-input "gtk+")) (let* ((gtk #$(this-package-input "gtk+"))
(gtk-share (string-append gtk "/share")) (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)) #$output #$moz-app-name))
(ld-libs '#$(cons (ld-libs '#$(cons
(file-append (file-append
@ -699,14 +710,12 @@ Browser.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((lib (string-append #$output "/lib/" #$moz-app-name))) (let ((lib (string-append #$output "/lib/" #$moz-app-name)))
;; Fonts ;; Fonts
(copy-recursively (in-vicinity #$assets "fontconfig")
(in-vicinity lib "fontconfig"))
(substitute* (in-vicinity lib "fontconfig/fonts.conf")
(("<dir prefix=\"cwd\">fonts</dir>")
(format #f "<dir>~a</dir>" (in-vicinity lib "fonts"))))
(delete-file-recursively (in-vicinity lib "fonts")) (delete-file-recursively (in-vicinity lib "fonts"))
(copy-recursively (in-vicinity #$assets "fonts") (copy-recursively (in-vicinity #$assets "fonts")
(in-vicinity lib "fonts"))))) (in-vicinity lib "fonts"))
(substitute* (in-vicinity lib "fonts/fonts.conf")
(("<dir prefix=\"cwd\">fonts</dir>")
(format #f "<dir>~a</dir>" (in-vicinity lib "fonts")))))))
(add-after 'deploy-fonts 'deploy-tor-assets (add-after 'deploy-fonts 'deploy-tor-assets
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((lib (in-vicinity #$output "lib/torbrowser")) (let ((lib (in-vicinity #$output "lib/torbrowser"))