firefox: update to 129.0.

This commit is contained in:
Duncaen 2024-08-06 19:19:28 +02:00 committed by Duncan Overbruck
parent 14465d61f1
commit f4f4976ea4
2 changed files with 23 additions and 66 deletions

View File

@ -44,69 +44,28 @@ Skip extra checks on cross builds (broken for arm*)
@imports("os")
@@ -410,35 +409,6 @@
os.write(in_fd, ensure_binary(source))
os.close(in_fd)
-
- cmd = [
- rustc,
- "--crate-type",
- "staticlib",
- target_arg,
- "-o",
- out_path,
- in_path,
- ]
-
- def failed():
- die(
- dedent(
- """\
- Cannot compile for {} with {}
- The target may be unsupported, or you may not have
- a rust std library for that target installed. Try:
-
- rustup target add {}
- """.format(
- host_or_target.alias, rustc, rustc_target
- )
- )
- )
-
- check_cmd_output(*cmd, onerror=failed)
- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
- failed()
finally:
os.remove(in_path)
os.remove(out_path)
@@ -462,28 +432,7 @@
@@ -486,6 +485,7 @@
host, compiler_info, arm_target, rust_supported_targets
)
if rustc_target != rustc_host:
- if host.alias == rustc_target:
- configure_host = host.alias
- else:
- configure_host = "{}/{}".format(host.alias, rustc_target)
- die(
- dedent(
- """\
- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
-
- You can solve this by:
- * Set your configure host to match the rust compiler host by editing your
- mozconfig and adding "ac_add_options --host={rustc}".
- * Or, install the rust toolchain for {configure}, if supported, by running
- "rustup default stable-{rustc_target}"
- """.format(
- rustc=rustc_host,
- configure=configure_host,
- rustc_target=rustc_target,
- )
- )
- )
- assert_rust_compile(host, rustc_target, rustc)
+ return rustc_host
if host.alias == rustc_target:
configure_host = host.alias
else:
@@ -507,7 +507,6 @@
)
)
)
- assert_rust_compile(host, rustc_target, rustc)
return rustc_target
@@ -521,7 +520,6 @@
rustc_target = detect_rustc_target(
target, compiler_info, arm_target, rust_supported_targets
)
- assert_rust_compile(target, rustc_target, rustc)
return rustc_target

View File

@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
version=128.0.2
version=129.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
@ -11,11 +11,11 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/firefox/releases/${version/beta/b}/source/firefox-${version/beta/b}.source.tar.xz"
checksum=39baed6a9a836adb03ed443ee568438a5093f89e5f8bad3f7b11be8f73b3e45f
checksum=4b9ff955de7099f09aa1f00985e34695fa1a911e56c2d46cb4d60c3bff3d9174
lib32disabled=yes
hostmakedepends="autoconf213 unzip zip pkg-config perl python3.11 yasm rust
hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust
cargo llvm18 clang18 lld18 nodejs cbindgen nasm which tar"
makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel icu-devel
pixman-devel libevent-devel libnotify-devel libvpx-devel libwebp-devel
@ -63,8 +63,6 @@ post_patch() {
}
do_build() {
ln -sf "/usr/bin/python3.11" "${XBPS_WRAPPERDIR}/python3"
if [ "$build_option_clang" ]; then
export CC=clang
export CXX=clang++