From cfce7a5f9059faabd2ab48dbf1f2a6f1f5ce3e68 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 8 Dec 2021 10:49:27 +0100 Subject: [PATCH 01/10] firefox: Update version from 94.0.2 to 95.0 https://www.mozilla.org/en-US/firefox/95.0/releasenotes/ --- firefox.be0 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/firefox.be0 b/firefox.be0 index 92146bfa3..308525927 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -2,14 +2,13 @@ #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80' -# BEE_VERSION firefox-94.0.2-0 +# BEE_VERSION firefox-95.0-0 #https://ftp.mozilla.org/pub/firefox/releases/$pkgversion/SOURCE to find the right download link # SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" -SRCURL[0]="https://beehive.molgen.mpg.de/10c84ed01aaf2bbf0e79ba4be8f96506/firefox-94.0.2.source.tar.xz" +SRCURL[0]="https://beehive.molgen.mpg.de/c560438ea86c5faeace6bc4150f8ccbe/firefox-95.0.source.tar.xz" -# https://salsa.debian.org/mozilla-team/firefox/-/commit/9bc353bb426f93932e4fdd36f437dad04d099da1 -PATCHURL+=(https://beehive.molgen.mpg.de/df3a19a055c83f5365c5fa0c88e0eb0f/firefox-94.0.2-cubeb-pulse.patch) +# PATCHURL+=() #BEE_BUILDTYPE=autotools #build_in_sourcedir From 9b7d51bdef2ee7e1eb0acf53baa3c9c6f5ffe618 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 14 Mar 2022 09:37:30 +0100 Subject: [PATCH 02/10] firefox: Update version from 95.0 to 98.0 https://www.mozilla.org/en-US/firefox/releases/ Use Rust 1.59.0. --- firefox.be0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/firefox.be0 b/firefox.be0 index 308525927..dfefadcf4 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -2,11 +2,11 @@ #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80' -# BEE_VERSION firefox-95.0-0 +# BEE_VERSION firefox-98.0-0 #https://ftp.mozilla.org/pub/firefox/releases/$pkgversion/SOURCE to find the right download link -# SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" -SRCURL[0]="https://beehive.molgen.mpg.de/c560438ea86c5faeace6bc4150f8ccbe/firefox-95.0.source.tar.xz" +SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" +#SRCURL[0]="https://beehive.molgen.mpg.de/c560438ea86c5faeace6bc4150f8ccbe/firefox-95.0.source.tar.xz" # PATCHURL+=() @@ -16,7 +16,7 @@ SRCURL[0]="https://beehive.molgen.mpg.de/c560438ea86c5faeace6bc4150f8ccbe/firefo mee_configure() { . /usr/local/package/lib/node.profile - . /pkg/rustc-1.56.1-0/profile + . /pkg/rustc-1.59.0-0/profile cat > ${S}/mozconfig <<-EOF ac_add_options --prefix=/usr From 502b7d393e1fe0caa58d0c009280adb93321cef1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 14 Mar 2022 09:47:16 +0100 Subject: [PATCH 03/10] firefox: Indent by four spaces --- firefox.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/firefox.be0 b/firefox.be0 index dfefadcf4..acea0ec62 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -38,9 +38,9 @@ mee_configure() { } mee_build() { - export CARGO_HOME=$B/.cargo - export MACH_USE_SYSTEM_PYTHON=1 - ${S}/mach build + export CARGO_HOME=$B/.cargo + export MACH_USE_SYSTEM_PYTHON=1 + ${S}/mach build } mee_build_post() { From 7a6c51824dc215acfbb4275a7a7169984063a439 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 14 Mar 2022 09:47:35 +0100 Subject: [PATCH 04/10] firefox: Build with Python from Firefox Remove `MACH_USE_SYSTEM_PYTHON=1` as our [MarIuX Python installation does not satisfy the version requirements][1]: WARNING: You are using pip version 21.3.1; however, version 22.0.4 is available. You should consider upgrading via the '/scratch/local/tmp_ft1mxyo/bin/python -m pip install --upgrade pip' command. pygenometracks 3.6 requires pytest, which is not installed. requests-cache 0.8.1 has requirement attrs<22.0,>=21.2, but you have attrs 19.2.0. pygenometracks 3.6 has requirement matplotlib<=3.3.2,>=3.1.1, but you have matplotlib 3.4.3. cattrs 1.8.0 has requirement attrs>=20, but you have attrs 19.2.0. tensorflow 2.5.0 has requirement flatbuffers~=1.12.0, but you have flatbuffers 2.0. tensorflow 2.5.0 has requirement h5py~=3.1.0, but you have h5py 3.4.0. tensorflow 2.5.0 has requirement six~=1.15.0, but you have six 1.13.0. tensorflow 2.5.0 has requirement typing_extensions~=3.7.4, but you have typing-extensions 3.10.0.0. [1]: https://github.molgen.mpg.de/mariux64/pkg-scripts/issues/181 --- firefox.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/firefox.be0 b/firefox.be0 index acea0ec62..a85130117 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -39,7 +39,6 @@ mee_configure() { mee_build() { export CARGO_HOME=$B/.cargo - export MACH_USE_SYSTEM_PYTHON=1 ${S}/mach build } From 39420fabf41d45718eccc02294d63083e96283e0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 14 Mar 2022 09:59:10 +0100 Subject: [PATCH 05/10] firefox: Enable bootstrap 0:26.43 ERROR: Cannot find a wasi sysroot. Please give its location with --with-wasi-sysroot. Or build with --without-wasm-sandboxed-libraries. --- firefox.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/firefox.be0 b/firefox.be0 index a85130117..879851c19 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -30,6 +30,7 @@ mee_configure() { ac_add_options --enable-optimize ac_add_options --disable-crashreporter ac_add_options --disable-updater + ac_add_options --enable-bootstrap mk_add_options MOZ_MAKE_FLAGS="${BEE_MAKEFLAGS}" mk_add_options MOZ_OBJDIR=$B EOF From 2ccf97ebf60e4e8a80c27921c65c44490cc4c2df Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 14 Mar 2022 13:32:55 +0100 Subject: [PATCH 06/10] firefox: --without-wasm-sandboxed-libraries From [Linux From Scratch][1]: > Using sandboxed wasm libraries has been moved to all builds instead of > only mozilla automation builds. It requires extra llvm packages and > was reported to seriously slow the build. Disable it. [Fedora is doing the same][2], and [*Firefox 95 on POWER*][3] contains instructions on how to get it to work. [1]: https://www.linuxfromscratch.org/blfs/view/svn/xsoft/firefox.html [2]: https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/firefox-mozconfig [3]: https://www.talospace.com/2021/12/firefox-95-on-power.html --- firefox.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/firefox.be0 b/firefox.be0 index 879851c19..d44f1b866 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -31,6 +31,7 @@ mee_configure() { ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --enable-bootstrap + ac_add_options --without-wasm-sandboxed-libraries mk_add_options MOZ_MAKE_FLAGS="${BEE_MAKEFLAGS}" mk_add_options MOZ_OBJDIR=$B EOF From 1fc9b85bc7e5d6f22bb1679d16efd5cd2a0c1e02 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 1 Jul 2022 18:35:03 +0200 Subject: [PATCH 07/10] firefox: Update version from 98.0 to 102.0 https://www.mozilla.org/en-US/firefox/releases/ Use Rust 1.61.0 for building. --- firefox.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firefox.be0 b/firefox.be0 index d44f1b866..b0d320f08 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -2,7 +2,7 @@ #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80' -# BEE_VERSION firefox-98.0-0 +# BEE_VERSION firefox-102.0-0 #https://ftp.mozilla.org/pub/firefox/releases/$pkgversion/SOURCE to find the right download link SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" @@ -16,7 +16,7 @@ SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/fir mee_configure() { . /usr/local/package/lib/node.profile - . /pkg/rustc-1.59.0-0/profile + . /pkg/rustc-1.61.0-0/profile cat > ${S}/mozconfig <<-EOF ac_add_options --prefix=/usr From 00a28eecd94218086af996fe391614abd696a030 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 2 Jul 2022 09:27:57 +0200 Subject: [PATCH 08/10] firefox: Fix build with cbindgen 0.24.3 https://bugzilla.mozilla.org/show_bug.cgi?id=1773630 [Alternative][1]: sed -i '/ROOT_CLIP_CHAIN/d' gfx/webrender_bindings/webrender_ffi.h [1]: https://www.linuxfromscratch.org/blfs/view/svn/xsoft/firefox.html --- firefox.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/firefox.be0 b/firefox.be0 index b0d320f08..95d997f84 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -8,7 +8,8 @@ SRCURL[0]="https://ftp.mozilla.org/pub/firefox/releases/${PKGVERSION}/source/firefox-${PKGVERSION}.source.tar.xz" #SRCURL[0]="https://beehive.molgen.mpg.de/c560438ea86c5faeace6bc4150f8ccbe/firefox-95.0.source.tar.xz" -# PATCHURL+=() +# https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch +PATCHURL+=("https://beehive.molgen.mpg.de/37db9ec3cc336d3a09ede8becec2ad69/fix-ftbfs-newer-cbindgen.patch") #BEE_BUILDTYPE=autotools #build_in_sourcedir From 464533e3c72d396e3cc8bbc08af0800d2a60dbe2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 2 Jul 2022 09:34:06 +0200 Subject: [PATCH 09/10] firefox: Remove sourcing the Node.js profile The profile also pulls in LLVM/clang 13.x, but we have 14.x in MarIuX proper. Sourcing the profile does not seem to be needed for a successful build, so remove it. --- firefox.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/firefox.be0 b/firefox.be0 index 95d997f84..062ef3e25 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -16,7 +16,6 @@ PATCHURL+=("https://beehive.molgen.mpg.de/37db9ec3cc336d3a09ede8becec2ad69/fix-f mee_configure() { - . /usr/local/package/lib/node.profile . /pkg/rustc-1.61.0-0/profile cat > ${S}/mozconfig <<-EOF From 39cfad9d5f003f439b7570d1a0d9aabb719c5332 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 4 Jul 2022 11:04:38 +0200 Subject: [PATCH 10/10] firefox: Use variable `PREFIX` --- firefox.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefox.be0 b/firefox.be0 index 062ef3e25..8c53b5456 100755 --- a/firefox.be0 +++ b/firefox.be0 @@ -19,7 +19,7 @@ mee_configure() { . /pkg/rustc-1.61.0-0/profile cat > ${S}/mozconfig <<-EOF - ac_add_options --prefix=/usr + ac_add_options --prefix="${PREFIX}" ac_add_options --enable-application=browser ac_add_options --disable-necko-wifi ac_add_options --enable-official-branding