Skip to content

Commit

Permalink
librewolf: update to 129.0-1.
Browse files Browse the repository at this point in the history
  • Loading branch information
index-0 committed Aug 14, 2024
1 parent bc92a91 commit 4d6ad72
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 68 deletions.
78 changes: 17 additions & 61 deletions srcpkgs/librewolf/patches/rust-configure.patch
Original file line number Diff line number Diff line change
Expand Up @@ -44,69 +44,25 @@ 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


12 changes: 5 additions & 7 deletions srcpkgs/librewolf/template
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# Template file for 'librewolf'
pkgname=librewolf
version=128.0.3
revision=2
_rev=2
version=129.0
revision=1
_rev=1
wrksrc=${pkgname}-${version}-${_rev}
build_helper="rust"
short_desc="LibreWolf web browser"
maintainer="index <[email protected]>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://librewolf.net/"
distfiles="https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${version}-${_rev}/${pkgname}-${version}-${_rev}.source.tar.gz"
checksum=df1033b7d825da65e1892f599e65525e8d138374f75c5ebb76ee13ab818b4020
checksum=ff03845699e62aa68f31fb7b17193636e9e8a63dd824011f3d84059574c9b09d

lib32disabled=yes

hostmakedepends="autoconf213 unzip zip pkg-config perl python3.11 yasm rust
hostmakedepends="autoconf213 unzip zip pkg-config perl python 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
Expand Down Expand Up @@ -60,8 +60,6 @@ post_patch() {
}

do_build() {
ln -s "/usr/bin/python3.11" "${XBPS_WRAPPERDIR}/python3"

export CC=clang
export CXX=clang++

Expand Down

0 comments on commit 4d6ad72

Please sign in to comment.