Signed-off-by: doasu gentoo@doasu.dev
www-client/librewolf: add 149.0.2_p2 #73
:master into master @doasu Could you change the build to use our langpacks? librewolf/issues#2961
Bumped 2387fc6f0b/www-client/librewolf/librewolf-148.0.2_p2.ebuild and 2387fc6f0b/www-client/librewolf-bin/librewolf-bin-148.0.2_p2.ebuild.
Haven't compiled the source package yet, but the binary package seems to work (I'm writing this comment from 149.0.2)
I'll let you know if the source package works once it's finished compiling. :)
@ -0,0 +3,4 @@
EAPI=8
FIREFOX_PATCHSET="firefox-148-patches-02.tar.xz"
Oops! The prepare stage failed because a firefox version is hardcoded here... 😬
Fixed: b034b231c2..8e109e2d5a
b034b231c2
to 8e109e2d5a
@any1here wrote in #73 (comment):
@doasu Could you change the build to use our langpacks? librewolf/issues#2961
Yeah, I'll try to figure it out. I'll take any pointers/tips though, if you have any :p
@doasu wrote in #73 (comment):
@any1here wrote in #73 (comment):
@doasu Could you change the build to use our langpacks? librewolf/issues#2961
Yeah, I'll try to figure it out. I'll take any pointers/tips though, if you have any :p
TLDR: https://codeberg.org/librewolf/source/src/branch/main/assets/mozconfig.new#L25
This is how our builds use the language packs that we have made
Thanks! I'll keep you posted.
@doasu wrote in #73 (comment):
@any1here wrote in #73 (comment):
@doasu wrote in #73 (comment):
@any1here wrote in #73 (comment):
@doasu Could you change the build to use our langpacks? librewolf/issues#2961
Yeah, I'll try to figure it out. I'll take any pointers/tips though, if you have any :p
TLDR: https://codeberg.org/librewolf/source/src/branch/main/assets/mozconfig.new#L25
This is how our builds use the language packs that we have madeThanks! I'll keep you posted.
I looked it over, but I can't really help since I'm not familiar with Gentoo's packaging.
@any1here: All good :)
The ebuild is rather large so I have to wrap my head around it, but I should be able to figure it out.
Unfortunately for me, each ebuild can have its own DSL, so it's not so simple.
Plus, it's my first time looking at this TwT
If it's alright, I'll ask you if I have any questions about librewolf/firefox-specific stuff.
@ -0,0 +1359,4 @@
local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
if [[ -n "${langpacks}" ]] ; then
moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
fi
@any1here are these the same languagepacks we're talking about?
If I understand correctly, the ones Gentoo uses are distributed as .xpi files.
Refs: librewolf/issues#2961
I guess this issue refers to the non bin version only?
It would appear so!
@any1here actually... no?
I cannot reproduce the issue. I'm seeing the expected strings on the compiled version, too (148.0.2):
image
@ -0,0 +58,4 @@
if [[ ${PV} == *_rc* ]] ; then
MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
fi
LIBREWOLF_SRC_URI="https://codeberg.org/api/packages/librewolf/generic/librewolf-source/${LIBREWOLF_PV}/librewolf-${LIBREWOLF_PV}.source.tar.gz"
This contains our langpacks in the lw folder which then gets used via https://codeberg.org/librewolf/source/src/branch/main/assets/mozconfig.new#L25
I can see the lw directory in the extracted source tarball, and the appropriate mozconfig argument is already present in the ebuild, so is there anything missing?
If I understand correctly, we should be able to just remove the .xpi installation step.
LibreWolf is cooking rn, but I'll let you know once it compiles.
Do we have to register the languagepacks somehow, or place them in a specific directory?
ac_add_options --with-l10n-base=$PWD/lw/l10n and that should be pretty much it.
Accidentally cleaned my build directory (lmao), so I have to start again. 🥀
https://codeberg.org/librewolf/source/releases/tag/149.0.2-2 we pushed a minor release, which only changes a single setting so don't worry about rebuilding because of this. Just remember to update to this version when you have tested everything :) I'll be able to help again tomorrow
Well, good news is that this version compiled successfully, bad news is that the language packs are still missing...
image
Moving to !74.
@any1here wrote in #73 (comment):
https://codeberg.org/librewolf/source/releases/tag/149.0.2-2 we pushed a minor release, which only changes a single setting so don't worry about rebuilding because of this. Just remember to update to this version when you have tested everything :) I'll be able to help again tomorrow
bumped to 149.0.2-2 in ca73bbd3, 171f288d 👍
@doasu wrote in #73 (comment):
[...] I'll let you know if the source package works once it's finished compiling. :)
@doasu wrote in #73 (comment):
I haven't been able to compile the source package yet.
The compilation fails with the following error:
0:07.40 Creating config.status
0:07.83 Reticulating splines...
0:08.27 Traceback (most recent call last):
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/configure.py", line 331, in
0:08.27 sys.exit(main(sys.argv))
0:08.27 ~~~~^^^^^^^^^^
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/configure.py", line 161, in main
0:08.27 return config_status(config)
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/configure.py", line 280, in config_status
0:08.27 return config_status(args=[], **sanitized_config)
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/config_status.py", line 203, in config_status
0:08.27 definitions = list(definitions)
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/frontend/emitter.py", line 157, in emit
0:08.27 objs = list(emitfn(out))
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/frontend/emitter.py", line 1441, in emit_from_context
0:08.27 for obj in self._handle_linkables(context, passthru, generated_files):
0:08.27 ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/frontend/emitter.py", line 946, in _handle_linkables
0:08.27 lib = self._rust_library(
0:08.27 context,
0:08.27 ...<2 lines>...
0:08.27 is_gkrust=bool(context.get("IS_GKRUST")),
0:08.27 )
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/frontend/emitter.py", line 631, in _rust_library
0:08.27 raise SandboxValidationError(
0:08.27 ...<3 lines>...
0:08.27 )
0:08.27 mozbuild.frontend.reader.SandboxValidationError:
0:08.27 =わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ
0:08.27 FATAL ERROR PROCESSING MOZBUILD FILE
0:08.27 =わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ=わ
0:08.27
0:08.27 The error occurred while processing the following file or one of the files it includes:
0:08.27
0:08.27 /var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/toolkit/library/rust/moz.build
0:08.27
0:08.27 The error occurred when validating the result of the execution. The reported error is:
0:08.27
0:08.27 features for gkrust should not contain duplicates: ['gkrust-shared/for_xul', 'gkrust-shared/cubeb_pulse_rust', 'gkrust-shared/simd-accel', 'gkrust-shared/cubeb-remoting', 'gkrust-shared/moz_memory', 'gkrust-shared/moz_places', 'gkrust-shared/gecko_profiler', 'gkrust-shared/gecko_profiler_parse_elf', 'gkrust-shared/webrtc', 'gkrust-shared/glean_with_gecko', 'gkrust-shared/glean_disable_upload', 'gkrust-shared/with_dbus', 'gkrust-shared/webmidi_midir_impl', 'gkrust-shared/icu4x', 'gkrust-shared/jxl_decoder', 'gkrust-shared/glean_disable_upload']
0:08.27
0:08.27
0:09.52 E *** Fix above errors and then restart with "./mach build"
@doasu wrote in #73 (comment):
@doasu wrote in #73 (comment):
[...] I'll let you know if the source package works once it's finished compiling. :)
@doasu wrote in #73 (comment):
I haven't been able to compile the source package yet.
The compilation fails with the following error:
0:07.40 Creating config.status
0:07.83 Reticulating splines...
0:08.27 Traceback (most recent call last):
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/configure.py", line 331, in
0:08.27 sys.exit(main(sys.argv))
0:08.27 ~~~~^^^^^^^^^^
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/configure.py", line 161, in main
0:08.27 return config_status(config)
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/configure.py", line 280, in config_status
0:08.27 return config_status(args=[], **sanitized_config)
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/config_status.py", line 203, in config_status
0:08.27 definitions = list(definitions)
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/frontend/emitter.py", line 157, in emit
0:08.27 objs = list(emitfn(out))
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/frontend/emitter.py", line 1441, in emit_from_context
0:08.27 for obj in self._handle_linkables(context, passthru, generated_files):
0:08.27 ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/frontend/emitter.py", line 946, in _handle_linkables
0:08.27 lib = self._rust_library(
0:08.27 context,
0:08.27 ...<2 lines>...
0:08.27 is_gkrust=bool(context.get("IS_GKRUST")),
0:08.27 )
0:08.27 File "/var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/python/mozbuild/mozbuild/frontend/emitter.py", line 631, in _rust_library
0:08.27 raise SandboxValidationError(
0:08.27 ...<3 lines>...
0:08.27 )
0:08.27 mozbuild.frontend.reader.SandboxValidationError:
0:08.27 ==============================
0:08.27 FATAL ERROR PROCESSING MOZBUILD FILE
0:08.27 ==============================
0:08.27
0:08.27 The error occurred while processing the following file or one of the files it includes:
0:08.27
0:08.27 /var/tmp/portage/www-client/librewolf-149.0.2_p1/work/librewolf-149.0.2-1/toolkit/library/rust/moz.build
0:08.27
0:08.27 The error occurred when validating the result of the execution. The reported error is:
0:08.27
0:08.27 features for gkrust should not contain duplicates: ['gkrust-shared/for_xul', 'gkrust-shared/cubeb_pulse_rust', 'gkrust-shared/simd-accel', 'gkrust-shared/cubeb-remoting', 'gkrust-shared/moz_memory', 'gkrust-shared/moz_places', 'gkrust-shared/gecko_profiler', 'gkrust-shared/gecko_profiler_parse_elf', 'gkrust-shared/webrtc', 'gkrust-shared/glean_with_gecko', 'gkrust-shared/glean_disable_upload', 'gkrust-shared/with_dbus', 'gkrust-shared/webmidi_midir_impl', 'gkrust-shared/icu4x', 'gkrust-shared/jxl_decoder', 'gkrust-shared/glean_disable_upload']
0:08.27
0:08.27
0:09.52 E *** Fix above errors and then restart with "./mach build"
CC: @any1here @TheGreatMcPain
You are missing export MOZILLA_OFFICIAL=1 in the mozconfig
@ -0,0 +894,4 @@
# MOZ_TELEMETRY_REPORTING=0
export MOZ_REQUIRE_SIGNING=
You can add it here export MOZILLA_OFFICIAL=1
It does indeed fix the issue 0.o
Refs: 753b0e5a4a
It is because uploading the gkrust_features crate is normally disabled on non official builds. We switched to MOZILLA_OFFICIAL in the last release and then manually added it back librewolf/source@7cb7143e47 (diff-60f04e0f11) which means your build had it added twice
f379b3be34
to 753b0e5a4a
I'm moving the fix for librewolf/issues#2961 into its own issue.
39033f9344
to 753b0e5a4a
Ready to merge btw.
171f288d88
to 9e504ca47e
Thanks! ^^
No due date set.
No dependencies set.
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?