wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 15:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

firefox-esr: update to 68.9.0

Browse source
This commit is contained in:
mmnmnnmnmm 2020-06-11 16:54:54 +01:00 • committed by Johannes
parent 067642d6e4
commit bbf9952f06
3 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
srcpkgs/firefox-esr/patches/musl-rust.configure.patch Normal file
View file

@ -0,0 +1,26 @@
--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
+++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
@@ -297,11 +297,20 @@
suffix = 'hf'
else:
suffix = ''
+
+ narrowed = []
for p in prefixes:
for c in candidates:
- if c.rust_target.startswith('{}-'.format(p)) and \
- c.rust_target.endswith(suffix):
- return c.rust_target
+ if c.rust_target.startswith('{}-'.format(p)):
+ narrowed.append(c.rust_target)
+
+ for target in narrowed:
+ if target.endswith(host_or_target.raw_os):
+ return target
+
+ for target in narrowed:
+ if target.endswith(suffix):
+ return target
# See if we can narrow down on the exact alias
narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]

4
srcpkgs/firefox-esr/patches/remove-rustc-check.patch
View file

@ -13,7 +13,7 @@ Remove calls to unwrap_rustup, they fail if rustup isn't present
set_config('CARGO', cargo) set_config('CARGO', cargo)
set_config('RUSTC', rustc) set_config('RUSTC', rustc)
@@ -294,26 +291,6 @@ @@ -365,26 +362,6 @@
os.write(in_fd, source) os.write(in_fd, source)
os.close(in_fd) os.close(in_fd)
@ -33,7 +33,7 @@ Remove calls to unwrap_rustup, they fail if rustup isn't present
- a rust std library for that target installed. Try: - a rust std library for that target installed. Try:
- -
- rustup target add {} - rustup target add {}
- '''.format(host_or_target.alias, rustc, rustc_target.alias))) - '''.format(host_or_target.alias, rustc, rustc_target)))
- check_cmd_output(*cmd, onerror=failed) - check_cmd_output(*cmd, onerror=failed)
- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0: - if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
- failed() - failed()

4
srcpkgs/firefox-esr/template
View file

@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n". # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
# #
pkgname=firefox-esr pkgname=firefox-esr
version=68.8.0 version=68.9.0
revision=1 revision=1
wrksrc="firefox-${version}" wrksrc="firefox-${version}"
build_helper="rust" build_helper="rust"
@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/organizations/" homepage="https://www.mozilla.org/firefox/organizations/"
distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
checksum=fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 checksum=935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407
lib32disabled=yes lib32disabled=yes
hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm