From 6a776f134c53dad541912e60760d1774c1cc4541 Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Mon, 28 Aug 2023 17:19:00 -0500 Subject: [PATCH] firefox: 117.0 --- extra/firefox/checksums | 5 +- extra/firefox/patches/fix-overalignment.patch | 50 ------------------- extra/firefox/patches/fix-vaapi.patch | 8 +-- extra/firefox/sources | 3 +- extra/firefox/version | 2 +- 5 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 extra/firefox/patches/fix-overalignment.patch diff --git a/extra/firefox/checksums b/extra/firefox/checksums index 0e667e62..dd2ae94e 100644 --- a/extra/firefox/checksums +++ b/extra/firefox/checksums @@ -1,7 +1,6 @@ -3226e48657e3ca20343cd5b91d87fa705c73125c39434ea825c0c85ecafe90e9bb +8c8d3d3e1dbcc070694b183bb4fc92412efb8f59796ad01f46f24b1ad42b45ef91 f0437c60aa4d861290d267fde30d457b72bb60d7fd8b0192e1ffa41eaf86c4f800 -bd231369e10f0300360b79ae2e9b429f1d5833f6a46b615722979c38b6ebb70882 -d1125187407b5b754fd65f0b279091b150601eae523815e5b8a97196a6f050df2e +49e95cf848c09df618587bb8286bed3ed9531e24554b9ef275f070201078dba7f5 ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc 8c0f419eb138061e67dbe2ac73e9c8332649fb90aacb57ac4f00d5de94c0cf23a8 3bfec8b5e7cb94481d94e1039a602e14564c8a6da5a28f089ce4a69d23f9e42bbb diff --git a/extra/firefox/patches/fix-overalignment.patch b/extra/firefox/patches/fix-overalignment.patch deleted file mode 100644 index 20c2d796..00000000 --- a/extra/firefox/patches/fix-overalignment.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/js/public/Utility.h b/js/public/Utility.h -index 5a3002b..8927d65 100644 ---- a/js/public/Utility.h -+++ b/js/public/Utility.h -@@ -478,6 +478,9 @@ static inline void js_free(void* p) { - #define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ - template \ - QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \ -+ static_assert( \ -+ alignof(T) <= alignof(max_align_t), \ -+ "over-aligned type is not supported by JS_DECLARE_NEW_METHODS"); \ - void* memory = ALLOCATOR(sizeof(T)); \ - return MOZ_LIKELY(memory) ? new (memory) T(std::forward(args)...) \ - : nullptr; \ -@@ -494,6 +497,9 @@ static inline void js_free(void* p) { - #define JS_DECLARE_NEW_ARENA_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ - template \ - QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(arena_id_t arena, Args&&... args) { \ -+ static_assert( \ -+ alignof(T) <= alignof(max_align_t), \ -+ "over-aligned type is not supported by JS_DECLARE_NEW_ARENA_METHODS"); \ - void* memory = ALLOCATOR(arena, sizeof(T)); \ - return MOZ_LIKELY(memory) ? new (memory) T(std::forward(args)...) \ - : nullptr; \ -diff --git a/js/src/gc/GCMarker.h b/js/src/gc/GCMarker.h -index 495e66c..053ba90 100644 ---- a/js/src/gc/GCMarker.h -+++ b/js/src/gc/GCMarker.h -@@ -274,7 +274,7 @@ enum ShouldReportMarkTime : bool { - - } /* namespace gc */ - --class alignas(TypicalCacheLineSize) GCMarker { -+class GCMarker { - enum MarkingState : uint8_t { - // Have not yet started marking. - NotActive, -diff --git a/js/src/gc/Nursery.h b/js/src/gc/Nursery.h -index ae1e8c2..3dde209 100644 ---- a/js/src/gc/Nursery.h -+++ b/js/src/gc/Nursery.h -@@ -67,7 +67,7 @@ class GCSchedulingTunables; - class TenuringTracer; - } // namespace gc - --class alignas(TypicalCacheLineSize) Nursery { -+class Nursery { - public: - explicit Nursery(gc::GCRuntime* gc); - ~Nursery(); diff --git a/extra/firefox/patches/fix-vaapi.patch b/extra/firefox/patches/fix-vaapi.patch index c9a84c2f..5daaeb75 100644 --- a/extra/firefox/patches/fix-vaapi.patch +++ b/extra/firefox/patches/fix-vaapi.patch @@ -1,10 +1,10 @@ diff --git a/widget/gtk/GfxInfo.cpp b/widget/gtk/GfxInfo.cpp -index 1ea9702..3ec4897 100644 +index 24885ca..3815eb4 100644 --- a/widget/gtk/GfxInfo.cpp +++ b/widget/gtk/GfxInfo.cpp -@@ -1087,14 +1087,6 @@ const nsTArray& GfxInfo::GetGfxDriverInfo() { - nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED, - V(0, 0, 0, 0), "FEATURE_HARDWARE_VIDEO_DECODING_NO_R600", ""); +@@ -1095,14 +1095,6 @@ const nsTArray& GfxInfo::GetGfxDriverInfo() { + nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_LESS_THAN, V(23, 1, 1, 0), + "FEATURE_HARDWARE_VIDEO_DECODING_AMD_DISABLE", "Mesa 23.1.1.0"); - // Disable on Release/late Beta on AMD -#if !defined(EARLY_BETA_OR_EARLIER) diff --git a/extra/firefox/sources b/extra/firefox/sources index 7c9565e7..8de3d37f 100644 --- a/extra/firefox/sources +++ b/extra/firefox/sources @@ -1,6 +1,5 @@ -https://ftp.mozilla.org/pub/firefox/releases/116.0.3/source/firefox-116.0.3.source.tar.xz +https://ftp.mozilla.org/pub/firefox/releases/117.0/source/firefox-117.0.source.tar.xz patches/fix-bundled-ffmpeg-binutils.patch -patches/fix-overalignment.patch patches/fix-vaapi.patch patches/musl-sandbox.patch patches/no-atk.patch diff --git a/extra/firefox/version b/extra/firefox/version index 40c6c792..fc87d895 100644 --- a/extra/firefox/version +++ b/extra/firefox/version @@ -1 +1 @@ -116.0.3 1 +117.0 1