diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 19:11:47 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 19:11:47 +0000 |
| commit | defca1226f4258b7d4793568ab817e62c558b235 (patch) | |
| tree | 8f6dac97c81343accfc854890dbd15f1dcf3ad6e /experimental/firefox-esr/cmsghdr.patch | |
| parent | 7cbc839eac40d61bf115994f2448af7fb48d0316 (diff) | |
| parent | 37cd8e9274bb1112ff85d170bc7c87e582d7baaa (diff) | |
| download | packages-defca1226f4258b7d4793568ab817e62c558b235.tar.gz packages-defca1226f4258b7d4793568ab817e62c558b235.tar.bz2 packages-defca1226f4258b7d4793568ab817e62c558b235.tar.xz packages-defca1226f4258b7d4793568ab817e62c558b235.zip | |
Merge branch 'firefox-esr-60' into 'master'
Bump and fix experimental/firefox-esr
This MR bumps experimental/firefox-esr to 60.6.1 ESR (the latest release at this time), and updates the LLVM dependency to LLVM 7. Two new patches are required: the first fixes for building with Rust 1.33.0, as the build will fail due to undocumented macros, which I believe is a change in the behaviour of the `deny_docs` compiler pragma from 1.31.x; the second (courtesy of @aranea) fixes mozbuild to actually disable the profiling code when the `--disable-profiling` flag is passed in `mozconfig`, which otherwise fails to compile due to musl incompatibility.
Build succeeds on `x86_64` with beta3 Rust and on `aarch64` with beta2 Rust. Resulting package appears to work on both platforms, as my test boxen could both load https://adelielinux.org and play youtube videos.
See merge request !221
Diffstat (limited to 'experimental/firefox-esr/cmsghdr.patch')
| -rw-r--r-- | experimental/firefox-esr/cmsghdr.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/experimental/firefox-esr/cmsghdr.patch b/experimental/firefox-esr/cmsghdr.patch index 5fdc38353..2cf6821a4 100644 --- a/experimental/firefox-esr/cmsghdr.patch +++ b/experimental/firefox-esr/cmsghdr.patch @@ -1,10 +1,11 @@ -diff -Naur firefox-60.0.orig/media/audioipc/audioipc/src/cmsg.rs firefox-60.0/media/audioipc/audioipc/src/cmsg.rs ---- firefox-60.0.orig/media/audioipc/audioipc/src/cmsg.rs 2018-05-13 18:05:51.713781232 -0700 -+++ firefox-60.0/media/audioipc/audioipc/src/cmsg.rs 2018-05-13 17:33:39.536856530 -0700 -@@ -108,6 +108,7 @@ +diff -urw firefox-60.7.0-old/media/audioipc/audioipc/src/cmsg.rs firefox-60.7.0/media/audioipc/audioipc/src/cmsg.rs +--- firefox-60.7.0-old/media/audioipc/audioipc/src/cmsg.rs 2019-05-24 13:35:24.210002353 +0000 ++++ firefox-60.7.0/media/audioipc/audioipc/src/cmsg.rs 2019-05-24 13:36:34.400002547 +0000 +@@ -108,6 +108,8 @@ let cmsghdr = cmsghdr { cmsg_len: cmsg_len as _, ++ #[cfg(all(target_env = "musl", target_pointer_width = "64"))] + __pad1: 0, cmsg_level: level, cmsg_type: kind, |