[bug#74804] [PATCH 0/8] gnu: make-torbrowser: Unbundle, remove and update some inputs

[bug#74804] [PATCH 0/8] gnu: make-torbrowser: Unbundle, remove and update some inputs

[André Batista]

Hi Guix,

I'm sending this as a patch series for reviewers, maintainers and
build farmers convenience. Said differently, these patches are not
actually dependent on each other and so any of them can be dropped
or postponed if found to be problematic or undesired and it should
not break the browsers's build.

Cheers

André Batista (8):
  gnu: make-torbrowser: Unbundle libvpx.
  gnu: make-torbrowser: Unbundle libevent.
  gnu: make-torbrowser: Remove bzip2 from inputs.
  gnu: make-torbrowser: Remove bundled zlib from source.
  gnu: make-torbrowser: Unbundle libwebp.
  gnu: make-torbrowser: Use ffmpeg-7 as input.
  gnu: make-torbrowser: Unbundle nss.
  gnu: make-torbrowser: Re-enable rust SIMD optimizations.

 gnu/packages/tor-browsers.scm | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)


base-commit: 27750bd0cddddab9e900f289a5520314ef66487e
-- 
2.46.0

[bug#74804] [PATCH 1/8] gnu: make-torbrowser: Unbundle libvpx.

[André Batista]

* gnu/packages/tor-browsers.scm (make-torbrowser): Unbundle libvpx.
[arguments] <#:configure-flags>: Uncomment '--with-system-libvpx';
<#:phases> remove-bundled-libraries: Uncomment 'media/libvpx'.

Change-Id: Ie77cf4052a2b1e3e0959598c5e5d42bb397c666c
---
 gnu/packages/tor-browsers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index eef183a63ff..a573a2af78a 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -355,7 +355,7 @@ (define* (make-torbrowser #:key
          ;; UNBUNDLE-ME! "--with-system-ogg"
          ;; UNBUNDLE-ME! "--with-system-vorbis"
          ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released
-         ;; UNBUNDLE-ME! "--with-system-libvpx"
+         "--with-system-libvpx"
          "--with-system-icu"
          "--with-system-nspr"
          ;; UNBUNDLE-ME! "--with-system-nss" ; pending upgrade of 'nss' to 3.90
@@ -424,7 +424,7 @@ (define* (make-torbrowser #:key
                           ;; "media/libjpeg"  ; needed for now, because media/libjpeg/moz.build is referenced from config/external/moz.build
                           ;; UNBUNDLE-ME! "modules/zlib"
                           ;; UNBUNDLE-ME! "ipc/chromium/src/third_party/libevent"
-                          ;; UNBUNDLE-ME! "media/libvpx"
+                          "media/libvpx"
                           ;; UNBUNDLE-ME! "media/libogg"
                           ;; UNBUNDLE-ME! "media/libvorbis"
                           ;; UNBUNDLE-ME! "media/libtheora" ; wants theora-1.2, not yet released
-- 
2.46.0

[bug#74804] [PATCH 2/8] gnu: make-torbrowser: Unbundle libevent.

[André Batista]

* gnu/packages/tor-browsers.scm (make-torbrowser): Unbundle libevent.
[arguments] <#:configure-flags>: Uncomment '--with-system-libevent';
<#:phases> remove-bundled-libraries: Uncomment
ipc/chromium/src/third_party/libevent'.

Change-Id: I695ecd2648d6cd97c91297b0ad4e0d0985783b64
---
 gnu/packages/tor-browsers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index a573a2af78a..157e2ef8365 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -351,7 +351,7 @@ (define* (make-torbrowser #:key
          "--with-system-png"            ;must be libpng-apng
          "--with-system-zlib"
          ;; UNBUNDLE-ME! "--with-system-bz2"
-         ;; UNBUNDLE-ME! "--with-system-libevent"
+         "--with-system-libevent"
          ;; UNBUNDLE-ME! "--with-system-ogg"
          ;; UNBUNDLE-ME! "--with-system-vorbis"
          ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released
@@ -423,7 +423,7 @@ (define* (make-torbrowser #:key
                           "modules/freetype2"
                           ;; "media/libjpeg"  ; needed for now, because media/libjpeg/moz.build is referenced from config/external/moz.build
                           ;; UNBUNDLE-ME! "modules/zlib"
-                          ;; UNBUNDLE-ME! "ipc/chromium/src/third_party/libevent"
+                          "ipc/chromium/src/third_party/libevent"
                           "media/libvpx"
                           ;; UNBUNDLE-ME! "media/libogg"
                           ;; UNBUNDLE-ME! "media/libvorbis"
-- 
2.46.0

[bug#74804] [PATCH 3/8] gnu: make-torbrowser: Remove bzip2 from inputs.

[André Batista]

* gnu/packages/tor-browsers.scm (make-torbrowser) [inputs]: Remove bzip2
which is not needed anymore.
[arguments] <#:configure-flags>: Remove commented out
"--with-system-bz2', which was deprecated and removed upstream.

Change-Id: I623b405203d6560eaf641932dc3865bb27f0ee58
---
 gnu/packages/tor-browsers.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 157e2ef8365..ed2baf0558b 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -221,7 +221,6 @@ (define* (make-torbrowser #:key
            tor-client
            alsa-lib
            bash-minimal                 ;for wrap-program
-           bzip2
            cups
            dbus-glib
            gdk-pixbuf
@@ -350,7 +349,6 @@ (define* (make-torbrowser #:key
          "--with-system-jpeg"           ;must be libjpeg-turbo
          "--with-system-png"            ;must be libpng-apng
          "--with-system-zlib"
-         ;; UNBUNDLE-ME! "--with-system-bz2"
          "--with-system-libevent"
          ;; UNBUNDLE-ME! "--with-system-ogg"
          ;; UNBUNDLE-ME! "--with-system-vorbis"
-- 
2.46.0

[bug#74804] [PATCH 4/8] gnu: make-torbrowser: Remove bundled zlib from source.

[André Batista]

* gnu/packages/tor-browsers.scm (make-torbrowser) [arguments] <#:phases>:
remove-bundled-libraries: Uncomment 'modules/zlib'.

Change-Id: I96bc7416b0f69670cf03def0418cb0ced68ae28e
---
 gnu/packages/tor-browsers.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index ed2baf0558b..9b1187c5ca3 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -420,7 +420,7 @@ (define* (make-torbrowser #:key
                           ;;
                           "modules/freetype2"
                           ;; "media/libjpeg"  ; needed for now, because media/libjpeg/moz.build is referenced from config/external/moz.build
-                          ;; UNBUNDLE-ME! "modules/zlib"
+                          "modules/zlib"
                           "ipc/chromium/src/third_party/libevent"
                           "media/libvpx"
                           ;; UNBUNDLE-ME! "media/libogg"
-- 
2.46.0

[bug#74804] [PATCH 5/8] gnu: make-torbrowser: Unbundle libwebp.

[André Batista]

* gnu/packages/tor-browsers.scm (make-torbrowser): Unbundle libwebp.
[inputs]: Add libwebp;
[arguments] <#:configure-flags>: Add '--with-system-webp';
<#:phases> remove-bundled-libraries: Add 'media/libwebp'.

Change-Id: I409f00ee0c0a96d08ab93dca2a297dee6bafe56d
---
 gnu/packages/tor-browsers.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 9b1187c5ca3..5c32c3cb0c4 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -238,6 +238,7 @@ (define* (make-torbrowser #:key
            ;; UNBUNDLE-ME! libogg
            ;; UNBUNDLE-ME! libtheora ; wants theora-1.2, not yet released
            ;; UNBUNDLE-ME! libvorbis
+           libwebp
            libxft
            libevent
            libxinerama
@@ -348,6 +349,7 @@ (define* (make-torbrowser #:key
          ;; Avoid bundled libraries.
          "--with-system-jpeg"           ;must be libjpeg-turbo
          "--with-system-png"            ;must be libpng-apng
+         "--with-system-webp"
          "--with-system-zlib"
          "--with-system-libevent"
          ;; UNBUNDLE-ME! "--with-system-ogg"
@@ -427,6 +429,7 @@ (define* (make-torbrowser #:key
                           ;; UNBUNDLE-ME! "media/libvorbis"
                           ;; UNBUNDLE-ME! "media/libtheora" ; wants theora-1.2, not yet released
                           ;; UNBUNDLE-ME! "media/libtremor"
+                          "media/libwebp"
                           ;; UNBUNDLE-ME! "gfx/harfbuzz"
                           ;; UNBUNDLE-ME! "gfx/graphite2"
                           "js/src/ctypes/libffi"
-- 
2.46.0

[bug#74804] [PATCH 6/8] gnu: make-torbrowser: Use ffmpeg-7 as input.

[André Batista]

* gnu/packages/tor-browsers.scm (make-torbrowser) [inputs]: Use ffmpeg-7.

Change-Id: I957040ea6d58dca0c8b3e7b78283a55aac3308c1
---
 gnu/packages/tor-browsers.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 5c32c3cb0c4..1ad554a3b29 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -246,7 +246,7 @@ (define* (make-torbrowser #:key
            libxcomposite
            libxt
            libffi
-           ffmpeg
+           ffmpeg-7
            libvpx
            icu4c-73
            pixman
-- 
2.46.0

[bug#74804] [PATCH 7/8] gnu: make-torbrowser: Unbundle nss.

[André Batista]

* gnu/packages/tor-browsers.scm (make-torbrowser): Unbundle nss.
[inputs]: Add nss-rapid;
[arguments] <#:configure-flags>: Uncomment '--with-system-nss'.

Change-Id: I80ecf0bb82608b084b92fefae88e653c10d1f1c2
---
 gnu/packages/tor-browsers.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 1ad554a3b29..68ece90ed4d 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -257,7 +257,7 @@ (define* (make-torbrowser #:key
            hunspell
            libnotify
            nspr
-           ;; UNBUNDLE-ME! nss  (pending upgrade of 'nss' to 3.90 or later)
+           nss-rapid  ; requires v. 3.101, so nss won't cut it for now.
            shared-mime-info
            sqlite
            eudev
@@ -358,7 +358,7 @@ (define* (make-torbrowser #:key
          "--with-system-libvpx"
          "--with-system-icu"
          "--with-system-nspr"
-         ;; UNBUNDLE-ME! "--with-system-nss" ; pending upgrade of 'nss' to 3.90
+         "--with-system-nss"
 
          ;; UNBUNDLE-ME! "--with-system-harfbuzz"
          ;; UNBUNDLE-ME! "--with-system-graphite2"
@@ -405,7 +405,7 @@ (define* (make-torbrowser #:key
                           ;;"nsprpub"
                           ;;
                           ;; FIXME: Some of the bundled NSS sources are used
-                          ;; to build third_party/prio.
+                          ;; to build netwerk/socket/neqo_glue.
                           ;;"security/nss"
                           ;;
                           ;; TODO: Use more system media libraries.  See:
-- 
2.46.0

[bug#74804] [PATCH 8/8] gnu: make-torbrowser: Re-enable rust SIMD optimizations.

[André Batista]

* gnu/packages/tor-browsers.scm (make-torbrowser)[arguments]: Adjust the
configure-flags enable rust SIMD optimizations. This reverts commit
981ac81dac225c89ff60c4959819e5b91e5dd1f2, as both browsers are now based
on ESR 128.

Change-Id: I8a5c6cf3295d2ed277734ae96a2aa8a9e6d2d0f3
---
 gnu/packages/tor-browsers.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 68ece90ed4d..32294e2bad5 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -321,9 +321,7 @@ (define* (make-torbrowser #:key
          "--disable-debug"
          "--disable-debug-symbols"
 
-         ;; TODO: Re-enable after updating to the 128 ESR.
-         ;"--enable-rust-simd"
-         "--disable-rust-simd"
+         "--enable-rust-simd"
          "--enable-release"
          "--enable-optimize"
          "--enable-strip"
-- 
2.46.0

bug#74804: [PATCH 0/8] gnu: make-torbrowser: Unbundle, remove and update some inputs

[Hilton Chain]

Hi André,

On Thu, 12 Dec 2024 06:45:09 +0800,
André Batista wrote:
>
> Hi Guix,
>
> I'm sending this as a patch series for reviewers, maintainers and
> build farmers convenience. Said differently, these patches are not
> actually dependent on each other and so any of them can be dropped
> or postponed if found to be problematic or undesired and it should
> not break the browsers's build.
>
> Cheers
>
> André Batista (8):
>   gnu: make-torbrowser: Unbundle libvpx.
>   gnu: make-torbrowser: Unbundle libevent.
>   gnu: make-torbrowser: Remove bzip2 from inputs.
>   gnu: make-torbrowser: Remove bundled zlib from source.
>   gnu: make-torbrowser: Unbundle libwebp.
>   gnu: make-torbrowser: Use ffmpeg-7 as input.
>   gnu: make-torbrowser: Unbundle nss.
>   gnu: make-torbrowser: Re-enable rust SIMD optimizations.
>
>  gnu/packages/tor-browsers.scm | 27 +++++++++++++--------------
>  1 file changed, 13 insertions(+), 14 deletions(-)
>
>
> base-commit: 27750bd0cddddab9e900f289a5520314ef66487e
> --
> 2.46.0

Applied as 946e48d1d87e...fadfd48bc335 with changelog adjustments, thanks!