Package: guix-patches;
Reported by: André Batista <nandre <at> riseup.net>
Date: Mon, 21 Apr 2025 22:27:02 UTC
Severity: normal
Tags: patch
To reply to this bug, email your comments to 77976 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
nandre <at> riseup.net, clement <at> lassieur.org, hako <at> ultrarare.space, ian <at> retrospec.tv, jonathan.brielmaier <at> web.de, mhw <at> netris.org, guix-patches <at> gnu.org:bug#77976; Package guix-patches.
(Mon, 21 Apr 2025 22:27:02 GMT) Full text and rfc822 format available.André Batista <nandre <at> riseup.net>:nandre <at> riseup.net, clement <at> lassieur.org, hako <at> ultrarare.space, ian <at> retrospec.tv, jonathan.brielmaier <at> web.de, mhw <at> netris.org, guix-patches <at> gnu.org.
(Mon, 21 Apr 2025 22:27:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: André Batista <nandre <at> riseup.net> To: guix-patches <at> gnu.org Cc: André Batista <nandre <at> riseup.net> Subject: [PATCH 1/3] gnu: torbrowser: Update to 14.5. Date: Mon, 21 Apr 2025 19:24:08 -0300
* 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(-)
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")
- (("<dir prefix=\"cwd\">fonts</dir>")
- (format #f "<dir>~a</dir>" (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")
+ (("<dir prefix=\"cwd\">fonts</dir>")
+ (format #f "<dir>~a</dir>" (in-vicinity lib "fonts")))))))
(add-after 'deploy-fonts 'deploy-tor-assets
(lambda* (#:key inputs #:allow-other-keys)
(let ((lib (in-vicinity #$output "lib/torbrowser"))
base-commit: 4488cca17c9c02add8366dce9e8dd2f528c15a58
--
2.49.0
nandre <at> riseup.net, clement <at> lassieur.org, hako <at> ultrarare.space, ian <at> retrospec.tv, jonathan.brielmaier <at> web.de, mhw <at> netris.org, guix-patches <at> gnu.org:bug#77976; Package guix-patches.
(Mon, 21 Apr 2025 22:32:01 GMT) Full text and rfc822 format available.Message #8 received at 77976 <at> debbugs.gnu.org (full text, mbox):
From: André Batista <nandre <at> riseup.net> To: 77976 <at> debbugs.gnu.org Cc: André Batista <nandre <at> riseup.net> Subject: [PATCH 2/3] gnu: make-torbrowser: Untangle from x86-64. Date: Mon, 21 Apr 2025 19:31:06 -0300
* gnu/packages/tor-browsers.scm (make-torbrowser)[native-inputs]:
Use nasm only on x86.
[arguments] <#:phases> 'mozconfig: Conditionally select mozconfig file.
[supported-systems]: Restrict build to upstream supported architectures.
Change-Id: Ia13795f88ea84339b851f52537cffc779142d404
---
gnu/packages/tor-browsers.scm | 49 ++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 644bdac5ee..dd2f98f6b9 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -265,21 +265,22 @@ (define* (make-torbrowser #:key
zip
zlib))
(native-inputs
- (list
- rust
- `(,rust "cargo")
- rust-cbindgen-0.26
- lld-as-ld-wrapper-18 ; for cargo rustc
- llvm-18
- clang-18
- perl
- node-lts
- python-wrapper
- yasm
- nasm ; XXX FIXME: only needed on x86_64 and i686
- pkg-config
- m4
- which))
+ (append
+ (list
+ rust
+ `(,rust "cargo")
+ rust-cbindgen-0.26
+ lld-as-ld-wrapper-18 ; for cargo rustc
+ llvm-18
+ clang-18
+ perl
+ node-lts
+ python-wrapper
+ yasm
+ pkg-config
+ m4
+ which)
+ (if (target-x86?) (list nasm) '())))
(arguments
(list
#:tests? #f ;not worth the cost
@@ -524,12 +525,16 @@ (define (runpaths-of-input label)
(setenv "MOZ_BUILD_DATE" #$build-date)))
(add-before 'configure 'mozconfig
(lambda* (#:key configure-flags #:allow-other-keys)
- (with-output-to-file "mozconfig"
- (lambda ()
- (format #t ". $topsrcdir/mozconfig-linux-x86_64~%")
- (for-each (lambda (flag)
- (format #t "ac_add_options ~a~%" flag))
- configure-flags)))))
+ (let ((arch (cond (#$(target-arm32?) "arm")
+ (#$(target-aarch64?) "aarch64")
+ (#$(target-x86-32?) "i686")
+ (#$(target-x86-64?) "x86_64"))))
+ (with-output-to-file "mozconfig"
+ (lambda ()
+ (format #t ". $topsrcdir/mozconfig-linux-~a~%" arch)
+ (for-each (lambda (flag)
+ (format #t "ac_add_options ~a~%" flag))
+ configure-flags))))))
;; See tor-browser-build/projects/common/browser-localization.
(add-before 'configure 'copy-firefox-locales
(lambda _
@@ -798,6 +803,8 @@ (define (runpaths-of-input label)
(variable "ICECAT_SYSTEM_DIR")
(separator #f) ;single entry
(files '("lib/icecat")))))
+ (supported-systems (list "x86_64-linux" "i686-linux"
+ "aarch64-linux" "armhf-linux"))
(home-page "https://www.torproject.org")
(synopsis "Anonymous browser derived from Mozilla Firefox")
(description
--
2.49.0
nandre <at> riseup.net, clement <at> lassieur.org, hako <at> ultrarare.space, ian <at> retrospec.tv, jonathan.brielmaier <at> web.de, mhw <at> netris.org, guix-patches <at> gnu.org:bug#77976; Package guix-patches.
(Mon, 21 Apr 2025 22:33:02 GMT) Full text and rfc822 format available.Message #11 received at 77976 <at> debbugs.gnu.org (full text, mbox):
From: André Batista <nandre <at> riseup.net> To: 77976 <at> debbugs.gnu.org Cc: André Batista <nandre <at> riseup.net> Subject: [PATCH 3/3] gnu: mullvadbrowser: Update to 14.5. Date: Mon, 21 Apr 2025 19:31:26 -0300
* gnu/packages/tor-browsers.scm (%mullvadbrowser-build-date): Update to
20250414190325.
(%mullvadbrowser-version): Update to 14.5.
(%mullvadbrowser-firefox-version): Update to 128.9.0esr-14.5-1-build4.
(mullvadbrowser-translation-base): Update to
86442427facf038d5706644221de7e2fb733550b.
Change-Id: Ic12454eaafceda993339efae55984f86749cec75
---
gnu/packages/tor-browsers.scm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index dd2f98f6b9..f24c5e381b 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -834,17 +834,17 @@ (define %mullvadbrowser-locales (list "ar" "da" "de" "es-ES" "fa" "fi" "fr" "it"
;; We copy the official build id, which can be found there:
;; https://cdn.mullvad.net/browser/update_responses/update_1/release.
-(define %mullvadbrowser-build-date "20250331180000")
+(define %mullvadbrowser-build-date "20250414190325")
;; To find the last version, look at
;; https://mullvad.net/en/download/browser/linux.
-(define %mullvadbrowser-version "14.0.9")
+(define %mullvadbrowser-version "14.5")
;; To find the last Firefox version, browse
;; https://archive.torproject.org/tor-package-archive/mullvadbrowser/<%mullvadbrowser-version>
;; There should be only one archive that starts with
;; "src-firefox-mullvad-browser-".
-(define %mullvadbrowser-firefox-version "128.9.0esr-14.0-2-build2")
+(define %mullvadbrowser-firefox-version "128.9.0esr-14.5-1-build4")
;; See tor-browser-build/projects/translation/config.
(define mullvadbrowser-translation-base
@@ -852,11 +852,11 @@ (define mullvadbrowser-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 mullvadbrowser-translation-specific
@@ -884,7 +884,7 @@ (define mullvadbrowser-assets
version "/mullvad-browser-linux-x86_64-" version ".tar.xz"))
(sha256
(base32
- "1cs3fdsg8fig1hvp0pxhk3y0p9c4dm487284z75m8pga4janjrg6"))))
+ "1saq1mvvc4n4f48cmck12mrg78w9vnml04xqzp3dgwnjfq6jrb5s"))))
(arguments
(list
#:install-plan
@@ -927,7 +927,7 @@ (define-public mullvadbrowser
%mullvadbrowser-firefox-version ".tar.xz"))
(sha256
(base32
- "15ppwfji2xajws2gn3j0ln9yn140x0i5biccm9fjpdvbh64d1bim"))))
+ "02mpr1p0vxqkirvvxg7yjh6hgzfhdqgnfw87x27mvwqrwlf9j8pr"))))
(arguments
(substitute-keyword-arguments (package-arguments mullvadbrowser-base)
((#:phases phases)
--
2.49.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.