diff --git a/extra/firefox/build b/extra/firefox/build index cca6f7a8..923981a6 100755 --- a/extra/firefox/build +++ b/extra/firefox/build @@ -34,8 +34,7 @@ export PATH="$PWD/junk/bin:$PATH" for p in \ audioipc \ audioipc-client \ - audioipc-server \ - packed_simd_2 + audioipc-server do sed 's/\("files":{\)[^}]*/\1/' \ "third_party/rust/$p/.cargo-checksum.json" > _ diff --git a/extra/firefox/checksums b/extra/firefox/checksums index 261fe19f..124b090f 100644 --- a/extra/firefox/checksums +++ b/extra/firefox/checksums @@ -1,10 +1,8 @@ -766183e8e39c17a84305a85da3237919ffaeb018c6c9d97a7324aea51bd453aa +1a294a651dc6260f9a72a3ab9f10e7792a4ab41a9cfa8527ad3dd9979cdc98ce 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7 86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b -dd835501b0fc3897808910fa1a9d8b1e3523f55e53c9ac9e20b67e0360f3a238 bed3f4e39dcb8065dba174d37fb15f2a75887a6dd7ce6b872e5ab287c8bc386f 4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9 -2368343dea56243c8167cf44f47949955d0a059e64f142a7d9664f0f7d1bdad8 diff --git a/extra/firefox/patches/fix-wayland-only.patch b/extra/firefox/patches/fix-wayland-only.patch deleted file mode 100644 index 7f86ed01..00000000 --- a/extra/firefox/patches/fix-wayland-only.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp -index 2bf6de6..d2fce1f 100644 ---- a/gfx/gl/GLContextProviderEGL.cpp -+++ b/gfx/gl/GLContextProviderEGL.cpp -@@ -79,6 +79,7 @@ - # if defined(MOZ_WAYLAND) - # include - # include -+# include "mozilla/WidgetUtilsGtk.h" - # include "mozilla/widget/nsWaylandDisplay.h" - # endif - #endif -diff --git a/gfx/gl/GLContextProviderLinux.cpp b/gfx/gl/GLContextProviderLinux.cpp -index f8f6f3d..7205449 100644 ---- a/gfx/gl/GLContextProviderLinux.cpp -+++ b/gfx/gl/GLContextProviderLinux.cpp -@@ -13,7 +13,9 @@ namespace mozilla::gl { - using namespace mozilla::gfx; - using namespace mozilla::widget; - -+#ifdef MOZ_X11 - static class GLContextProviderGLX sGLContextProviderGLX; -+#endif - static class GLContextProviderEGL sGLContextProviderEGL; - - already_AddRefed GLContextProviderLinux::CreateForCompositorWidget( -@@ -22,9 +24,11 @@ already_AddRefed GLContextProviderLinux::CreateForCompositorWidget( - if (gfxVars::UseEGL()) { - return sGLContextProviderEGL.CreateForCompositorWidget( - aCompositorWidget, aHardwareWebRender, aForceAccelerated); -+#ifdef MOZ_X11 - } else { - return sGLContextProviderGLX.CreateForCompositorWidget( - aCompositorWidget, aHardwareWebRender, aForceAccelerated); -+#endif - } - } - -@@ -33,8 +37,10 @@ already_AddRefed GLContextProviderLinux::CreateHeadless( - const GLContextCreateDesc& desc, nsACString* const out_failureId) { - if (gfxVars::UseEGL()) { - return sGLContextProviderEGL.CreateHeadless(desc, out_failureId); -+#ifdef MOZ_X11 - } else { - return sGLContextProviderGLX.CreateHeadless(desc, out_failureId); -+#endif - } - } - -@@ -42,8 +48,10 @@ already_AddRefed GLContextProviderLinux::CreateHeadless( - GLContext* GLContextProviderLinux::GetGlobalContext() { - if (gfxVars::UseEGL()) { - return sGLContextProviderEGL.GetGlobalContext(); -+#ifdef MOZ_X11 - } else { - return sGLContextProviderGLX.GetGlobalContext(); -+#endif - } - } - -@@ -51,8 +59,10 @@ GLContext* GLContextProviderLinux::GetGlobalContext() { - void GLContextProviderLinux::Shutdown() { - if (gfxVars::UseEGL()) { - sGLContextProviderEGL.Shutdown(); -+#ifdef MOZ_X11 - } else { - sGLContextProviderGLX.Shutdown(); -+#endif - } - } - -diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build -index bc492a8..fc0a005 100644 ---- a/gfx/gl/moz.build -+++ b/gfx/gl/moz.build -@@ -108,10 +108,11 @@ elif gl_provider == "Linux": - # GLContextProviderGLX.cpp needs to be kept out of UNIFIED_SOURCES - # as it includes X11 headers which cause conflicts. - SOURCES += [ -- "GLContextProviderGLX.cpp", - "GLContextProviderLinux.cpp", - ] - EXPORTS += ["GLContextGLX.h", "GLXLibrary.h"] -+ if CONFIG["MOZ_X11"]: -+ SOURCES += ["GLContextProviderGLX.cpp"] - - if CONFIG["MOZ_WAYLAND"]: - SOURCES += ["SharedSurfaceDMABUF.cpp"] -diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp -index dd8dab6..34494ad 100644 ---- a/gfx/thebes/gfxPlatformGtk.cpp -+++ b/gfx/thebes/gfxPlatformGtk.cpp -@@ -998,7 +998,7 @@ gfxPlatformGtk::CreateGlobalHardwareVsyncSource() { - RefPtr softwareVsync = new XrandrSoftwareVsyncSource(); - return softwareVsync.forget(); - #else -- return CreateSoftwareVsyncSource(); -+ return GetSoftwareVsyncSource(); - #endif - } - diff --git a/extra/firefox/patches/packed_simd_2-0.3.8.patch b/extra/firefox/patches/packed_simd_2-0.3.8.patch deleted file mode 100644 index a12f5158..00000000 --- a/extra/firefox/patches/packed_simd_2-0.3.8.patch +++ /dev/null @@ -1,694 +0,0 @@ -diff --git a/.cargo/config.in b/.cargo/config.in -index 20b8c3f..6528cc8 100644 ---- a/.cargo/config.in -+++ b/.cargo/config.in -@@ -70,7 +70,7 @@ rev = "746743227485a83123784df0c53227ab466612ed" - [source."https://github.com/hsivonen/packed_simd"] - git = "https://github.com/hsivonen/packed_simd" - replace-with = "vendored-sources" --rev = "c149d0a519bf878567c7630096737669ec2ff15f" -+rev = "90eebb82a107cbec1c8e406d9223819417e96de1" - - [source."https://github.com/hsivonen/chardetng_c"] - git = "https://github.com/hsivonen/chardetng_c" -diff --git a/Cargo.lock b/Cargo.lock -index 5716fa1..9dfd4a2 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -3952,10 +3952,11 @@ dependencies = [ - - [[package]] - name = "packed_simd_2" --version = "0.3.7" --source = "git+https://github.com/hsivonen/packed_simd?rev=c149d0a519bf878567c7630096737669ec2ff15f#c149d0a519bf878567c7630096737669ec2ff15f" -+version = "0.3.8" -+source = "git+https://github.com/hsivonen/packed_simd?rev=90eebb82a107cbec1c8e406d9223819417e96de1#90eebb82a107cbec1c8e406d9223819417e96de1" - dependencies = [ - "cfg-if 1.0.0", -+ "rustc_version", - ] - - [[package]] -diff --git a/Cargo.toml b/Cargo.toml -index 012a938..f3f86d1 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -145,7 +145,7 @@ chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f90 - coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev="fc68464b5445caf111e41f643a2e69ccce0b4f83" } - fog = { path = "toolkit/components/glean/api" } - libudev-sys = { path = "dom/webauthn/libudev-sys" } --packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev="c149d0a519bf878567c7630096737669ec2ff15f" } -+packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev="90eebb82a107cbec1c8e406d9223819417e96de1" } - midir = { git = "https://github.com/mozilla/midir.git", rev = "4c11f0ffb5d6a10de4aff40a7b81218b33b94e6f" } - minidump_writer_linux = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "75ada456c92a429704691a85e1cb42fef8cafc0d" } - -diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml -index 38ce792..ac84409 100644 ---- a/supply-chain/audits.toml -+++ b/supply-chain/audits.toml -@@ -86,6 +86,11 @@ who = "Mike Hommey " - criteria = "safe-to-deploy" - version = "0.4.17" - -+[[audits.packed_simd_2]] -+who = "Mike Hommey " -+criteria = "safe-to-deploy" -+delta = "0.3.7 -> 0.3.8" -+ - [[audits.rust_decimal]] - who = "Mike Hommey " - criteria = "safe-to-deploy" -diff --git a/third_party/rust/packed_simd_2/Cargo.toml b/third_party/rust/packed_simd_2/Cargo.toml -index f38706d..d3d07ef 100644 ---- a/third_party/rust/packed_simd_2/Cargo.toml -+++ b/third_party/rust/packed_simd_2/Cargo.toml -@@ -1,6 +1,6 @@ - [package] - name = "packed_simd_2" --version = "0.3.7" -+version = "0.3.8" - description = "Portable Packed SIMD vectors" - documentation = "https://docs.rs/crate/packed_simd/" - homepage = "https://github.com/rust-lang/packed_simd" -@@ -23,6 +23,9 @@ maintenance = { status = "experimental" } - cfg-if = "1.0.0" - core_arch = { version = "0.1.5", optional = true } - -+[build-dependencies] -+rustc_version = "0.4" -+ - [features] - default = [] - into_bits = [] -diff --git a/third_party/rust/packed_simd_2/README.md b/third_party/rust/packed_simd_2/README.md -index 41a1512..eb3101c 100644 ---- a/third_party/rust/packed_simd_2/README.md -+++ b/third_party/rust/packed_simd_2/README.md -@@ -8,7 +8,7 @@ If you need to continue to use the crate, we have published a "next version" und - - Adjust your `[dependencies]` section of `Cargo.toml` to be the following: - ```toml --packed_simd = { version = "0.3.6", package = "packed_simd_2" } -+packed_simd = { version = "0.3.8", package = "packed_simd_2" } - ``` - - # `Simd<[T; N]>` -diff --git a/third_party/rust/packed_simd_2/build.rs b/third_party/rust/packed_simd_2/build.rs -index e87298a..afdee9f 100644 ---- a/third_party/rust/packed_simd_2/build.rs -+++ b/third_party/rust/packed_simd_2/build.rs -@@ -1,6 +1,11 @@ -+use rustc_version::{version, Version}; -+ - fn main() { - let target = std::env::var("TARGET").expect("TARGET environment variable not defined"); - if target.contains("neon") { - println!("cargo:rustc-cfg=libcore_neon"); - } -+ if version().unwrap() < Version::parse("1.61.0-alpha").unwrap() { -+ println!("cargo:rustc-cfg=aarch64_target_feature"); -+ } - } -diff --git a/third_party/rust/packed_simd_2/src/api.rs b/third_party/rust/packed_simd_2/src/api.rs -index 4e9c429..aa1403e 100644 ---- a/third_party/rust/packed_simd_2/src/api.rs -+++ b/third_party/rust/packed_simd_2/src/api.rs -@@ -2,7 +2,7 @@ - - #[macro_use] - mod bitmask; --crate mod cast; -+pub(crate) mod cast; - #[macro_use] - mod cmp; - #[macro_use] -@@ -37,7 +37,7 @@ mod swap_bytes; - mod bit_manip; - - #[cfg(feature = "into_bits")] --crate mod into_bits; -+pub(crate) mod into_bits; - - macro_rules! impl_i { - ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident, $mask_ty:ident -diff --git a/third_party/rust/packed_simd_2/src/codegen.rs b/third_party/rust/packed_simd_2/src/codegen.rs -index 9d1517e..8a9e971 100644 ---- a/third_party/rust/packed_simd_2/src/codegen.rs -+++ b/third_party/rust/packed_simd_2/src/codegen.rs -@@ -1,19 +1,19 @@ - //! Code-generation utilities - --crate mod bit_manip; --crate mod llvm; --crate mod math; --crate mod reductions; --crate mod shuffle; --crate mod shuffle1_dyn; --crate mod swap_bytes; -+pub(crate) mod bit_manip; -+pub(crate) mod llvm; -+pub(crate) mod math; -+pub(crate) mod reductions; -+pub(crate) mod shuffle; -+pub(crate) mod shuffle1_dyn; -+pub(crate) mod swap_bytes; - - macro_rules! impl_simd_array { - ([$elem_ty:ident; $elem_count:expr]: - $tuple_id:ident | $($elem_tys:ident),*) => { - #[derive(Copy, Clone)] - #[repr(simd)] -- pub struct $tuple_id($(crate $elem_tys),*); -+ pub struct $tuple_id($(pub(crate) $elem_tys),*); - //^^^^^^^ leaked through SimdArray - - impl crate::sealed::Seal for [$elem_ty; $elem_count] {} -@@ -35,28 +35,28 @@ macro_rules! impl_simd_array { - } - } - --crate mod pointer_sized_int; -+pub(crate) mod pointer_sized_int; - --crate mod v16; --crate use self::v16::*; -+pub(crate) mod v16; -+pub(crate) use self::v16::*; - --crate mod v32; --crate use self::v32::*; -+pub(crate) mod v32; -+pub(crate) use self::v32::*; - --crate mod v64; --crate use self::v64::*; -+pub(crate) mod v64; -+pub(crate) use self::v64::*; - --crate mod v128; --crate use self::v128::*; -+pub(crate) mod v128; -+pub(crate) use self::v128::*; - --crate mod v256; --crate use self::v256::*; -+pub(crate) mod v256; -+pub(crate) use self::v256::*; - --crate mod v512; --crate use self::v512::*; -+pub(crate) mod v512; -+pub(crate) use self::v512::*; - --crate mod vSize; --crate use self::vSize::*; -+pub(crate) mod vSize; -+pub(crate) use self::vSize::*; - --crate mod vPtr; --crate use self::vPtr::*; -+pub(crate) mod vPtr; -+pub(crate) use self::vPtr::*; -diff --git a/third_party/rust/packed_simd_2/src/codegen/bit_manip.rs b/third_party/rust/packed_simd_2/src/codegen/bit_manip.rs -index 5986916..32d8d71 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/bit_manip.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/bit_manip.rs -@@ -1,7 +1,7 @@ - //! LLVM bit manipulation intrinsics. - #[rustfmt::skip] - --use crate::*; -+pub(crate) use crate::*; - - #[allow(improper_ctypes, dead_code)] - extern "C" { -@@ -147,7 +147,7 @@ extern "C" { - fn ctpop_u128x4(x: u128x4) -> u128x4; - } - --crate trait BitManip { -+pub(crate) trait BitManip { - fn ctpop(self) -> Self; - fn ctlz(self) -> Self; - fn cttz(self) -> Self; -diff --git a/third_party/rust/packed_simd_2/src/codegen/llvm.rs b/third_party/rust/packed_simd_2/src/codegen/llvm.rs -index 52b11a9..b4c0984 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/llvm.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/llvm.rs -@@ -76,53 +76,53 @@ where - } - - extern "platform-intrinsic" { -- crate fn simd_eq(x: T, y: T) -> U; -- crate fn simd_ne(x: T, y: T) -> U; -- crate fn simd_lt(x: T, y: T) -> U; -- crate fn simd_le(x: T, y: T) -> U; -- crate fn simd_gt(x: T, y: T) -> U; -- crate fn simd_ge(x: T, y: T) -> U; -- -- crate fn simd_insert(x: T, idx: u32, val: U) -> T; -- crate fn simd_extract(x: T, idx: u32) -> U; -- -- crate fn simd_cast(x: T) -> U; -- -- crate fn simd_add(x: T, y: T) -> T; -- crate fn simd_sub(x: T, y: T) -> T; -- crate fn simd_mul(x: T, y: T) -> T; -- crate fn simd_div(x: T, y: T) -> T; -- crate fn simd_rem(x: T, y: T) -> T; -- crate fn simd_shl(x: T, y: T) -> T; -- crate fn simd_shr(x: T, y: T) -> T; -- crate fn simd_and(x: T, y: T) -> T; -- crate fn simd_or(x: T, y: T) -> T; -- crate fn simd_xor(x: T, y: T) -> T; -- -- crate fn simd_reduce_add_unordered(x: T) -> U; -- crate fn simd_reduce_mul_unordered(x: T) -> U; -- crate fn simd_reduce_add_ordered(x: T, acc: U) -> U; -- crate fn simd_reduce_mul_ordered(x: T, acc: U) -> U; -- crate fn simd_reduce_min(x: T) -> U; -- crate fn simd_reduce_max(x: T) -> U; -- crate fn simd_reduce_min_nanless(x: T) -> U; -- crate fn simd_reduce_max_nanless(x: T) -> U; -- crate fn simd_reduce_and(x: T) -> U; -- crate fn simd_reduce_or(x: T) -> U; -- crate fn simd_reduce_xor(x: T) -> U; -- crate fn simd_reduce_all(x: T) -> bool; -- crate fn simd_reduce_any(x: T) -> bool; -- -- crate fn simd_select(m: M, a: T, b: T) -> T; -- -- crate fn simd_fmin(a: T, b: T) -> T; -- crate fn simd_fmax(a: T, b: T) -> T; -- -- crate fn simd_fsqrt(a: T) -> T; -- crate fn simd_fma(a: T, b: T, c: T) -> T; -- -- crate fn simd_gather(value: T, pointers: P, mask: M) -> T; -- crate fn simd_scatter(value: T, pointers: P, mask: M); -- -- crate fn simd_bitmask(value: T) -> U; -+ pub(crate) fn simd_eq(x: T, y: T) -> U; -+ pub(crate) fn simd_ne(x: T, y: T) -> U; -+ pub(crate) fn simd_lt(x: T, y: T) -> U; -+ pub(crate) fn simd_le(x: T, y: T) -> U; -+ pub(crate) fn simd_gt(x: T, y: T) -> U; -+ pub(crate) fn simd_ge(x: T, y: T) -> U; -+ -+ pub(crate) fn simd_insert(x: T, idx: u32, val: U) -> T; -+ pub(crate) fn simd_extract(x: T, idx: u32) -> U; -+ -+ pub(crate) fn simd_cast(x: T) -> U; -+ -+ pub(crate) fn simd_add(x: T, y: T) -> T; -+ pub(crate) fn simd_sub(x: T, y: T) -> T; -+ pub(crate) fn simd_mul(x: T, y: T) -> T; -+ pub(crate) fn simd_div(x: T, y: T) -> T; -+ pub(crate) fn simd_rem(x: T, y: T) -> T; -+ pub(crate) fn simd_shl(x: T, y: T) -> T; -+ pub(crate) fn simd_shr(x: T, y: T) -> T; -+ pub(crate) fn simd_and(x: T, y: T) -> T; -+ pub(crate) fn simd_or(x: T, y: T) -> T; -+ pub(crate) fn simd_xor(x: T, y: T) -> T; -+ -+ pub(crate) fn simd_reduce_add_unordered(x: T) -> U; -+ pub(crate) fn simd_reduce_mul_unordered(x: T) -> U; -+ pub(crate) fn simd_reduce_add_ordered(x: T, acc: U) -> U; -+ pub(crate) fn simd_reduce_mul_ordered(x: T, acc: U) -> U; -+ pub(crate) fn simd_reduce_min(x: T) -> U; -+ pub(crate) fn simd_reduce_max(x: T) -> U; -+ pub(crate) fn simd_reduce_min_nanless(x: T) -> U; -+ pub(crate) fn simd_reduce_max_nanless(x: T) -> U; -+ pub(crate) fn simd_reduce_and(x: T) -> U; -+ pub(crate) fn simd_reduce_or(x: T) -> U; -+ pub(crate) fn simd_reduce_xor(x: T) -> U; -+ pub(crate) fn simd_reduce_all(x: T) -> bool; -+ pub(crate) fn simd_reduce_any(x: T) -> bool; -+ -+ pub(crate) fn simd_select(m: M, a: T, b: T) -> T; -+ -+ pub(crate) fn simd_fmin(a: T, b: T) -> T; -+ pub(crate) fn simd_fmax(a: T, b: T) -> T; -+ -+ pub(crate) fn simd_fsqrt(a: T) -> T; -+ pub(crate) fn simd_fma(a: T, b: T, c: T) -> T; -+ -+ pub(crate) fn simd_gather(value: T, pointers: P, mask: M) -> T; -+ pub(crate) fn simd_scatter(value: T, pointers: P, mask: M); -+ -+ pub(crate) fn simd_bitmask(value: T) -> U; - } -diff --git a/third_party/rust/packed_simd_2/src/codegen/math.rs b/third_party/rust/packed_simd_2/src/codegen/math.rs -index f3997c7..9a0ea7a 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math.rs -@@ -1,3 +1,3 @@ - //! Vertical math operations - --crate mod float; -+pub(crate) mod float; -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float.rs b/third_party/rust/packed_simd_2/src/codegen/math/float.rs -index 5e89bf6..ffbf18b 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float.rs -@@ -2,17 +2,17 @@ - #![allow(clippy::useless_transmute)] - - #[macro_use] --crate mod macros; --crate mod abs; --crate mod cos; --crate mod cos_pi; --crate mod exp; --crate mod ln; --crate mod mul_add; --crate mod mul_adde; --crate mod powf; --crate mod sin; --crate mod sin_cos_pi; --crate mod sin_pi; --crate mod sqrt; --crate mod sqrte; -+pub(crate) mod macros; -+pub(crate) mod abs; -+pub(crate) mod cos; -+pub(crate) mod cos_pi; -+pub(crate) mod exp; -+pub(crate) mod ln; -+pub(crate) mod mul_add; -+pub(crate) mod mul_adde; -+pub(crate) mod powf; -+pub(crate) mod sin; -+pub(crate) mod sin_cos_pi; -+pub(crate) mod sin_pi; -+pub(crate) mod sqrt; -+pub(crate) mod sqrte; -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs -index bc4421f..34aacc2 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/abs.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait Abs { -+pub(crate) trait Abs { - fn abs(self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs -index 50f6c16..dec390c 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/cos.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait Cos { -+pub(crate) trait Cos { - fn cos(self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs -index ebff5fd..e283280 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/cos_pi.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait CosPi { -+pub(crate) trait CosPi { - fn cos_pi(self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs -index 00d10e9..a7b2058 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/exp.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait Exp { -+pub(crate) trait Exp { - fn exp(self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs -index 88a5a6c..a5e38cb 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/ln.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait Ln { -+pub(crate) trait Ln { - fn ln(self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs -index f48a57d..d37f30f 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/mul_add.rs -@@ -4,7 +4,7 @@ use crate::*; - - // FIXME: 64-bit 1 element mul_add - --crate trait MulAdd { -+pub(crate) trait MulAdd { - fn mul_add(self, y: Self, z: Self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs -index b030c26..c0baeac 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/mul_adde.rs -@@ -3,7 +3,7 @@ use crate::*; - - // FIXME: 64-bit 1 element mul_adde - --crate trait MulAddE { -+pub(crate) trait MulAddE { - fn mul_adde(self, y: Self, z: Self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs -index bc15067..89ca52e 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/powf.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait Powf { -+pub(crate) trait Powf { - fn powf(self, x: Self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs -index 7b014d0..d881415 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sin.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait Sin { -+pub(crate) trait Sin { - fn sin(self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs -index 75c2c2c..b283d11 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sin_cos_pi.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait SinCosPi: Sized { -+pub(crate) trait SinCosPi: Sized { - type Output; - fn sin_cos_pi(self) -> Self::Output; - } -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs -index 72df98c..0c8f6bb 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sin_pi.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait SinPi { -+pub(crate) trait SinPi { - fn sin_pi(self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs -index 7ce31df..67bb0a2 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sqrt.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait Sqrt { -+pub(crate) trait Sqrt { - fn sqrt(self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs b/third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs -index c1e379c..58a1de1 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/math/float/sqrte.rs -@@ -6,7 +6,7 @@ - use crate::llvm::simd_fsqrt; - use crate::*; - --crate trait Sqrte { -+pub(crate) trait Sqrte { - fn sqrte(self) -> Self; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs b/third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs -index 39f493d..55cbc29 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/pointer_sized_int.rs -@@ -4,24 +4,24 @@ use cfg_if::cfg_if; - - cfg_if! { - if #[cfg(target_pointer_width = "8")] { -- crate type isize_ = i8; -- crate type usize_ = u8; -+ pub(crate) type isize_ = i8; -+ pub(crate) type usize_ = u8; - } else if #[cfg(target_pointer_width = "16")] { -- crate type isize_ = i16; -- crate type usize_ = u16; -+ pub(crate) type isize_ = i16; -+ pub(crate) type usize_ = u16; - } else if #[cfg(target_pointer_width = "32")] { -- crate type isize_ = i32; -- crate type usize_ = u32; -+ pub(crate) type isize_ = i32; -+ pub(crate) type usize_ = u32; - - } else if #[cfg(target_pointer_width = "64")] { -- crate type isize_ = i64; -- crate type usize_ = u64; -+ pub(crate) type isize_ = i64; -+ pub(crate) type usize_ = u64; - } else if #[cfg(target_pointer_width = "64")] { -- crate type isize_ = i64; -- crate type usize_ = u64; -+ pub(crate) type isize_ = i64; -+ pub(crate) type usize_ = u64; - } else if #[cfg(target_pointer_width = "128")] { -- crate type isize_ = i128; -- crate type usize_ = u128; -+ pub(crate) type isize_ = i128; -+ pub(crate) type usize_ = u128; - } else { - compile_error!("unsupported target_pointer_width"); - } -diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions.rs b/third_party/rust/packed_simd_2/src/codegen/reductions.rs -index 7be4f5f..302ca6d 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/reductions.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/reductions.rs -@@ -1 +1 @@ --crate mod mask; -+pub(crate) mod mask; -diff --git a/third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs b/third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs -index 0aec609..a78bcc5 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/reductions/mask.rs -@@ -7,11 +7,11 @@ - - use crate::*; - --crate trait All: crate::marker::Sized { -+pub(crate) trait All: crate::marker::Sized { - unsafe fn all(self) -> bool; - } - --crate trait Any: crate::marker::Sized { -+pub(crate) trait Any: crate::marker::Sized { - unsafe fn any(self) -> bool; - } - -diff --git a/third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs b/third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs -index a4435e3..9cf34a3 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/swap_bytes.rs -@@ -5,7 +5,7 @@ - - use crate::*; - --crate trait SwapBytes { -+pub(crate) trait SwapBytes { - fn swap_bytes(self) -> Self; - } - -@@ -15,7 +15,7 @@ macro_rules! impl_swap_bytes { - impl SwapBytes for $id { - #[inline] - fn swap_bytes(self) -> Self { -- unsafe { shuffle!(self, [1, 0]) } -+ shuffle!(self, [1, 0]) - } - } - )+ -diff --git a/third_party/rust/packed_simd_2/src/codegen/vPtr.rs b/third_party/rust/packed_simd_2/src/codegen/vPtr.rs -index cf47655..abd3aa8 100644 ---- a/third_party/rust/packed_simd_2/src/codegen/vPtr.rs -+++ b/third_party/rust/packed_simd_2/src/codegen/vPtr.rs -@@ -5,7 +5,7 @@ macro_rules! impl_simd_ptr { - | $($tys:ty),*) => { - #[derive(Copy, Clone)] - #[repr(simd)] -- pub struct $tuple_id<$ty>($(crate $tys),*); -+ pub struct $tuple_id<$ty>($(pub(crate) $tys),*); - //^^^^^^^ leaked through SimdArray - - impl<$ty> crate::sealed::Seal for [$ptr_ty; $elem_count] {} -diff --git a/third_party/rust/packed_simd_2/src/lib.rs b/third_party/rust/packed_simd_2/src/lib.rs -index 840bae3..cd8a868 100644 ---- a/third_party/rust/packed_simd_2/src/lib.rs -+++ b/third_party/rust/packed_simd_2/src/lib.rs -@@ -217,14 +217,13 @@ - rustc_attrs, - platform_intrinsics, - stdsimd, -- aarch64_target_feature, - arm_target_feature, - link_llvm_intrinsics, - core_intrinsics, - stmt_expr_attributes, -- crate_visibility_modifier, - custom_inner_attributes, - )] -+#![cfg_attr(aarch64_target_feature, feature(aarch64_target_feature))] - #![allow(non_camel_case_types, non_snake_case, - // FIXME: these types are unsound in C FFI already - // See https://github.com/rust-lang/rust/issues/53346 -@@ -344,6 +343,6 @@ pub use self::codegen::llvm::{ - __shuffle_vector8, - }; - --crate mod llvm { -- crate use crate::codegen::llvm::*; -+pub(crate) mod llvm { -+ pub(crate) use crate::codegen::llvm::*; - } -diff --git a/third_party/rust/packed_simd_2/src/testing.rs b/third_party/rust/packed_simd_2/src/testing.rs -index fcbcf9e..6320b28 100644 ---- a/third_party/rust/packed_simd_2/src/testing.rs -+++ b/third_party/rust/packed_simd_2/src/testing.rs -@@ -5,4 +5,4 @@ mod macros; - - #[cfg(test)] - #[macro_use] --crate mod utils; -+pub(crate) mod utils; diff --git a/extra/firefox/sources b/extra/firefox/sources index bf0629b5..16b3cd8e 100644 --- a/extra/firefox/sources +++ b/extra/firefox/sources @@ -4,7 +4,5 @@ https://fossies.org/linux/misc/zip30.tar.gz zip https://fossies.org/linux/misc/unzip60.tar.gz unzip patches/fix-clang-as.patch patches/fix-linux-header.patch -patches/fix-wayland-only.patch patches/no-dbus.patch patches/no-fribidi.patch -patches/packed_simd_2-0.3.8.patch diff --git a/extra/firefox/version b/extra/firefox/version index 57d9b694..6b4eb38a 100644 --- a/extra/firefox/version +++ b/extra/firefox/version @@ -1 +1 @@ -103.0.2 1 +104.0 1 diff --git a/testing/firefox/README b/testing/firefox/README deleted file mode 100644 index 70214c4d..00000000 --- a/testing/firefox/README +++ /dev/null @@ -1,123 +0,0 @@ -firefox -________________________________________________________________________________ - -Mozilla Firefox or simply Firefox, is a free and open-source web browser -developed by the Mozilla Foundation and its subsidiary, the Mozilla Corporation. -Firefox uses the Gecko rendering engine to display web pages. [0] - -Upstream: https://www.mozilla.org/firefox - - -[000] Index -________________________________________________________________________________ - -* Installation ........................................................... [001] - * Runtime Dependencies ................................................. [002] - * Privacy Package ...................................................... [003] -* Setup .................................................................. [004] - * Enable VAAPI Acceleration ............................................ [005] -* Usage .................................................................. [006] -* References ............................................................. [007] - - -[001] Installation -________________________________________________________________________________ - -+------------------------------------------------------------------------------+ -| | -| $ kiss b firefox | -| | -+------------------------------------------------------------------------------+ - - ---[002] Runtime Dependencies --------------------------------------------------- - - Firefox needs a few additional things to be fully functional. One is an icon - theme and the other is a font. If you have already installed the fonts and - icon theme of your choosing, this step can be skipped. - - +----------------------------------------------------------------------------+ - | | - | $ kiss b [hicolor-icon-theme|adwaita-icon-theme] | - | $ kiss b ttf-croscore | - | | - +----------------------------------------------------------------------------+ - - ---[003] Privacy Package -------------------------------------------------------- - - Provided is also an optional privacy package which makes Firefox perform zero - unsolicited network requests. More information can be found in the - documentation (@/firefox-privacy) Expect some website breakage when using this - privacy package YMMV. - - +----------------------------------------------------------------------------+ - | | - | $ kiss b firefox-privacy | - | | - +----------------------------------------------------------------------------+ - - -[004] Setup -________________________________________________________________________________ - -As of Firefox 91. There is no need to set special environment variables to -enable Wayland support (in a Wayland only environment like ours). The browser -should start with no further configuration. - - ---[005] Enable VAAPI Acceleration ---------------------------------------------- - -As of Firefox 102, only the following modification to about:config should be -required, with no need to disable any sandbox features. - -+------------------------------------------------------------------------------+ -| | -| about:config | -| | -| media.ffmpeg.vaapi.enabled=true | -| | -+------------------------------------------------------------------------------+ - -If using AMDGPU, the following kernel option must be enabled. [1] - -+------------------------------------------------------------------------------+ -| | -| .config | -| | -| CONFIG_CHECKPOINT_RESTORE=y | -| | -+------------------------------------------------------------------------------+ - -You may also need to set the following environment variable. - -+------------------------------------------------------------------------------+ -| | -| .profile | -| | -| export MOZ_WAYLAND_DRM_DEVICE=/dev/dri/renderD128 | -| | -+------------------------------------------------------------------------------+ - -To verify that VAAPI is working, launch Firefox with the following argument and -attempt to watch a video. Pay attention for errors in the output. - -+------------------------------------------------------------------------------+ -| | -| $ firefox --MOZ_LOG=PlatformDecoderModule:4 | -| | -+------------------------------------------------------------------------------+ - - -[006] Usage -________________________________________________________________________________ - -Refer to the browser's help output and online documentation for further -information. - - -[007] References -________________________________________________________________________________ - -[0] https://en.wikipedia.org/wiki/Firefox - diff --git a/testing/firefox/build b/testing/firefox/build deleted file mode 100755 index 923981a6..00000000 --- a/testing/firefox/build +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh -e - -for p in *.patch; do - patch -p1 < "$p" -done - -# Build yasm for Firefox's sole use. Firefox is the only package which needs it -# and upstream is kinda dead. -( - cd yasm - - ./configure \ - --prefix=/ - - make - make DESTDIR="$PWD/../junk" install -) - -# Build zip/unzip for Firefox's sole use. -for f in zip unzip; do ( - cd "$f" - - make \ - CC="$CC $CFLAGS $CXXFLAGS" \ - -f unix/Makefile generic - - make \ - prefix="$PWD/../junk" \ - -f unix/Makefile install -) done - -export PATH="$PWD/junk/bin:$PATH" - -for p in \ - audioipc \ - audioipc-client \ - audioipc-server -do - sed 's/\("files":{\)[^}]*/\1/' \ - "third_party/rust/$p/.cargo-checksum.json" > _ - mv -f _ "third_party/rust/$p/.cargo-checksum.json" -done - -# If using libc++, CXXSTDLIB needs to be set manually. -case $("$CC" -print-file-name=libc++.so) in */*) - export CXXSTDLIB=c++ -esac - -export CFLAGS="$CFLAGS -w" -export CXXFLAGS="$CXXFLAGS -w" - -# Instruct the compiler to trim absolute paths in resulting binaries and instead -# change them to relative paths ($PWD/... ./...). -export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$PWD=." - -export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox,--enable-new-dtags" -export RUSTFLAGS="$RUSTFLAGS -Cdebuginfo=0" -export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system -export MOZ_DEBUG_FLAGS=-g0 -export MOZBUILD_STATE_PATH="$PWD/state" -export MOZ_NOSPAM=1 - -cat > .mozconfig << EOF -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib -ac_add_options --enable-default-toolkit=cairo-gtk3-wayland-only -ac_add_options --enable-strip -ac_add_options --enable-release -ac_add_options --enable-rust-simd -ac_add_options --enable-audio-backends=alsa -ac_add_options --enable-install-strip -ac_add_options --enable-official-branding -ac_add_options --enable-application=browser -ac_add_options --enable-optimize -ac_add_options --with-system-libvpx -ac_add_options --with-system-ffi -ac_add_options --with-system-png -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-pixman -ac_add_options --without-system-nss -ac_add_options --without-system-nspr -ac_add_options --without-wasm-sandboxed-libraries -ac_add_options --disable-eme -ac_add_options --disable-dbus -ac_add_options --disable-tests -ac_add_options --disable-vtune -ac_add_options --disable-updater -ac_add_options --disable-jemalloc -ac_add_options --disable-elf-hack -ac_add_options --disable-callgrind -ac_add_options --disable-profiling -ac_add_options --disable-necko-wifi -ac_add_options --disable-crashreporter -ac_add_options --disable-accessibility -ac_add_options --disable-debug -ac_add_options --disable-debug-symbols -ac_add_options --disable-parental-controls -ac_add_options --disable-system-extension-dirs -EOF - -./mach build -./mach install - -# Remove a lot of uneeded "stuff". -rm -rf \ - "$1/usr/include" \ - "$1/usr/lib/firefox-devel" \ - "$1/usr/share/idl" \ - "$1/usr/lib/firefox/browser/features/fxmonitor@mozilla.org.xpi" \ - "$1/usr/lib/firefox/browser/features/screenshots@mozilla.org.xpi" \ - "$1/usr/lib/firefox/browser/features/webcompat-reporter@mozilla.org.xpi" \ - "$1/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi" \ - "$1/usr/lib/firefox/browser/features/doh-rollout@mozilla.org.xpi" diff --git a/testing/firefox/checksums b/testing/firefox/checksums deleted file mode 100644 index b1ffa0c3..00000000 --- a/testing/firefox/checksums +++ /dev/null @@ -1,8 +0,0 @@ -72200dbf70b6d83925faf3867a4613b5ed4971b701a8213cf5cf02887fc06ce8 -3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f -f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 -036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 -ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7 -86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b -bed3f4e39dcb8065dba174d37fb15f2a75887a6dd7ce6b872e5ab287c8bc386f -4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9 diff --git a/testing/firefox/depends b/testing/firefox/depends deleted file mode 100644 index c7d777fc..00000000 --- a/testing/firefox/depends +++ /dev/null @@ -1,31 +0,0 @@ -alsa-lib -bzip2 -cairo -cbindgen make -clang make -expat -ffmpeg -fontconfig -freetype-harfbuzz -gdk-pixbuf -glib -gtk+3 -libdrm -libffi -libjpeg-turbo -libpng -libvpx -llvm make -m4 make -mesa -nasm make -nodejs make -pango -perl make -pixman -pkgconf make -python make -rust make -wayland -wayland-protocols make -zlib diff --git a/testing/firefox/patches/fix-clang-as.patch b/testing/firefox/patches/fix-clang-as.patch deleted file mode 100644 index 125487d2..00000000 --- a/testing/firefox/patches/fix-clang-as.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile ---- a/security/nss/lib/freebl/Makefile -+++ b/security/nss/lib/freebl/Makefile -@@ -753,7 +753,6 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$(OBJ_SUFFIX): CFLAGS += -mssse3 - # .set Htbl, %rdi - # So we can't use Clang's integrated assembler with intel-gcm.s. - ifdef CC_IS_CLANG --$(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): CFLAGS += -no-integrated-as - endif - endif - -diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp ---- a/security/nss/lib/freebl/freebl.gyp -+++ b/security/nss/lib/freebl/freebl.gyp -@@ -19,13 +19,10 @@ - 'conditions': [ - [ 'cc_is_clang==1 and force_integrated_as!=1', { - 'cflags': [ -- '-no-integrated-as', - ], - 'cflags_mozilla': [ -- '-no-integrated-as', - ], - 'asflags_mozilla': [ -- '-no-integrated-as', - ], - }], - ], -diff --git a/security/nss/lib/freebl/freebl_base.gypi b/security/nss/lib/freebl/freebl_base.gypi ---- a/security/nss/lib/freebl/freebl_base.gypi -+++ b/security/nss/lib/freebl/freebl_base.gypi -@@ -74,13 +74,10 @@ - 'conditions': [ - [ 'cc_is_clang==1 and fuzz!=1 and coverage!=1 and force_integrated_as!=1', { - 'cflags': [ -- '-no-integrated-as', - ], - 'cflags_mozilla': [ -- '-no-integrated-as', - ], - 'asflags_mozilla': [ -- '-no-integrated-as', - ], - }], - ], --- -2.35.1 - diff --git a/testing/firefox/patches/fix-linux-header.patch b/testing/firefox/patches/fix-linux-header.patch deleted file mode 100644 index 9f7fc51a..00000000 --- a/testing/firefox/patches/fix-linux-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c -index 73e85c6ccc..9eca548638 100644 ---- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c -+++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c -@@ -31,6 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - #if defined(LINUX) -+#include - #include "addrs-netlink.h" - #include - #include diff --git a/testing/firefox/patches/no-dbus.patch b/testing/firefox/patches/no-dbus.patch deleted file mode 100644 index c0e6a41f..00000000 --- a/testing/firefox/patches/no-dbus.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -r fc5ee47dac3e third_party/rust/audioipc-client/Cargo.toml ---- a/third_party/rust/audioipc-client/Cargo.toml Tue Jun 28 12:00:27 2022 -0500 -+++ b/third_party/rust/audioipc-client/Cargo.toml Thu Jun 30 00:35:24 2022 -0500 -@@ -19,3 +19,5 @@ - - [dependencies.audio_thread_priority] - version = "0.26.1" -+default_features = false -+features = ["winapi"] -diff -r fc5ee47dac3e third_party/rust/audioipc-server/Cargo.toml ---- a/third_party/rust/audioipc-server/Cargo.toml Tue Jun 28 12:00:27 2022 -0500 -+++ b/third_party/rust/audioipc-server/Cargo.toml Thu Jun 30 00:35:24 2022 -0500 -@@ -24,3 +24,5 @@ - - [dependencies.audio_thread_priority] - version = "0.26.1" -+default_features = false -+features = ["winapi"] -diff -r fc5ee47dac3e third_party/rust/audioipc/Cargo.toml ---- a/third_party/rust/audioipc/Cargo.toml Tue Jun 28 12:00:27 2022 -0500 -+++ b/third_party/rust/audioipc/Cargo.toml Thu Jun 30 00:35:24 2022 -0500 -@@ -30,6 +30,8 @@ - - [target.'cfg(target_os = "linux")'.dependencies.audio_thread_priority] - version = "0.26.1" -+default_features = false -+features = ["winapi"] - - [target.'cfg(windows)'.dependencies] - mio = "0.6.19" -diff -r fc5ee47dac3e toolkit/components/remote/moz.build ---- a/toolkit/components/remote/moz.build Tue Jun 28 12:00:27 2022 -0500 -+++ b/toolkit/components/remote/moz.build Thu Jun 30 00:35:24 2022 -0500 -@@ -26,7 +26,7 @@ - "nsUnixRemoteServer.h", - "RemoteUtils.h", - ] -- else: -+ elif CONFIG["MOZ_X11"]: - SOURCES += [ - "nsGTKRemoteServer.cpp", - "nsXRemoteClient.cpp", -diff -r fc5ee47dac3e toolkit/components/remote/nsRemoteService.cpp ---- a/toolkit/components/remote/nsRemoteService.cpp Tue Jun 28 12:00:27 2022 -0500 -+++ b/toolkit/components/remote/nsRemoteService.cpp Thu Jun 30 00:35:24 2022 -0500 -@@ -6,12 +6,14 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - #ifdef MOZ_WIDGET_GTK --# ifdef MOZ_ENABLE_DBUS -+# if defined(MOZ_ENABLE_DBUS) - # include "nsDBusRemoteServer.h" - # include "nsDBusRemoteClient.h" --# else -+# elif defined(MOZ_X11) - # include "nsGTKRemoteServer.h" - # include "nsXRemoteClient.h" -+# else -+# include "nsRemoteClient.h" - # endif - #elif defined(XP_WIN) - # include "nsWinRemoteServer.h" -@@ -94,8 +96,10 @@ - #ifdef MOZ_WIDGET_GTK - # if defined(MOZ_ENABLE_DBUS) - client = MakeUnique(); -+# elif defined(MOZ_X11) -+ client = MakeUnique(); - # else -- client = MakeUnique(); -+ return REMOTE_NOT_FOUND; - # endif - #elif defined(XP_WIN) - client = MakeUnique(); -@@ -138,8 +142,10 @@ - #ifdef MOZ_WIDGET_GTK - # if defined(MOZ_ENABLE_DBUS) - mRemoteServer = MakeUnique(); -+# elif defined(MOZ_X11) -+ mRemoteServer = MakeUnique(); - # else -- mRemoteServer = MakeUnique(); -+ return; - # endif - #elif defined(XP_WIN) - mRemoteServer = MakeUnique(); diff --git a/testing/firefox/patches/no-fribidi.patch b/testing/firefox/patches/no-fribidi.patch deleted file mode 100644 index 89b4468a..00000000 --- a/testing/firefox/patches/no-fribidi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild -index a1b58eb59b..d35da57db3 100644 ---- a/config/system-headers.mozbuild -+++ b/config/system-headers.mozbuild -@@ -267,7 +267,6 @@ system_headers = [ - 'freetype/t1tables.h', - 'freetype/ttnameid.h', - 'freetype/tttables.h', -- 'fribidi/fribidi.h', - 'FSp_fopen.h', - 'fstream', - 'fstream.h', diff --git a/testing/firefox/post-install b/testing/firefox/post-install deleted file mode 100755 index 2f40c517..00000000 --- a/testing/firefox/post-install +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -cat <