1
0
forked from ports/contrib

firefox: 79.0 -> 80.0

This commit is contained in:
Danny Rawlins 2020-08-27 21:47:05 +10:00
parent 95a1c4c32b
commit ba14bcaac3
3 changed files with 6 additions and 88 deletions

@ -1,8 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF33533SKXXtGD+Vm07BTT4yg6FRS1skuz8vkBWEbgdS89QKRo0jU13NNGNJJ+c+j0XsbtQ64HDLjxl8wHL0osNQU=
SHA256 (Pkgfile) = 3a9f8c709cb7e9c2fcb5050216a3922ee62b4787736718a612ed150e12b7f8ed
RWSagIOpLGJF3xhO/zb9G7+MDcyiYQitaeZdHnTMhpQkFslGbDOijI5ucMXu9lI0wYeA/UDREwo+jIMY8kLOQFSDYP91BAUWNAk=
SHA256 (Pkgfile) = ebd9950a0d8dc0f13db9dcaca5687ad2d805c517645b5c54cd16d6d9ca88a6dc
SHA256 (.footprint) = 8b8bebe1e51e7e8d82a57e60b95e4fd85c806ecbcbb15ad1774730025ba0e931
SHA256 (firefox-79.0.source.tar.xz) = 12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713
SHA256 (firefox-80.0.source.tar.xz) = 380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a
SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91
SHA256 (0001-Use-remoting-name-for-GDK-application-names.patch) = 3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75
SHA256 (bug1654465.diff) = e577f7e5636deda0026b0e385186f3ecb2212c9b84b6a2949a1811dab3e410d6

@ -5,22 +5,17 @@
# Optional: sccache
name=firefox
version=79.0
version=80.0
release=1
source=(https://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
firefox.desktop
0001-Use-remoting-name-for-GDK-application-names.patch
bug1654465.diff)
0001-Use-remoting-name-for-GDK-application-names.patch)
build() {
cd firefox-$version
# https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
patch -p1 -i $SRC/0001-Use-remoting-name-for-GDK-application-names.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=1654465
patch -p1 -i $SRC/bug1654465.diff
if [ $(/usr/bin/python -c "import sys; print sys.stdout.encoding") = 'UTF-8' ]; then
printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n"
exit 1
@ -65,6 +60,7 @@ cat <<- EOF > .mozconfig
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
ac_add_options --disable-elf-hack
EOF
[[ -e '/usr/bin/ccache' ]] && echo 'ac_add_options --enable-ccache' >> .mozconfig

@ -1,77 +0,0 @@
build/moz.configure/rust.configure | 2 +-
config/makefiles/rust.mk | 5 +++++
.../mozbuild/test/configure/test_toolchain_configure.py | 14 --------------
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
index aaa693059d95..c90ae5ca7b25 100644
--- c/build/moz.configure/rust.configure
+++ i/build/moz.configure/rust.configure
@@ -146,7 +146,7 @@ def rust_compiler(rustc_info, cargo_info, build_project):
or by directly running the installer from https://rustup.rs/
'''))
if build_project == 'tools/crashreporter':
- rustc_min_version = Version('1.31.0')
+ rustc_min_version = Version('1.38.0')
else:
rustc_min_version = Version('1.43.0')
cargo_min_version = rustc_min_version
diff --git c/config/makefiles/rust.mk i/config/makefiles/rust.mk
index a9abcc9af4c0..b5c7973104ce 100644
--- c/config/makefiles/rust.mk
+++ i/config/makefiles/rust.mk
@@ -63,6 +63,11 @@ ifndef MOZ_DEBUG_RUST
ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
cargo_rustc_flags += -Clto
endif
+# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when
+# using -Clto.
+ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
+RUSTFLAGS += -Cembed-bitcode=yes
+endif
endif
endif
diff --git c/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py i/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
index e1921ece6865..759d4d98cc0d 100755
--- c/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+++ i/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
@@ -1796,38 +1796,24 @@ class RustTest(BaseConfigureTest):
arm_arch=7, fpu='neon', thumb2=True, float_abi='softfp')),
'thumbv7neon-linux-androideabi')
- self.assertEqual(
- self.get_rust_target('arm-unknown-linux-androideabi',
- version='1.32.0',
- arm_target=ReadOnlyNamespace(
- arm_arch=7, fpu='neon', thumb2=True, float_abi='softfp')),
- 'armv7-linux-androideabi')
-
self.assertEqual(
self.get_rust_target('arm-unknown-linux-androideabi',
arm_target=ReadOnlyNamespace(
arm_arch=7, fpu='neon', thumb2=False, float_abi='softfp')),
'armv7-linux-androideabi')
self.assertEqual(
self.get_rust_target('arm-unknown-linux-androideabi',
arm_target=ReadOnlyNamespace(
arm_arch=7, fpu='vfpv2', thumb2=True, float_abi='softfp')),
'armv7-linux-androideabi')
self.assertEqual(
self.get_rust_target('armv7-unknown-linux-gnueabihf',
arm_target=ReadOnlyNamespace(
arm_arch=7, fpu='neon', thumb2=True, float_abi='hard')),
'thumbv7neon-unknown-linux-gnueabihf')
- self.assertEqual(
- self.get_rust_target('armv7-unknown-linux-gnueabihf',
- version='1.32.0',
- arm_target=ReadOnlyNamespace(
- arm_arch=7, fpu='neon', thumb2=True, float_abi='hard')),
- 'armv7-unknown-linux-gnueabihf')
-
self.assertEqual(
self.get_rust_target('armv7-unknown-linux-gnueabihf',
arm_target=ReadOnlyNamespace(