firefox: update to 82.0.
This commit is contained in:
Johannes
Johannes
parent
0e78f40577
commit
ebcc404cf2
5 changed files with 80 additions and 76 deletions
|
|
@ -1,11 +0,0 @@
|
|||
--- media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
|
||||
+++ media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
|
||||
@@ -27,8 +27,5 @@
|
||||
typedef int16_t int16;
|
||||
typedef unsigned short ushort;
|
||||
typedef unsigned long ulong;
|
||||
-#ifndef __GNUC_STDC_INLINE__
|
||||
-#define inline
|
||||
-#endif
|
||||
|
||||
#endif /* _SDP_OS_DEFS_H_ */
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
this reverts https://hg.mozilla.org/mozilla-central/rev/9f8a59996994
|
||||
|
||||
--- toolkit/xre/nsAppRunner.cpp 2020-07-21 00:49:52.000000000 +0200
|
||||
+++ toolkit/xre/nsAppRunner.cpp 2020-08-17 21:12:47.688908716 +0200
|
||||
@@ -4741,8 +4741,6 @@
|
||||
CodeCoverageHandler::Init();
|
||||
#endif
|
||||
|
||||
- NS_SetCurrentThreadName("MainThread");
|
||||
-
|
||||
AUTO_BASE_PROFILER_LABEL("XREMain::XRE_main (around Gecko Profiler)", OTHER);
|
||||
AUTO_PROFILER_INIT;
|
||||
AUTO_PROFILER_LABEL("XREMain::XRE_main", OTHER);
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
--- 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]
|
||||
|
|
@ -1,9 +1,14 @@
|
|||
Mozilla rustc check does not support crossbuild: let's remove it
|
||||
Remove calls to unwrap_rustup, they fail if rustup isn't present
|
||||
|
||||
Do not try to figure out the rust target as it is broken on musl
|
||||
instead use what is set in RUST_TARGET
|
||||
|
||||
Skip extra checks on cross builds (broken for arm*)
|
||||
|
||||
--- build/moz.configure/rust.configure.orig 2019-10-17 04:19:59.000000000 +0700
|
||||
+++ build/moz.configure/rust.configure 2019-10-22 11:48:55.616022140 +0700
|
||||
@@ -78,9 +78,6 @@
|
||||
@@ -81,9 +81,6 @@
|
||||
|
||||
return unwrap
|
||||
|
||||
|
|
@ -13,30 +18,79 @@ Remove calls to unwrap_rustup, they fail if rustup isn't present
|
|||
|
||||
set_config('CARGO', cargo)
|
||||
set_config('RUSTC', rustc)
|
||||
@@ -348,26 +345,6 @@
|
||||
@@ -225,7 +222,9 @@
|
||||
data.setdefault(key, []).append(namespace(rust_target=t, target=info))
|
||||
return data
|
||||
|
||||
os.write(in_fd, source)
|
||||
os.close(in_fd)
|
||||
-
|
||||
- cmd = [
|
||||
- rustc,
|
||||
- '--crate-type', 'staticlib',
|
||||
- target_arg,
|
||||
- '-o', out_path,
|
||||
- in_path,
|
||||
- ]
|
||||
+@imports('os')
|
||||
+@imports(_from='mozbuild.util', _import='ensure_unicode')
|
||||
+@imports(_from='mozbuild.util', _import='system_encoding')
|
||||
def detect_rustc_target(host_or_target, compiler_info, arm_target, rust_supported_targets):
|
||||
# Rust's --target options are similar to, but not exactly the same
|
||||
# as, the autoconf-derived targets we use. An example would be that
|
||||
@@ -340,13 +339,13 @@
|
||||
|
||||
return None
|
||||
|
||||
- rustc_target = find_candidate(candidates)
|
||||
+ rustc_target = os.environ['RUST_TARGET']
|
||||
|
||||
if rustc_target is None:
|
||||
die("Don't know how to translate {} for rustc".format(
|
||||
host_or_target.alias))
|
||||
|
||||
- return rustc_target
|
||||
+ return ensure_unicode(rustc_target, system_encoding)
|
||||
|
||||
|
||||
@imports('os')
|
||||
@@ -369,26 +368,6 @@
|
||||
|
||||
os.write(in_fd, ensure_binary(source))
|
||||
os.close(in_fd)
|
||||
-
|
||||
- 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:
|
||||
- cmd = [
|
||||
- rustc,
|
||||
- '--crate-type', 'staticlib',
|
||||
- target_arg,
|
||||
- '-o', out_path,
|
||||
- in_path,
|
||||
- ]
|
||||
-
|
||||
- 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)
|
||||
- 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)
|
||||
@@ -403,20 +382,7 @@
|
||||
rustc_target = detect_rustc_target(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
|
||||
return rustc_target
|
||||
|
||||
@depends(rustc, target, c_compiler, rust_supported_targets, arm_target, when=rust_compiler)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
|
||||
#
|
||||
pkgname=firefox
|
||||
version=81.0.2
|
||||
version=82.0
|
||||
revision=1
|
||||
build_helper="rust"
|
||||
short_desc="Mozilla Firefox web browser"
|
||||
|
|
@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
|
|||
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
|
||||
homepage="https://www.mozilla.org/firefox/"
|
||||
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
|
||||
checksum=91b6482de9b193b19d1fd9a8b99015a001646a48429297bbb7fe41784f9f9b44
|
||||
checksum=90c58707f5bd34978e2d1bcadbe463556edc0878430f969893ae2f89c5d464c2
|
||||
|
||||
lib32disabled=yes
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue