diff --git a/CVE-2023-44488-libvpx.patch b/CVE-2023-44488-libvpx.patch deleted file mode 100644 index 79e523565bb95525d890e4fed0c72def2cd4da06..0000000000000000000000000000000000000000 --- a/CVE-2023-44488-libvpx.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 263682c9a29395055f3b3afe2d97be1828a6223f Mon Sep 17 00:00:00 2001 -From: Jerome Jiang -Date: Thu, 30 Jun 2022 13:48:56 -0400 -Subject: [PATCH] Fix bug with smaller width bigger size - -Fixed previous patch that clusterfuzz failed on. - -Bug: webm:1642 -Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9 ---- - test/resize_test.cc | 11 +++-------- - vp9/common/vp9_alloccommon.c | 13 ++++++------- - vp9/encoder/vp9_encoder.c | 27 +++++++++++++++++++++++++-- - 3 files changed, 34 insertions(+), 17 deletions(-) - -diff --git a/test/resize_test.cc b/test/resize_test.cc -index fd1c2a92de6..20ad2229b46 100644 ---- a/test/resize_test.cc -+++ b/test/resize_test.cc -@@ -102,11 +102,8 @@ void ScaleForFrameNumber(unsigned int frame, unsigned int initial_w, - if (frame < 30) { - return; - } -- if (frame < 100) { -- *w = initial_w * 7 / 10; -- *h = initial_h * 16 / 10; -- return; -- } -+ *w = initial_w * 7 / 10; -+ *h = initial_h * 16 / 10; - return; - } - if (frame < 10) { -@@ -559,9 +556,7 @@ TEST_P(ResizeRealtimeTest, TestExternalResizeWorks) { - } - } - --// TODO(https://crbug.com/webm/1642): This causes a segfault in --// init_encode_frame_mb_context(). --TEST_P(ResizeRealtimeTest, DISABLED_TestExternalResizeSmallerWidthBiggerSize) { -+TEST_P(ResizeRealtimeTest, TestExternalResizeSmallerWidthBiggerSize) { - ResizingVideoSource video; - video.flag_codec_ = true; - video.smaller_width_larger_size_ = true; -diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c -index e53883f621d..9e73e40ea09 100644 ---- a/vp9/common/vp9_alloccommon.c -+++ b/vp9/common/vp9_alloccommon.c -@@ -135,13 +135,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { - cm->free_mi(cm); - if (cm->alloc_mi(cm, new_mi_size)) goto fail; - } -- -- if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { -- // Create the segmentation map structure and set to 0. -- free_seg_map(cm); -- if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; -- } -- - if (cm->above_context_alloc_cols < cm->mi_cols) { - vpx_free(cm->above_context); - cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc( -@@ -156,6 +149,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { - cm->above_context_alloc_cols = cm->mi_cols; - } - -+ if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { -+ // Create the segmentation map structure and set to 0. -+ free_seg_map(cm); -+ if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; -+ } -+ - if (vp9_alloc_loop_filter(cm)) goto fail; - - return 0; -diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c -index 69a4e3c314f..e3ba294c32f 100644 ---- a/vp9/encoder/vp9_encoder.c -+++ b/vp9/encoder/vp9_encoder.c -@@ -2047,6 +2047,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) { - } - } - -+static void free_copy_partition_data(VP9_COMP *cpi) { -+ vpx_free(cpi->prev_partition); -+ cpi->prev_partition = NULL; -+ vpx_free(cpi->prev_segment_id); -+ cpi->prev_segment_id = NULL; -+ vpx_free(cpi->prev_variance_low); -+ cpi->prev_variance_low = NULL; -+ vpx_free(cpi->copied_frame_cnt); -+ cpi->copied_frame_cnt = NULL; -+} -+ - void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { - VP9_COMMON *const cm = &cpi->common; - RATE_CONTROL *const rc = &cpi->rc; -@@ -2126,6 +2137,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { - new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows); - if (cm->mi_alloc_size < new_mi_size) { - vp9_free_context_buffers(cm); -+ vp9_free_pc_tree(&cpi->td); -+ vpx_free(cpi->mbmi_ext_base); - alloc_compressor_data(cpi); - realloc_segmentation_maps(cpi); - cpi->initial_width = cpi->initial_height = 0; -@@ -2144,8 +2157,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { - update_frame_size(cpi); - - if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) { -- memset(cpi->consec_zero_mv, 0, -- cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv)); -+ vpx_free(cpi->consec_zero_mv); -+ CHECK_MEM_ERROR( -+ &cm->error, cpi->consec_zero_mv, -+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv))); -+ -+ vpx_free(cpi->skin_map); -+ CHECK_MEM_ERROR( -+ &cm->error, cpi->skin_map, -+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0]))); -+ -+ free_copy_partition_data(cpi); -+ alloc_copy_partition_data(cpi); - if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) - vp9_cyclic_refresh_reset_resize(cpi); - rc->rc_1_frame = 0; diff --git a/build-disable-elfhack.patch b/build-disable-elfhack.patch index 859c50fda5dea694e199425d689f6e236f593251..c866a68c81f95c459f2140d8085bd7cde43f2b80 100644 --- a/build-disable-elfhack.patch +++ b/build-disable-elfhack.patch @@ -1,12 +1,12 @@ -diff -up firefox-115.2.0/toolkit/moz.configure.disable-elfhack firefox-115.2.0/toolkit/moz.configure ---- firefox-115.2.0/toolkit/moz.configure.disable-elfhack 2023-09-20 21:55:41.002788320 +0200 -+++ firefox-115.2.0/toolkit/moz.configure 2023-09-20 21:56:37.343757245 +0200 -@@ -1511,7 +1511,7 @@ with only_when("--enable-compile-environ - "Cannot enable elfhack with lld." - " Use --enable-linker=bfd, --enable-linker=gold, or --disable-elf-hack" - ) -- return True -+ return False - - set_config("USE_ELF_HACK", use_elf_hack) - +diff -up firefox-128.0/toolkit/moz.configure.disable-elfhack firefox-128.0/toolkit/moz.configure +--- firefox-128.0/toolkit/moz.configure.disable-elfhack 2024-06-19 17:24:29.964976617 +0200 ++++ firefox-128.0/toolkit/moz.configure 2024-06-19 17:24:53.015843805 +0200 +@@ -1553,7 +1553,7 @@ with only_when("--enable-compile-environ + @depends(host, target) + def has_elfhack(host, target): + return ( +- target.kernel == "Linux" ++ False and target.kernel == "Linux" + and host.kernel == "Linux" + and target.cpu in ("arm", "aarch64", "x86", "x86_64") + ) diff --git a/build-disable-gamepad.patch b/build-disable-gamepad.patch new file mode 100644 index 0000000000000000000000000000000000000000..a7134d6f70b7b8826cd6b30f1ca75f901e631cff --- /dev/null +++ b/build-disable-gamepad.patch @@ -0,0 +1,12 @@ +diff -up firefox-128.0/dom/gamepad/moz.build.gamepad firefox-128.0/dom/gamepad/moz.build +--- firefox-128.0/dom/gamepad/moz.build.gamepad 2024-07-30 16:24:07.326519645 +0200 ++++ firefox-128.0/dom/gamepad/moz.build 2024-07-30 16:24:15.817492673 +0200 +@@ -60,7 +60,7 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "wi + elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android": + UNIFIED_SOURCES += ["android/AndroidGamepad.cpp"] + elif CONFIG["OS_ARCH"] in ("Linux", "FreeBSD", "DragonFly"): +- UNIFIED_SOURCES += ["linux/LinuxGamepad.cpp"] ++ UNIFIED_SOURCES += ["fallback/FallbackGamepad.cpp"] + else: + UNIFIED_SOURCES += ["fallback/FallbackGamepad.cpp"] + diff --git a/build-ffvpx.patch b/build-ffvpx.patch new file mode 100644 index 0000000000000000000000000000000000000000..09e60bbbdcff33e3b3bd48198c0d6258945277e3 --- /dev/null +++ b/build-ffvpx.patch @@ -0,0 +1,24 @@ +diff -up thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c.build-ffvpx thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c +--- thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c.build-ffvpx 2024-06-24 22:43:40.000000000 +0200 ++++ thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c 2024-07-10 11:20:23.200948767 +0200 +@@ -887,7 +887,7 @@ static av_cold int av1_decode_init(AVCod + ff_cbs_fragment_reset(&s->current_obu); + } + +- s->dovi.logctx = avctx; ++ s->dovi.logctx = (AVContext *) avctx; + s->dovi.dv_profile = 10; // default for AV1 + sd = ff_get_coded_side_data(avctx, AV_PKT_DATA_DOVI_CONF); + if (sd && sd->size > 0) +diff -up thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c.build-ffvpx thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c +--- thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c.build-ffvpx 2024-07-10 12:46:57.005539959 +0200 ++++ thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c 2024-07-10 12:47:19.067507705 +0200 +@@ -289,7 +289,7 @@ static av_cold int libdav1d_init(AVCodec + c->delay = res > 1 ? res : 0; + #endif + +- dav1d->dovi.logctx = c; ++ dav1d->dovi.logctx = (AVContext *) c; + dav1d->dovi.dv_profile = 10; // default for AV1 + sd = ff_get_coded_side_data(c, AV_PKT_DATA_DOVI_CONF); + if (sd && sd->size > 0) diff --git a/build-libaom.patch b/build-libaom.patch new file mode 100644 index 0000000000000000000000000000000000000000..cab71b538e64626cbb94fd2a59b32c3258cdedea --- /dev/null +++ b/build-libaom.patch @@ -0,0 +1,20 @@ +diff -up firefox-128.0/config/external/moz.build.libaom firefox-128.0/config/external/moz.build +--- firefox-128.0/config/external/moz.build.libaom 2024-07-31 15:32:39.460374047 +0200 ++++ firefox-128.0/config/external/moz.build 2024-07-31 15:34:41.646064796 +0200 +@@ -39,8 +39,8 @@ if CONFIG["MOZ_VORBIS"]: + if not CONFIG["MOZ_SYSTEM_LIBVPX"]: + external_dirs += ["media/libvpx"] + ++external_dirs += ["media/libaom"] + if CONFIG["MOZ_AV1"]: +- external_dirs += ["media/libaom"] + external_dirs += ["media/libdav1d"] + + if not CONFIG["MOZ_SYSTEM_PNG"]: +diff -up firefox-128.0/third_party/aom/third_party/fastfeat/README.libaom firefox-128.0/third_party/aom/third_party/fastfeat/README +diff -up firefox-128.0/third_party/aom/third_party/googletest/README.libaom firefox-128.0/third_party/aom/third_party/googletest/README +diff -up firefox-128.0/third_party/aom/third_party/libwebm/README.libaom firefox-128.0/third_party/aom/third_party/libwebm/README +diff -up firefox-128.0/third_party/aom/third_party/libyuv/README.libaom firefox-128.0/third_party/aom/third_party/libyuv/README +diff -up firefox-128.0/third_party/aom/third_party/SVT-AV1/README.libaom firefox-128.0/third_party/aom/third_party/SVT-AV1/README +diff -up firefox-128.0/third_party/aom/third_party/vector/README.libaom firefox-128.0/third_party/aom/third_party/vector/README +diff -up firefox-128.0/third_party/aom/third_party/x86inc/README.libaom firefox-128.0/third_party/aom/third_party/x86inc/README diff --git a/disable-pipewire.patch b/disable-pipewire.patch index cea6b682243b709611cbfce63312d4aa303eece3..84017dea966015a74054921e5a8276a050d58285 100644 --- a/disable-pipewire.patch +++ b/disable-pipewire.patch @@ -1,242 +1,274 @@ -diff --git a/dom/media/webrtc/third_party_build/webrtc.mozbuild b/dom/media/webrtc/third_party_build/webrtc.mozbuild -index 30169c36c2..335e3cb1a1 100644 ---- a/dom/media/webrtc/third_party_build/webrtc.mozbuild -+++ b/dom/media/webrtc/third_party_build/webrtc.mozbuild -@@ -35,6 +35,3 @@ if CONFIG['MOZ_WEBRTC']: - - if CONFIG['MOZ_X11']: - DEFINES['WEBRTC_USE_X11'] = True -- -- if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": -- DEFINES['WEBRTC_USE_PIPEWIRE'] = True -diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -index 8c56b6b8e5..eaf8d7087a 100644 ---- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -+++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -@@ -232,102 +232,6 @@ if CONFIG["CPU_ARCH"] == "aarch64": - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- --if CONFIG["CPU_ARCH"] == "mips32": -- -- DEFINES["MIPS32_LE"] = True -- DEFINES["MIPS_FPU_LE"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- --if CONFIG["CPU_ARCH"] == "mips64": -- -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- - if CONFIG["CPU_ARCH"] == "ppc64": - - DEFINES["USE_X11"] = "1" -@@ -410,97 +314,6 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- - if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_X11"] = "1" -diff --git a/third_party/libwebrtc/modules/portal/portal_gn/moz.build b/third_party/libwebrtc/modules/portal/portal_gn/moz.build -index 77603c780b..e6f2c9e724 100644 ---- a/third_party/libwebrtc/modules/portal/portal_gn/moz.build -+++ b/third_party/libwebrtc/modules/portal/portal_gn/moz.build -@@ -26,7 +26,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True - DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" - DEFINES["WEBRTC_POSIX"] = True - DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["WEBRTC_USE_PIPEWIRE"] = True -+DEFINES["WEBRTC_USE_PIPEWIRE"] = False - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True -diff --git a/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build b/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build -index 86a0daf8fa..e895f2eb15 100644 ---- a/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build -+++ b/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build -@@ -24,7 +24,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True - DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" - DEFINES["WEBRTC_POSIX"] = True - DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["WEBRTC_USE_PIPEWIRE"] = True -+DEFINES["WEBRTC_USE_PIPEWIRE"] = False - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_GNU_SOURCE"] = True - DEFINES["_LARGEFILE64_SOURCE"] = True +diff -up firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild.disable-pipewire firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild +--- firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild.disable-pipewire 2024-07-17 14:01:36.290603114 +0200 ++++ firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild 2024-07-17 14:52:02.039208338 +0200 +@@ -31,7 +31,7 @@ if CONFIG["MOZ_WEBRTC"]: + and CONFIG["TARGET_CPU"].startswith("mips") + ) + ): +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True ++ DEFINES["WEBRTC_USE_PIPEWIRE"] = False + elif CONFIG["OS_TARGET"] == "Darwin": + DEFINES["WEBRTC_MAC"] = True + elif CONFIG["OS_TARGET"] == "WINNT": +diff -up firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build.disable-pipewire firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build +--- firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build.disable-pipewire 2024-07-17 14:01:36.291603109 +0200 ++++ firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build 2024-07-17 14:56:35.419826494 +0200 +@@ -241,102 +241,6 @@ if CONFIG["TARGET_CPU"] == "aarch64": + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["TARGET_CPU"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" +- ] +- +-if CONFIG["TARGET_CPU"] == "mips32": +- +- DEFINES["MIPS32_LE"] = True +- DEFINES["MIPS_FPU_LE"] = True +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" +- ] +- +-if CONFIG["TARGET_CPU"] == "mips64": +- +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" +- ] +- + if CONFIG["TARGET_CPU"] == "ppc64": + + DEFINES["USE_X11"] = "1" +@@ -389,35 +293,6 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG + + DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" + +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": +- +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" +- ] +- + if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64": + + DEFINES["USE_X11"] = "1" +@@ -446,95 +321,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CO + "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" + ] + +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": +- +- CXXFLAGS += [ +- "-msse2" +- ] +- +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" +- ] +- +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +- +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" +- ] +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": +- +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" +- ] + + if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": + +diff -up firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build.disable-pipewire firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build +--- firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build.disable-pipewire 2024-07-04 18:20:41.000000000 +0200 ++++ firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build 2024-07-17 14:01:36.291603109 +0200 +@@ -27,7 +27,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" + DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["WEBRTC_USE_PIPEWIRE"] = True ++DEFINES["WEBRTC_USE_PIPEWIRE"] = False + DEFINES["_FILE_OFFSET_BITS"] = "64" + DEFINES["_GNU_SOURCE"] = True + DEFINES["_LARGEFILE64_SOURCE"] = True +diff -up firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build.disable-pipewire firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build +--- firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build.disable-pipewire 2024-07-04 18:20:41.000000000 +0200 ++++ firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build 2024-07-17 14:01:36.291603109 +0200 +@@ -25,7 +25,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" + DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" +-DEFINES["WEBRTC_USE_PIPEWIRE"] = True ++DEFINES["WEBRTC_USE_PIPEWIRE"] = False + DEFINES["_FILE_OFFSET_BITS"] = "64" + DEFINES["_GNU_SOURCE"] = True + DEFINES["_LARGEFILE64_SOURCE"] = True diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..1fe92cf0fdf9c2625d878a2ace258f64c1e8ca44 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8_10 diff --git a/distribution.ini b/distribution.ini index 11f1f96d5696592ba20b88bd8521e20f2e659d8c..5d5c4d65b6ecd8fc411ea5e9dd5ce4b80e8a09bc 100644 --- a/distribution.ini +++ b/distribution.ini @@ -1,9 +1,9 @@ [Global] -id=fedora +id=redhat version=1.0 -about=Mozilla Firefox for Fedora +about=Mozilla Firefox for Red Hat Enterprise Linux [Preferences] -app.distributor=fedora -app.distributor.channel=fedora -app.partner.fedora=fedora +app.distributor=redhat +app.distributor.channel=redhat +app.partner.redhat=redhat diff --git a/download b/download index 29385998cbc2580edce2287096cf46ce61b987dc..25378f5f89e8c8423b90be6d7e918b8a3bd1eaee 100644 --- a/download +++ b/download @@ -1,8 +1,8 @@ -9b999bdcf031e29a4d8ce2b6f17e778e cbindgen-vendor.tar.xz -7052eb7173233eee436a1de890059c22 firefox-langpacks-115.13.0esr-20240708.tar.xz -5d6bbb7bc8c7e65017999c6635b14d21 firefox-115.13.0esr.b3.processed-source.tar.xz +fc25f988b87b5187d4e2f006efa699a3 cbindgen-vendor.tar.xz +1f353e99cd531478a7bbd04e74bc837a firefox-128.2.0esr.processed-source.tar.xz +8ee36668678fed8bf3f82d90f6428165 firefox-langpacks-128.2.0esr-20240827.tar.xz b3c1d2ea615cb0195f4f62b005773262 mochitest-python.tar.gz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm -3fdd30cefe44a98c424cb3aeca73f2b3 nss-3.90.0-3.el8_1.src.rpm -5c2f6d790957733c5f0d06f8caea3b0d nss-3.90.0-3.el9_0.src.rpm +a80dda6d1547e533e0ad64753d862567 nss-3.101.0-6.el8_2.src.rpm +34159eade10e31ddbcb9bebe1e74e05c nss-3.101.0-6.el9_0.src.rpm 6611e41665de11dd80b2ff5f1f40ee03 rust-cbindgen.tar.gz diff --git a/fedora-shebang-build.patch b/fedora-shebang-build.patch deleted file mode 100644 index 9ade86c309334fabd6fe4771209f54e1f0493d06..0000000000000000000000000000000000000000 --- a/fedora-shebang-build.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up firefox-73.0/build/unix/run-mozilla.sh.old firefox-73.0/build/unix/run-mozilla.sh ---- firefox-73.0/build/unix/run-mozilla.sh.old 2020-02-12 09:58:00.150895904 +0100 -+++ firefox-73.0/build/unix/run-mozilla.sh 2020-02-12 09:58:06.505860696 +0100 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/usr/bin/sh - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/firefox-enable-addons.patch b/firefox-enable-addons.patch index 15d0707cf01087cdee72c53a637c950f11c1d45b..5aeb23f7bc38d5795c23ecbc54162b70c8a860b7 100644 --- a/firefox-enable-addons.patch +++ b/firefox-enable-addons.patch @@ -1,10 +1,10 @@ -diff -up firefox-55.0/browser/app/profile/firefox.js.addons firefox-55.0/browser/app/profile/firefox.js ---- firefox-55.0/browser/app/profile/firefox.js.addons 2017-08-02 10:58:30.566363833 +0200 -+++ firefox-55.0/browser/app/profile/firefox.js 2017-08-02 10:59:15.377216959 +0200 -@@ -65,7 +65,8 @@ pref("extensions.systemAddon.update.url" +diff -up firefox-128.0/browser/app/profile/firefox.js.addons firefox-128.0/browser/app/profile/firefox.js +--- firefox-128.0/browser/app/profile/firefox.js.addons 2024-06-13 11:47:04.255428350 +0200 ++++ firefox-128.0/browser/app/profile/firefox.js 2024-06-13 11:53:00.442837371 +0200 +@@ -56,7 +56,8 @@ pref("extensions.systemAddon.update.enab // Disable add-ons that are not installed by the user in all scopes by default. - // See the SCOPE constants in AddonManager.jsm for values to use here. + // See the SCOPE constants in AddonManager.sys.mjs for values to use here. -pref("extensions.autoDisableScopes", 15); +pref("extensions.autoDisableScopes", 0); +pref("extensions.showMismatchUI", false); diff --git a/firefox-mozconfig b/firefox-mozconfig index 952a799e0942c805a4d1c4f136388cc411d46d2e..9944800a83c954b11babb74c4216d7263499f017 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -21,9 +21,11 @@ ac_add_options --with-unsigned-addon-scopes=app,system export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -export MOZ_TELEMETRY_REPORTING=1 export MOZ_UPDATE_CHANNEL=release export MOZ_APP_REMOTINGNAME=firefox +mk_add_options MOZ_TELEMETRY_REPORTING= +mk_add_options MOZ_NORMANDY= +mk_add_options MOZ_SERVICES_HEALTHREPORT= mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js similarity index 84% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index e24ebbd2f3b9d2804dee6d0bab56b918c5bc4ad3..4263a3d5d93dfbf3f48cf671cc708575603ee70b 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-redhat-default-prefs.js @@ -14,8 +14,8 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "https://openanolis.cn"); -pref("startup.homepage_welcome_url", "https://openanolis.cn"); +pref("startup.homepage_override_url", "%HOMEPAGE%"); +pref("startup.homepage_welcome_url", "%HOMEPAGE%"); pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); pref("media.gmp-gmpopenh264.autoupdate",true); pref("media.gmp-gmpopenh264.enabled",false); @@ -36,3 +36,7 @@ pref("browser.gnome-search-provider.enabled",true); pref("media.navigator.mediadatadecoder_vpx_enabled", true); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ pref("storage.nfs_filesystem", true); +/* Disable Private Attribution collection and submission */ +pref("dom.private-attribution.submission.enabled", false); +/* ECH is not supported in the system nss */ +pref("security.tls.ech.grease_probability", 0); diff --git a/firefox-tests-xpcshell-freeze.patch b/firefox-tests-xpcshell-freeze.patch deleted file mode 100644 index 111541797028ec20465fa0d2876dca70ee5db6cf..0000000000000000000000000000000000000000 --- a/firefox-tests-xpcshell-freeze.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up firefox-88.0/testing/xpcshell/runxpcshelltests.py.old firefox-88.0/testing/xpcshell/runxpcshelltests.py ---- firefox-88.0/testing/xpcshell/runxpcshelltests.py.old 2021-04-30 10:45:14.466616224 +0200 -+++ firefox-88.0/testing/xpcshell/runxpcshelltests.py 2021-04-30 10:45:21.339525085 +0200 -@@ -1382,8 +1382,8 @@ class XPCShellTests(object): - self.log.info("Process %s" % label) - self.log.info(msg) - -- dumpOutput(proc.stdout, "stdout") -- dumpOutput(proc.stderr, "stderr") -+ #dumpOutput(proc.stdout, "stdout") -+ #dumpOutput(proc.stderr, "stderr") - self.nodeProc = {} - - def startHttp3Server(self): diff --git a/firefox.sh.in b/firefox.sh.in index 6a3f6e4892f2570e315cb9d8c6f4f8932ef9c4c2..1a1c4b5ad6640e727e74e99b1efe284476804d17 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -64,7 +64,6 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox" MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks" MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE" -MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh" GETENFORCE_FILE="/usr/sbin/getenforce" ## @@ -247,35 +246,6 @@ fi NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1} export NSS_SSL_CBC_RANDOM_IV -# Prepare command line arguments -script_args="" -pass_arg_count=0 -while [ $# -gt $pass_arg_count ] -do - case "$1" in - -g | --debug) - script_args="$script_args -g" - debugging=1 - shift - ;; - -d | --debugger) - if [ $# -gt 1 ]; then - script_args="$script_args -d $2" - shift 2 - else - shift - fi - ;; - *) - # Move the unrecognized argument to the end of the list. - arg="$1" - shift - set -- "$@" "$arg" - pass_arg_count=`expr $pass_arg_count + 1` - ;; - esac -done - # Flatpak specific environment variables %FLATPAK_ENV_VARS% @@ -286,7 +256,7 @@ export MOZ_ALLOW_DOWNGRADE=1 debugging=0 if [ $debugging = 1 ] then - echo $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@" + echo $MOZ_PROGRAM "$@" fi -exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@" +exec $MOZ_PROGRAM "$@" diff --git a/firefox.spec b/firefox.spec index 837999f406374a7c6d0cdd33f4f3667d7a6ab3bc..4890222999ae48e4c7a2c9a0a55c907b3cbb93ce 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %define homepage %(grep '^HOME_URL\s*=' /etc/os-release | sed 's/^HOME_URL\s*=//;s/^\s*"//;s/"\s*$//') %global disable_toolsets 0 @@ -39,6 +38,14 @@ function dist_to_rhel_minor(str, start) if match then return 5 end + match = string.match(str, ".el10_%d+") + if match then + return string.sub(match, 7) + end + match = string.match(str, ".el10") + if match then + return 0 + end return -1 end} @@ -48,14 +55,18 @@ end} %global system_nss 1 %global bundle_nss 0 +%if 0%{?rhel} == 7 +%global bundle_nss 0 +%global system_nss 0 +%endif %if 0%{?rhel} == 8 - %if %{rhel_minor_version} <= 6 + %if %{rhel_minor_version} < 8 %global bundle_nss 1 %global system_nss 1 %endif %endif %if 0%{?rhel} == 9 - %if %{rhel_minor_version} <= 0 + %if %{rhel_minor_version} < 2 %global bundle_nss 1 %global system_nss 1 %endif @@ -65,29 +76,26 @@ end} %global llvm_version 7.0 %global nspr_version 4.35 %global nspr_version_max 4.36 -%global nss_version 3.90 -%global nss_version_max 3.91 -#%global rust_version 1.66 +%global nss_version 3.101 +%global nss_version_max 3.102 +%global rust_version 1.66 %global system_libvpx 0 +# Workaround for missing httpd24 libs in rust +%if 0%{?rhel} == 7 +%global ___build_pre %{___build_pre}; source scl_source enable httpd24 || : +%endif # Toolsets setup %global use_dts 0 %global use_gcc_ts 0 %global use_llvm_ts 0 %global use_nodejs_scl 0 -%global use_rust_ts 1 %global use_python3_scl 0 %global nodejs_build_req nodejs -%if 0%{?rhel} >= 8 - %global use_rust_ts 0 -%endif - -%if 0%{?rhel} == 8 && %{rhel_minor_version} < 6 - %ifarch aarch64 +%if 0%{?rhel} > 7 && 0%{?rhel} < 10 %global use_gcc_ts 1 - %endif %endif %if 0%{?rhel} == 7 @@ -123,7 +131,7 @@ end} # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g. # firefox-102.8.0esr.b2.processed-source.tar.xz # When unset use processed source file name as is. -%global buildnum .b3 +##global buildnum .b2 %bcond_without langpacks @@ -133,12 +141,12 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 115.13.0 -Release: 3%{anolis_release}%{?dist} +Version: 128.2.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ -%if 0%{?rhel} == 9 +%if 0%{?rhel} >= 9 ExcludeArch: %{ix86} %endif %if 0%{?rhel} == 8 @@ -164,12 +172,12 @@ ExcludeArch: aarch64 s390 ppc # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%%{version}%%{?pre_version}/source/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20240708.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20240827.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-anolis-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -189,11 +197,10 @@ Source37: mochitest-python.tar.gz # Bundled libraries Source401: nss-setup-flags-env.inc Source402: nspr-4.35.0-1.el8_1.src.rpm -Source403: nss-3.90.0-3.el8_1.src.rpm -Source404: nss-3.90.0-3.el9_0.src.rpm +Source403: nss-3.101.0-6.el8_2.src.rpm +Source404: nss-3.101.0-6.el9_0.src.rpm Source405: rust-cbindgen.tar.gz - # ---- RHEL specific patches --- # -- Downstream only -- Patch01: build-disable-elfhack.patch @@ -203,8 +210,10 @@ Patch05: build-rhel7-lower-node-min-version.patch Patch06: build-ppc64-abiv2.patch Patch07: build-rhel7-nasm-dwarf.patch # Disable PipeWire support for PipeWire 0.2 -Patch08: disable-pipewire.patch -Patch09: rhbz-2131158-webrtc-nss-fix.patch +Patch08: disable-pipewire.patch +Patch09: rhbz-2131158-webrtc-nss-fix.patch +Patch10: build-ffvpx.patch +Patch11: build-disable-gamepad.patch # -- Upstreamed patches -- Patch51: mozilla-bmo1170092.patch @@ -223,11 +232,11 @@ Patch106: mozilla-bmo998749.patch Patch107: mozilla-bmo1716707-swizzle.patch Patch108: mozilla-bmo1716707-svg.patch Patch109: mozilla-bmo1789216-disable-av1.patch +Patch110: build-libaom.patch # ---- Fedora specific patches ---- Patch151: firefox-enable-addons.patch Patch152: rhbz-1173156.patch -Patch153: fedora-shebang-build.patch Patch154: firefox-nss-addon-hack.patch # ARM run-time patch Patch155: rhbz-1354671.patch @@ -236,10 +245,8 @@ Patch155: rhbz-1354671.patch # Generate without context by # GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-xpcshell # GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-reftest -Patch201: firefox-tests-xpcshell-freeze.patch # ---- Security patches ---- -Patch301: CVE-2023-44488-libvpx.patch # BUILD REQURES/REQUIRES %if %{?system_nss} && !0%{?bundle_nss} @@ -256,7 +263,6 @@ BuildRequires: libvpx-devel >= 1.8.2 %endif BuildRequires: bzip2-devel -BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: libjpeg-devel @@ -299,6 +305,7 @@ BuildRequires: pipewire-devel %if 0%{?rhel} == 8 BuildRequires: cargo +BuildRequires: clang-libs >= %{llvm_version} BuildRequires: clang-devel >= %{llvm_version} BuildRequires: clang >= %{llvm_version} BuildRequires: llvm-devel >= %{llvm_version} @@ -311,7 +318,7 @@ BuildRequires: rustfmt >= %{rust_version} BuildRequires: rust >= %{rust_version} %endif -%if 0%{?rhel} == 9 +%if 0%{?rhel} >= 9 BuildRequires: cargo BuildRequires: clang clang-libs llvm llvm-devel BuildRequires: gcc @@ -321,12 +328,6 @@ BuildRequires: python3-setuptools BuildRequires: rust %endif -%if 0%{?use_dts} -BuildRequires: devtoolset-%{dts_version}-gcc -BuildRequires: devtoolset-%{dts_version}-gcc-c++ -BuildRequires: devtoolset-%{dts_version}-libatomic-devel -%endif - %if 0%{?use_llvm_ts} BuildRequires: llvm-toolset-%{llvm_version} BuildRequires: llvm-toolset-%{llvm_version}-clang @@ -338,6 +339,12 @@ BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel #BuildRequires: rust-toolset-%{rust_version} %endif +%if 0%{?use_dts} +BuildRequires: devtoolset-%{dts_version}-gcc +BuildRequires: devtoolset-%{dts_version}-gcc-c++ +BuildRequires: devtoolset-%{dts_version}-libatomic-devel +%endif + # Bundled nss/nspr requirement %if 0%{?bundle_nss} BuildRequires: gawk @@ -404,10 +411,11 @@ BuildRequires: xorg-x11-fonts-misc BuildRequires: xorg-x11-server-Xvfb %endif -%if 0%{?rhel} == 8 && %{rhel_minor_version} < 6 - %ifarch aarch64 -BuildRequires: gcc-toolset-12-gcc-plugin-annobin - %endif +%if 0%{?use_gcc_ts} +BuildRequires: gcc-toolset-13-runtime +BuildRequires: gcc-toolset-13-binutils +BuildRequires: gcc-toolset-13-gcc +BuildRequires: gcc-toolset-13-gcc-plugin-annobin %endif Requires: mozilla-filesystem @@ -431,12 +439,18 @@ Provides: bundled(audioipc-2) Provides: bundled(bergamot-translator) Provides: bundled(brotli) Provides: bundled(bsdiff) +Provides: bundled(bspatch) Provides: bundled(cairo) Provides: bundled(cfworker) Provides: bundled(cld2) +Provides: bundled(content) +Provides: bundled(content_analysis_sdk) Provides: bundled(cubeb) +Provides: bundled(cups) +Provides: bundled(d3) Provides: bundled(d3.js) Provides: bundled(double-conversion) +Provides: bundled(drm) Provides: bundled(expat) Provides: bundled(fastText) Provides: bundled(fathom) @@ -444,7 +458,9 @@ Provides: bundled(fdlibm) Provides: bundled(ffvpx) Provides: bundled(freetype2) Provides: bundled(function2) +Provides: bundled(gbm) Provides: bundled(gemmology) +Provides: bundled(googletest) Provides: bundled(graphite2) Provides: bundled(harfbuzz) Provides: bundled(highway) @@ -458,8 +474,10 @@ Provides: bundled(libcubeb) Provides: bundled(libdav1d) Provides: bundled(libdrm) Provides: bundled(libepoxy) +Provides: bundled(libfuzzer) Provides: bundled(libgbm) Provides: bundled(libjpeg) +Provides: bundled(libjxl) Provides: bundled(libmar) Provides: bundled(libmkv) Provides: bundled(libnestegg) @@ -478,7 +496,9 @@ Provides: bundled(libwebp) Provides: bundled(libwebrtc) Provides: bundled(libyuv) Provides: bundled(lit) +Provides: bundled(MotionMark) Provides: bundled(mp4parse-rust) +Provides: bundled(msgpack) Provides: bundled(msgpack-c) Provides: bundled(mtransport) Provides: bundled(nestegg) @@ -486,31 +506,52 @@ Provides: bundled(nICEr) Provides: bundled(nimbus) Provides: bundled(openmax_dl) Provides: bundled(openmax_il) +Provides: bundled(openvr) Provides: bundled(ots) Provides: bundled(pdf.js) +Provides: bundled(pdfjs) +Provides: bundled(perfetto) Provides: bundled(picosha2) Provides: bundled(PKI) +Provides: bundled(PKI.js) +Provides: bundled(puppeteer) +Provides: bundled(pywebsocket3) Provides: bundled(qcms) +Provides: bundled(reader) Provides: bundled(rlbox) Provides: bundled(rlbox_sandboxing_api) Provides: bundled(rlbox_wasm2c_sandbox) +Provides: bundled(schemas) Provides: bundled(sfntly) +Provides: bundled(simde) Provides: bundled(sipcc) Provides: bundled(skia) Provides: bundled(soundtouch) +Provides: bundled(source-map) +Provides: bundled(Speedometer3) Provides: bundled(sqlite3) +Provides: bundled(src) Provides: bundled(thebes) Provides: bundled(theora) Provides: bundled(usrsctp) +Provides: bundled(vendor) +Provides: bundled(vsdownload) Provides: bundled(wabt) Provides: bundled(wasm2c) +Provides: bundled(wasm2c_sandbox_compiler) +Provides: bundled(webaudio) +Provides: bundled(webgl-conf) Provides: bundled(WebRender) Provides: bundled(wgpu) +Provides: bundled(wgpu_bindings) Provides: bundled(woff2) Provides: bundled(xsimd) Provides: bundled(xz-embedded) Provides: bundled(ycbcr) Provides: bundled(zlib) +Provides: bundled(zstd) +Provides: bundled(Zycore) +Provides: bundled(Zydis) %if 0%{?bundle_nss} Provides: bundled(nss) = %{nss_version} @@ -521,68 +562,76 @@ Provides: bundled(nspr) = %{nspr_version} # List obtained by `get_rust_bundled_provides.sh build.log` script:: Provides: bundled(crate(aa-stroke)) = 0.1.0 Provides: bundled(crate(adler)) = 1.0.2 -Provides: bundled(crate(ahash)) = 0.7.6 -Provides: bundled(crate(aho-corasick)) = 0.7.20 -Provides: bundled(crate(alsa)) = 0.7.0 +Provides: bundled(crate(ahash)) = 0.8.11 +Provides: bundled(crate(aho-corasick)) = 1.1.0 +Provides: bundled(crate(alsa)) = 0.8.1 Provides: bundled(crate(alsa-sys)) = 0.3.1 Provides: bundled(crate(anyhow)) = 1.0.69 Provides: bundled(crate(app_services_logger)) = 0.1.0 -Provides: bundled(crate(app_units)) = 0.7.2 +Provides: bundled(crate(app_units)) = 0.7.3 Provides: bundled(crate(arrayref)) = 0.3.6 Provides: bundled(crate(arrayvec)) = 0.7.2 -Provides: bundled(crate(ash)) = 0.37.2+1.3.238 -Provides: bundled(crate(askama)) = 0.11.1 -Provides: bundled(crate(askama_derive)) = 0.11.2 +Provides: bundled(crate(ash)) = 0.38.0+1.3.281 +Provides: bundled(crate(askama)) = 0.12.0 +Provides: bundled(crate(askama_derive)) = 0.12.1 Provides: bundled(crate(askama_escape)) = 0.10.3 -Provides: bundled(crate(askama_shared)) = 0.12.2 Provides: bundled(crate(async-task)) = 4.3.0 -Provides: bundled(crate(async-trait)) = 0.1.64 +Provides: bundled(crate(async-trait)) = 0.1.68 Provides: bundled(crate(atomic_refcell)) = 0.1.9 -Provides: bundled(crate(audioipc2)) = 0.5.0 -Provides: bundled(crate(audioipc2-client)) = 0.5.0 -Provides: bundled(crate(audioipc2-server)) = 0.5.0 -Provides: bundled(crate(audio_thread_priority)) = 0.26.1 -Provides: bundled(crate(authenticator)) = 0.4.0-alpha.15 +Provides: bundled(crate(atty)) = 0.2.14 +Provides: bundled(crate(audioipc2)) = 0.6.0 +Provides: bundled(crate(audioipc2-client)) = 0.6.0 +Provides: bundled(crate(audioipc2-server)) = 0.6.0 +Provides: bundled(crate(audio_thread_priority)) = 0.32.0 +Provides: bundled(crate(authenticator)) = 0.4.0-alpha.24 Provides: bundled(crate(authrs_bridge)) = 0.1.0 Provides: bundled(crate(autocfg)) = 1.1.0 -Provides: bundled(crate(base64)) = 0.13.999 -Provides: bundled(crate(base64)) = 0.21.0 +Provides: bundled(crate(autocfg)) = 1.1.0 +Provides: bundled(crate(base64)) = 0.21.3 +Provides: bundled(crate(basic-toml)) = 0.1.2 Provides: bundled(crate(bhttp)) = 0.3.1 Provides: bundled(crate(binary_http)) = 0.1.0 Provides: bundled(crate(bincode)) = 1.3.3 Provides: bundled(crate(bindgen)) = 0.63.999 -Provides: bundled(crate(bindgen)) = 0.64.0 +Provides: bundled(crate(bindgen)) = 0.69.4 Provides: bundled(crate(bitflags)) = 1.3.2 -Provides: bundled(crate(bitflags)) = 2.999.999 +Provides: bundled(crate(bitflags)) = 1.999.999 +Provides: bundled(crate(bitflags)) = 2.5.0 Provides: bundled(crate(bitreader)) = 0.3.6 Provides: bundled(crate(bit-set)) = 0.5.3 Provides: bundled(crate(bit-vec)) = 0.6.3 Provides: bundled(crate(block-buffer)) = 0.10.3 Provides: bundled(crate(bookmark_sync)) = 0.1.0 +Provides: bundled(crate(buildid_reader)) = 0.1.0 Provides: bundled(crate(build-parallel)) = 0.1.2 Provides: bundled(crate(builtins-static)) = 0.1.0 -Provides: bundled(crate(byteorder)) = 1.4.3 +Provides: bundled(crate(bumpalo)) = 3.15.4 +Provides: bundled(crate(byteorder)) = 1.5.0 Provides: bundled(crate(bytes)) = 1.4.0 Provides: bundled(crate(cache-padded)) = 1.2.0 Provides: bundled(crate(camino)) = 1.1.2 Provides: bundled(crate(cargo_metadata)) = 0.15.3 Provides: bundled(crate(cargo-platform)) = 0.1.2 Provides: bundled(crate(cascade_bloom_filter)) = 0.1.0 -Provides: bundled(crate(cc)) = 1.0.73 +Provides: bundled(crate(cbindgen)) = 0.26.0 +Provides: bundled(crate(cc)) = 1.0.89 Provides: bundled(crate(cert_storage)) = 0.0.1 Provides: bundled(crate(cexpr)) = 0.6.0 -Provides: bundled(crate(cfg-if)) = 0.1.999 +Provides: bundled(crate(cfg_aliases)) = 0.1.1 Provides: bundled(crate(cfg-if)) = 1.0.0 Provides: bundled(crate(chardetng)) = 0.1.9 Provides: bundled(crate(chardetng_c)) = 0.1.2 Provides: bundled(crate(chrono)) = 0.4.19 Provides: bundled(crate(chunky-vec)) = 0.1.0 -Provides: bundled(crate(clang-sys)) = 1.6.0 +Provides: bundled(crate(clang-sys)) = 1.7.0 +Provides: bundled(crate(clap)) = 3.2.25 +Provides: bundled(crate(clap_lex)) = 0.2.4 Provides: bundled(crate(cmake)) = 0.1.999 Provides: bundled(crate(codespan-reporting)) = 0.11.1 +Provides: bundled(crate(core_maths)) = 0.1.0 Provides: bundled(crate(cose)) = 0.1.4 Provides: bundled(crate(cose-c)) = 0.1.5 -Provides: bundled(crate(cpufeatures)) = 0.2.5 +Provides: bundled(crate(cpufeatures)) = 0.2.8 Provides: bundled(crate(crc32fast)) = 1.3.2 Provides: bundled(crate(crossbeam-channel)) = 0.5.6 Provides: bundled(crate(crossbeam-deque)) = 0.8.2 @@ -591,55 +640,65 @@ Provides: bundled(crate(crossbeam-queue)) = 0.3.8 Provides: bundled(crate(crossbeam-utils)) = 0.8.14 Provides: bundled(crate(crypto-common)) = 0.1.6 Provides: bundled(crate(crypto_hash)) = 0.1.0 -Provides: bundled(crate(cssparser)) = 0.31.0 -Provides: bundled(crate(cssparser-macros)) = 0.6.0 +Provides: bundled(crate(cssparser)) = 0.34.0 +Provides: bundled(crate(cssparser-macros)) = 0.6.1 Provides: bundled(crate(cstr)) = 0.2.11 -Provides: bundled(crate(cty)) = 0.2.2 -Provides: bundled(crate(cubeb)) = 0.10.3 -Provides: bundled(crate(cubeb-backend)) = 0.10.3 -Provides: bundled(crate(cubeb-core)) = 0.10.3 -Provides: bundled(crate(cubeb-pulse)) = 0.4.1 -Provides: bundled(crate(cubeb-sys)) = 0.10.3 +Provides: bundled(crate(cubeb)) = 0.13.0 +Provides: bundled(crate(cubeb-backend)) = 0.13.0 +Provides: bundled(crate(cubeb-core)) = 0.13.0 +Provides: bundled(crate(cubeb-pulse)) = 0.5.0 +Provides: bundled(crate(cubeb-sys)) = 0.13.0 Provides: bundled(crate(dap_ffi)) = 0.1.0 -Provides: bundled(crate(darling)) = 0.13.99 -Provides: bundled(crate(darling)) = 0.14.3 -Provides: bundled(crate(darling_core)) = 0.14.3 -Provides: bundled(crate(darling_macro)) = 0.14.3 +Provides: bundled(crate(darling)) = 0.20.1 +Provides: bundled(crate(darling_core)) = 0.20.1 +Provides: bundled(crate(darling_macro)) = 0.20.1 Provides: bundled(crate(data-encoding)) = 2.3.3 Provides: bundled(crate(data-encoding-ffi)) = 0.1.0 +Provides: bundled(crate(data_storage)) = 0.0.1 Provides: bundled(crate(dbus)) = 0.6.5 +Provides: bundled(crate(deranged)) = 0.3.11 Provides: bundled(crate(derive_common)) = 0.0.1 -Provides: bundled(crate(derive_more)) = 0.99.17 +Provides: bundled(crate(derive_more)) = 0.99.999 +Provides: bundled(crate(derive_more)) = 1.0.0-beta.2 +Provides: bundled(crate(derive_more-impl)) = 1.0.0-beta.2 Provides: bundled(crate(digest)) = 0.10.6 +Provides: bundled(crate(diplomat)) = 0.7.0 +Provides: bundled(crate(diplomat_core)) = 0.7.0 +Provides: bundled(crate(diplomat-runtime)) = 0.7.0 Provides: bundled(crate(dirs)) = 4.0.0 Provides: bundled(crate(dirs-sys)) = 0.3.7 -Provides: bundled(crate(displaydoc)) = 0.2.3 +Provides: bundled(crate(displaydoc)) = 0.2.4 Provides: bundled(crate(dns-parser)) = 0.8.0 +Provides: bundled(crate(document-features)) = 0.2.8 Provides: bundled(crate(dogear)) = 0.5.0 Provides: bundled(crate(dom)) = 0.1.0 +Provides: bundled(crate(dom_fragmentdirectives)) = 0.1.0 Provides: bundled(crate(dtoa)) = 0.4.8 Provides: bundled(crate(dtoa-short)) = 0.3.3 Provides: bundled(crate(either)) = 1.8.1 Provides: bundled(crate(encoding_c)) = 0.9.8 Provides: bundled(crate(encoding_c_mem)) = 0.2.6 Provides: bundled(crate(encoding_glue)) = 0.1.0 -Provides: bundled(crate(encoding_rs)) = 0.8.32 -Provides: bundled(crate(enumset)) = 1.0.12 -Provides: bundled(crate(enumset_derive)) = 0.6.1 +Provides: bundled(crate(encoding_rs)) = 0.8.34 +Provides: bundled(crate(enum-map)) = 2.7.3 +Provides: bundled(crate(enum-map-derive)) = 0.17.0 +Provides: bundled(crate(enumset)) = 1.1.2 +Provides: bundled(crate(enumset_derive)) = 0.8.1 Provides: bundled(crate(env_logger)) = 0.10.0 -Provides: bundled(crate(env_logger)) = 0.9.999 +Provides: bundled(crate(equivalent)) = 1.0.1 Provides: bundled(crate(error-chain)) = 0.12.4 Provides: bundled(crate(error-support)) = 0.1.0 Provides: bundled(crate(error-support-macros)) = 0.1.0 Provides: bundled(crate(etagere)) = 0.2.7 -Provides: bundled(crate(euclid)) = 0.22.7 -Provides: bundled(crate(fallible_collections)) = 0.4.6 -Provides: bundled(crate(fallible-iterator)) = 0.2.0 +Provides: bundled(crate(euclid)) = 0.22.10 +Provides: bundled(crate(fallible_collections)) = 0.4.9 +Provides: bundled(crate(fallible-iterator)) = 0.3.0 Provides: bundled(crate(fallible-streaming-iterator)) = 0.1.9 Provides: bundled(crate(fastrand)) = 1.9.0 +Provides: bundled(crate(fastrand)) = 2.0.0 Provides: bundled(crate(ffi-support)) = 0.4.4 Provides: bundled(crate(firefox-on-glean)) = 0.1.0 -Provides: bundled(crate(flate2)) = 1.0.25 +Provides: bundled(crate(flate2)) = 1.0.26 Provides: bundled(crate(fluent)) = 0.16.0 Provides: bundled(crate(fluent-bundle)) = 0.15.2 Provides: bundled(crate(fluent-fallback)) = 0.7.0 @@ -650,64 +709,82 @@ Provides: bundled(crate(fluent-pseudo)) = 0.3.1 Provides: bundled(crate(fluent-syntax)) = 0.11.0 Provides: bundled(crate(fnv)) = 1.0.7 Provides: bundled(crate(fog_control)) = 0.1.0 +Provides: bundled(crate(form_urlencoded)) = 1.2.1 Provides: bundled(crate(freetype)) = 0.7.0 Provides: bundled(crate(fs-err)) = 2.9.0 -Provides: bundled(crate(futures)) = 0.3.26 -Provides: bundled(crate(futures-channel)) = 0.3.26 -Provides: bundled(crate(futures-core)) = 0.3.26 -Provides: bundled(crate(futures-executor)) = 0.3.26 -Provides: bundled(crate(futures-io)) = 0.3.26 -Provides: bundled(crate(futures-macro)) = 0.3.26 -Provides: bundled(crate(futures-sink)) = 0.3.26 -Provides: bundled(crate(futures-task)) = 0.3.26 -Provides: bundled(crate(futures-util)) = 0.3.26 +Provides: bundled(crate(futures)) = 0.3.28 +Provides: bundled(crate(futures-channel)) = 0.3.28 +Provides: bundled(crate(futures-core)) = 0.3.28 +Provides: bundled(crate(futures-executor)) = 0.3.28 +Provides: bundled(crate(futures-io)) = 0.3.28 +Provides: bundled(crate(futures-macro)) = 0.3.28 +Provides: bundled(crate(futures-sink)) = 0.3.28 +Provides: bundled(crate(futures-task)) = 0.3.28 +Provides: bundled(crate(futures-util)) = 0.3.28 Provides: bundled(crate(fxhash)) = 0.2.1 Provides: bundled(crate(gecko_logger)) = 0.1.0 Provides: bundled(crate(gecko-profiler)) = 0.1.0 Provides: bundled(crate(geckoservo)) = 0.0.1 Provides: bundled(crate(generic-array)) = 0.14.6 -Provides: bundled(crate(getrandom)) = 0.2.9 +Provides: bundled(crate(getrandom)) = 0.2.14 Provides: bundled(crate(gkrust)) = 0.1.0 Provides: bundled(crate(gkrust-shared)) = 0.1.0 Provides: bundled(crate(gkrust_utils)) = 0.1.0 Provides: bundled(crate(gleam)) = 0.15.0 -Provides: bundled(crate(glean)) = 52.7.0 -Provides: bundled(crate(glean-core)) = 52.7.0 +Provides: bundled(crate(glean)) = 60.1.1 +Provides: bundled(crate(glean-core)) = 60.1.1 Provides: bundled(crate(gl_generator)) = 0.14.0 Provides: bundled(crate(glob)) = 0.3.1 Provides: bundled(crate(glsl)) = 6.0.2 -Provides: bundled(crate(glslopt)) = 0.1.9 +Provides: bundled(crate(glslopt)) = 0.1.10 Provides: bundled(crate(glsl-to-cxx)) = 0.1.0 -Provides: bundled(crate(goblin)) = 0.6.0 +Provides: bundled(crate(goblin)) = 0.8.1 Provides: bundled(crate(golden_gate)) = 0.1.0 -Provides: bundled(crate(gpu-alloc)) = 0.5.3 -Provides: bundled(crate(gpu-alloc-types)) = 0.2.0 -Provides: bundled(crate(gpu-descriptor)) = 0.2.3 -Provides: bundled(crate(gpu-descriptor-types)) = 0.1.1 +Provides: bundled(crate(gpu-alloc)) = 0.6.0 +Provides: bundled(crate(gpu-alloc-types)) = 0.3.0 +Provides: bundled(crate(gpu-descriptor)) = 0.3.0 +Provides: bundled(crate(gpu-descriptor-types)) = 0.2.0 Provides: bundled(crate(half)) = 1.8.2 Provides: bundled(crate(hashbrown)) = 0.12.3 -Provides: bundled(crate(hashlink)) = 0.8.1 +Provides: bundled(crate(hashbrown)) = 0.13.999 +Provides: bundled(crate(hashbrown)) = 0.14.5 +Provides: bundled(crate(hashlink)) = 0.9.1 Provides: bundled(crate(heck)) = 0.4.1 Provides: bundled(crate(hex)) = 0.4.3 Provides: bundled(crate(hexf-parse)) = 0.2.1 Provides: bundled(crate(http_sfv)) = 0.1.0 +Provides: bundled(crate(icu_capi)) = 1.4.0 +Provides: bundled(crate(icu_collections)) = 1.4.0 +Provides: bundled(crate(icu_locid)) = 1.4.0 +Provides: bundled(crate(icu_locid_transform)) = 1.4.0 +Provides: bundled(crate(icu_locid_transform_data)) = 1.4.0 +Provides: bundled(crate(icu_properties)) = 1.4.0 +Provides: bundled(crate(icu_properties_data)) = 1.4.0 +Provides: bundled(crate(icu_provider)) = 1.4.0 +Provides: bundled(crate(icu_provider_adapters)) = 1.4.0 +Provides: bundled(crate(icu_provider_macros)) = 1.4.0 +Provides: bundled(crate(icu_segmenter)) = 1.4.0 +Provides: bundled(crate(icu_segmenter_data)) = 1.4.0 Provides: bundled(crate(id-arena)) = 2.2.1 Provides: bundled(crate(ident_case)) = 1.0.1 -Provides: bundled(crate(idna)) = 0.2.3 -Provides: bundled(crate(indexmap)) = 1.9.2 -Provides: bundled(crate(inherent)) = 1.0.4 -Provides: bundled(crate(instant)) = 0.1.12 +Provides: bundled(crate(idna)) = 0.5.0 +Provides: bundled(crate(indexmap)) = 1.9.3 +Provides: bundled(crate(indexmap)) = 2.2.6 +Provides: bundled(crate(inherent)) = 1.0.7 Provides: bundled(crate(interrupt-support)) = 0.1.0 Provides: bundled(crate(intl-memoizer)) = 0.5.1 Provides: bundled(crate(intl_pluralrules)) = 7.0.2 +Provides: bundled(crate(io-lifetimes)) = 1.0.10 Provides: bundled(crate(iovec)) = 0.1.4 Provides: bundled(crate(ipcclientcerts-static)) = 0.1.0 Provides: bundled(crate(itertools)) = 0.10.5 Provides: bundled(crate(itoa)) = 1.0.5 +Provides: bundled(crate(itoa)) = 1.0.6 Provides: bundled(crate(jobserver)) = 0.1.25 Provides: bundled(crate(jog)) = 0.1.0 Provides: bundled(crate(jsrust)) = 0.1.0 Provides: bundled(crate(jsrust_shared)) = 0.1.0 +Provides: bundled(crate(keccak)) = 0.1.4 Provides: bundled(crate(khronos_api)) = 3.1.0 Provides: bundled(crate(kvstore)) = 0.1.0 Provides: bundled(crate(l10nregistry)) = 0.3.0 @@ -715,35 +792,45 @@ Provides: bundled(crate(l10nregistry-ffi)) = 0.1.0 Provides: bundled(crate(lazycell)) = 1.3.0 Provides: bundled(crate(lazy_static)) = 1.4.0 Provides: bundled(crate(leb128)) = 0.2.5 -Provides: bundled(crate(libc)) = 0.2.139 +Provides: bundled(crate(libc)) = 0.2.144 +Provides: bundled(crate(libc)) = 0.2.153 Provides: bundled(crate(libdbus-sys)) = 0.2.2 -Provides: bundled(crate(libloading)) = 0.7.4 -Provides: bundled(crate(libsqlite3-sys)) = 0.25.2 +Provides: bundled(crate(libloading)) = 0.8.3 +Provides: bundled(crate(libm)) = 0.2.6 +Provides: bundled(crate(libsqlite3-sys)) = 0.28.0 Provides: bundled(crate(libudev)) = 0.2.0 Provides: bundled(crate(libudev-sys)) = 0.1.3 +Provides: bundled(crate(linux-raw-sys)) = 0.3.7 +Provides: bundled(crate(linux-raw-sys)) = 0.4.12 +Provides: bundled(crate(litemap)) = 0.7.2 +Provides: bundled(crate(litrs)) = 0.4.1 Provides: bundled(crate(lmdb-rkv)) = 0.14.0 Provides: bundled(crate(lmdb-rkv-sys)) = 0.11.2 Provides: bundled(crate(localization-ffi)) = 0.1.0 Provides: bundled(crate(lock_api)) = 0.4.9 Provides: bundled(crate(log)) = 0.4.17 +Provides: bundled(crate(log)) = 0.4.20 Provides: bundled(crate(malloc_size_of)) = 0.0.1 -Provides: bundled(crate(malloc_size_of_derive)) = 0.1.2 +Provides: bundled(crate(malloc_size_of_derive)) = 0.1.3 Provides: bundled(crate(mapped_hyph)) = 0.4.3 Provides: bundled(crate(matches)) = 0.1.10 Provides: bundled(crate(md-5)) = 0.10.5 Provides: bundled(crate(mdns_service)) = 0.1.1 Provides: bundled(crate(memalloc)) = 0.1.0 Provides: bundled(crate(memchr)) = 2.5.0 -Provides: bundled(crate(memmap2)) = 0.5.9 -Provides: bundled(crate(memoffset)) = 0.8.0 +Provides: bundled(crate(memmap2)) = 0.5.999 +Provides: bundled(crate(memmap2)) = 0.8.999 +Provides: bundled(crate(memmap2)) = 0.9.3 +Provides: bundled(crate(memoffset)) = 0.8.999 +Provides: bundled(crate(memoffset)) = 0.9.0 Provides: bundled(crate(midir)) = 0.7.0 Provides: bundled(crate(midir_impl)) = 0.1.0 Provides: bundled(crate(mime)) = 0.3.16 Provides: bundled(crate(mime_guess)) = 2.0.4 Provides: bundled(crate(mime-guess-ffi)) = 0.1.0 Provides: bundled(crate(minimal-lexical)) = 0.2.1 -Provides: bundled(crate(miniz_oxide)) = 0.6.2 -Provides: bundled(crate(mio)) = 0.8.0 +Provides: bundled(crate(miniz_oxide)) = 0.7.1 +Provides: bundled(crate(mio)) = 0.8.8 Provides: bundled(crate(moz_asserts)) = 0.1.0 Provides: bundled(crate(mozbuild)) = 0.1.0 Provides: bundled(crate(moz_cbor)) = 0.1.2 @@ -754,145 +841,175 @@ Provides: bundled(crate(mozurl)) = 0.0.1 Provides: bundled(crate(mp4parse)) = 0.17.0 Provides: bundled(crate(mp4parse_capi)) = 0.17.0 Provides: bundled(crate(murmurhash3)) = 0.0.5 -Provides: bundled(crate(naga)) = 0.12.0 -Provides: bundled(crate(neqo-common)) = 0.6.4 -Provides: bundled(crate(neqo-crypto)) = 0.6.4 +Provides: bundled(crate(naga)) = 0.20.0 +Provides: bundled(crate(neqo-common)) = 0.7.9 +Provides: bundled(crate(neqo-crypto)) = 0.7.9 Provides: bundled(crate(neqo_glue)) = 0.1.0 -Provides: bundled(crate(neqo-http3)) = 0.6.4 -Provides: bundled(crate(neqo-qpack)) = 0.6.4 -Provides: bundled(crate(neqo-transport)) = 0.6.4 +Provides: bundled(crate(neqo-http3)) = 0.7.9 +Provides: bundled(crate(neqo-qpack)) = 0.7.9 +Provides: bundled(crate(neqo-transport)) = 0.7.9 Provides: bundled(crate(netwerk_helper)) = 0.0.1 Provides: bundled(crate(new_debug_unreachable)) = 1.0.4 -Provides: bundled(crate(nix)) = 0.24.99 -Provides: bundled(crate(nix)) = 0.26.2 +Provides: bundled(crate(nix)) = 0.26.99 +Provides: bundled(crate(nix)) = 0.28.0 Provides: bundled(crate(nom)) = 7.1.3 Provides: bundled(crate(nserror)) = 0.1.0 Provides: bundled(crate(nss_build_common)) = 0.1.0 -Provides: bundled(crate(nss-gk-api)) = 0.2.1 +Provides: bundled(crate(nss-gk-api)) = 0.3.0 Provides: bundled(crate(nsstring)) = 0.1.0 +Provides: bundled(crate(num-conv)) = 0.1.0 Provides: bundled(crate(num_cpus)) = 1.15.0 -Provides: bundled(crate(num-derive)) = 0.3.3 +Provides: bundled(crate(num-derive)) = 0.4.2 Provides: bundled(crate(num-integer)) = 0.1.45 Provides: bundled(crate(num-traits)) = 0.2.15 -Provides: bundled(crate(object)) = 0.30.3 +Provides: bundled(crate(object)) = 0.32.0 Provides: bundled(crate(oblivious_http)) = 0.1.0 Provides: bundled(crate(ohttp)) = 0.3.1 -Provides: bundled(crate(once_cell)) = 1.17.1 +Provides: bundled(crate(once_cell)) = 1.19.0 +Provides: bundled(crate(oneshot-uniffi)) = 0.1.6 Provides: bundled(crate(ordered-float)) = 3.4.0 Provides: bundled(crate(origin-trials-ffi)) = 0.1.0 Provides: bundled(crate(origin-trial-token)) = 0.1.1 -Provides: bundled(crate(owning_ref)) = 0.4.1 -Provides: bundled(crate(parking_lot)) = 0.11.2 -Provides: bundled(crate(parking_lot)) = 0.12.999 -Provides: bundled(crate(parking_lot_core)) = 0.8.6 +Provides: bundled(crate(os_str_bytes)) = 6.5.0 +Provides: bundled(crate(oxilangtag)) = 0.1.3 +Provides: bundled(crate(oxilangtag-ffi)) = 0.1.0 +Provides: bundled(crate(parking_lot)) = 0.12.1 +Provides: bundled(crate(parking_lot_core)) = 0.9.9 Provides: bundled(crate(paste)) = 1.0.11 -Provides: bundled(crate(peeking_take_while)) = 0.1.2 Provides: bundled(crate(peek-poke)) = 0.3.0 Provides: bundled(crate(peek-poke-derive)) = 0.3.0 -Provides: bundled(crate(percent-encoding)) = 2.2.0 -Provides: bundled(crate(phf)) = 0.10.1 -Provides: bundled(crate(phf_codegen)) = 0.10.0 -Provides: bundled(crate(phf_generator)) = 0.10.0 -Provides: bundled(crate(phf_macros)) = 0.10.0 -Provides: bundled(crate(phf_shared)) = 0.10.0 +Provides: bundled(crate(percent-encoding)) = 2.3.1 +Provides: bundled(crate(phf)) = 0.11.2 +Provides: bundled(crate(phf_codegen)) = 0.11.2 +Provides: bundled(crate(phf_generator)) = 0.11.2 +Provides: bundled(crate(phf_macros)) = 0.11.2 +Provides: bundled(crate(phf_shared)) = 0.11.2 Provides: bundled(crate(pin-project-lite)) = 0.2.9 Provides: bundled(crate(pin-utils)) = 0.1.0 Provides: bundled(crate(pkcs11-bindings)) = 0.1.5 Provides: bundled(crate(pkg-config)) = 0.3.26 Provides: bundled(crate(plain)) = 0.2.3 Provides: bundled(crate(plane-split)) = 0.18.0 +Provides: bundled(crate(powerfmt)) = 0.2.0 Provides: bundled(crate(ppv-lite86)) = 0.2.17 Provides: bundled(crate(precomputed-hash)) = 0.1.1 Provides: bundled(crate(prefs_parser)) = 0.0.1 -Provides: bundled(crate(prio)) = 0.9.1 +Provides: bundled(crate(prio)) = 0.16.2 Provides: bundled(crate(processtools)) = 0.1.0 -Provides: bundled(crate(proc-macro2)) = 1.0.51 -Provides: bundled(crate(proc-macro-hack)) = 0.5.20+deprecated +Provides: bundled(crate(proc-macro2)) = 1.0.74 +Provides: bundled(crate(proc-macro2)) = 1.0.85 Provides: bundled(crate(profiler_helper)) = 0.1.0 Provides: bundled(crate(profiler-macros)) = 0.1.0 Provides: bundled(crate(profiling)) = 1.0.7 -Provides: bundled(crate(prost)) = 0.8.0 -Provides: bundled(crate(prost-derive)) = 0.8.0 +Provides: bundled(crate(prost)) = 0.12.1 +Provides: bundled(crate(prost-derive)) = 0.12.1 Provides: bundled(crate(pulse)) = 0.3.0 Provides: bundled(crate(pulse-ffi)) = 0.1.0 -Provides: bundled(crate(qcms)) = 0.2.0 -Provides: bundled(crate(qlog)) = 0.4.0 +Provides: bundled(crate(qcms)) = 0.3.0 +Provides: bundled(crate(qlog)) = 0.13.0 Provides: bundled(crate(quick-error)) = 1.2.3 -Provides: bundled(crate(quote)) = 1.0.23 +Provides: bundled(crate(quote)) = 1.0.27 +Provides: bundled(crate(quote)) = 1.0.35 Provides: bundled(crate(rand)) = 0.8.5 Provides: bundled(crate(rand_chacha)) = 0.3.1 Provides: bundled(crate(rand_core)) = 0.6.4 -Provides: bundled(crate(raw-window-handle)) = 0.5.0 +Provides: bundled(crate(raw-window-handle)) = 0.6.0 Provides: bundled(crate(rayon)) = 1.6.1 -Provides: bundled(crate(rayon-core)) = 1.10.2 -Provides: bundled(crate(regex)) = 1.7.1 -Provides: bundled(crate(regex-syntax)) = 0.6.28 +Provides: bundled(crate(rayon-core)) = 1.12.0 +Provides: bundled(crate(regex)) = 1.9.4 +Provides: bundled(crate(regex-automata)) = 0.3.7 +Provides: bundled(crate(regex-syntax)) = 0.7.5 +Provides: bundled(crate(relevancy)) = 0.1.0 +Provides: bundled(crate(remote_settings)) = 0.1.0 Provides: bundled(crate(remove_dir_all)) = 0.5.3 Provides: bundled(crate(replace_with)) = 0.1.7 Provides: bundled(crate(ringbuf)) = 0.2.8 -Provides: bundled(crate(rkv)) = 0.18.4 -Provides: bundled(crate(ron)) = 0.8.0 +Provides: bundled(crate(rkv)) = 0.19.0 +Provides: bundled(crate(ron)) = 0.8.1 Provides: bundled(crate(rsclientcerts)) = 0.1.0 Provides: bundled(crate(rsdparsa_capi)) = 0.1.0 Provides: bundled(crate(runloop)) = 0.1.0 Provides: bundled(crate(rure)) = 0.2.2 -Provides: bundled(crate(rusqlite)) = 0.28.0 +Provides: bundled(crate(rusqlite)) = 0.31.0 Provides: bundled(crate(rust_cascade)) = 1.5.0 Provides: bundled(crate(rustc-demangle)) = 0.1.21 Provides: bundled(crate(rustc-hash)) = 1.1.0 Provides: bundled(crate(rustc_version)) = 0.4.0 Provides: bundled(crate(rust_decimal)) = 1.28.1 +Provides: bundled(crate(rustix)) = 0.37.19 +Provides: bundled(crate(rustix)) = 0.38.28 Provides: bundled(crate(ryu)) = 1.0.12 +Provides: bundled(crate(ryu)) = 1.0.13 Provides: bundled(crate(same-file)) = 1.0.6 Provides: bundled(crate(scopeguard)) = 1.1.0 -Provides: bundled(crate(scroll)) = 0.11.0 -Provides: bundled(crate(scroll_derive)) = 0.11.0 +Provides: bundled(crate(scroll)) = 0.12.0 +Provides: bundled(crate(scroll_derive)) = 0.12.0 Provides: bundled(crate(selectors)) = 0.22.0 Provides: bundled(crate(self_cell)) = 0.10.2 Provides: bundled(crate(semver)) = 1.0.16 -Provides: bundled(crate(serde)) = 1.0.152 +Provides: bundled(crate(serde)) = 1.0.163 +Provides: bundled(crate(serde)) = 1.0.203 Provides: bundled(crate(serde_bytes)) = 0.11.9 Provides: bundled(crate(serde_cbor)) = 0.11.2 -Provides: bundled(crate(serde_derive)) = 1.0.152 -Provides: bundled(crate(serde_json)) = 1.0.93 -Provides: bundled(crate(serde_with)) = 1.14.0 -Provides: bundled(crate(serde_with_macros)) = 1.5.2 +Provides: bundled(crate(serde_derive)) = 1.0.163 +Provides: bundled(crate(serde_derive)) = 1.0.203 +Provides: bundled(crate(serde_json)) = 1.0.116 +Provides: bundled(crate(serde_json)) = 1.0.96 +Provides: bundled(crate(serde_path_to_error)) = 0.1.11 +Provides: bundled(crate(serde_with)) = 3.0.0 +Provides: bundled(crate(serde_with_macros)) = 3.0.0 Provides: bundled(crate(servo_arc)) = 0.1.1 -Provides: bundled(crate(sfv)) = 0.9.3 +Provides: bundled(crate(sfv)) = 0.9.4 Provides: bundled(crate(sha1)) = 0.10.5 Provides: bundled(crate(sha2)) = 0.10.6 +Provides: bundled(crate(sha3)) = 0.10.8 Provides: bundled(crate(shlex)) = 1.1.0 Provides: bundled(crate(siphasher)) = 0.3.10 Provides: bundled(crate(slab)) = 0.4.8 Provides: bundled(crate(smallbitvec)) = 2.5.1 -Provides: bundled(crate(smallvec)) = 1.10.0 -Provides: bundled(crate(socket2)) = 0.4.7 -Provides: bundled(crate(spirv)) = 0.2.0+1.5.4 +Provides: bundled(crate(smallvec)) = 1.13.1 +Provides: bundled(crate(smawk)) = 0.3.2 +Provides: bundled(crate(socket2)) = 0.4.999 +Provides: bundled(crate(socket2)) = 0.5.7 +Provides: bundled(crate(spirv)) = 0.3.0+sdk-1.3.268.0 Provides: bundled(crate(sql-support)) = 0.1.0 Provides: bundled(crate(stable_deref_trait)) = 1.2.0 Provides: bundled(crate(static_assertions)) = 1.1.0 Provides: bundled(crate(static_prefs)) = 0.1.0 Provides: bundled(crate(storage)) = 0.1.0 Provides: bundled(crate(storage_variant)) = 0.1.0 +Provides: bundled(crate(strck)) = 0.1.2 +Provides: bundled(crate(strck_ident)) = 0.1.2 Provides: bundled(crate(strsim)) = 0.10.0 Provides: bundled(crate(style)) = 0.0.1 Provides: bundled(crate(style_derive)) = 0.0.1 Provides: bundled(crate(style_traits)) = 0.0.1 +Provides: bundled(crate(subtle)) = 2.5.0 +Provides: bundled(crate(suggest)) = 0.1.0 Provides: bundled(crate(svg_fmt)) = 0.4.1 Provides: bundled(crate(swgl)) = 0.1.0 -Provides: bundled(crate(syn)) = 1.0.107 +Provides: bundled(crate(syn)) = 1.0.109 +Provides: bundled(crate(syn)) = 2.0.16 +Provides: bundled(crate(syn)) = 2.0.46 Provides: bundled(crate(sync15)) = 0.1.0 Provides: bundled(crate(sync-guid)) = 0.1.0 -Provides: bundled(crate(synstructure)) = 0.12.6 +Provides: bundled(crate(synstructure)) = 0.13.1 Provides: bundled(crate(tabs)) = 0.1.0 -Provides: bundled(crate(tempfile)) = 3.3.0 +Provides: bundled(crate(tempfile)) = 3.5.0 +Provides: bundled(crate(tempfile)) = 3.9.0 Provides: bundled(crate(termcolor)) = 1.2.0 +Provides: bundled(crate(termcolor)) = 1.4.1 +Provides: bundled(crate(textwrap)) = 0.16.0 +Provides: bundled(crate(textwrap)) = 0.16.1 Provides: bundled(crate(thin-vec)) = 0.2.12 -Provides: bundled(crate(thiserror)) = 1.0.38 -Provides: bundled(crate(thiserror-impl)) = 1.0.38 +Provides: bundled(crate(thiserror)) = 1.0.61 +Provides: bundled(crate(thiserror-impl)) = 1.0.61 Provides: bundled(crate(threadbound)) = 0.1.5 Provides: bundled(crate(time)) = 0.1.45 -Provides: bundled(crate(tinystr)) = 0.7.1 +Provides: bundled(crate(time)) = 0.3.36 +Provides: bundled(crate(time-core)) = 0.1.2 +Provides: bundled(crate(time-macros)) = 0.2.18 +Provides: bundled(crate(tinystr)) = 0.7.4 Provides: bundled(crate(tinyvec)) = 1.999.999 Provides: bundled(crate(toml)) = 0.5.11 Provides: bundled(crate(topological-sort)) = 0.1.0 @@ -902,55 +1019,68 @@ Provides: bundled(crate(tracy-rs)) = 0.1.2 Provides: bundled(crate(typed-arena-nomut)) = 0.1.0 Provides: bundled(crate(type-map)) = 0.4.0 Provides: bundled(crate(typenum)) = 1.16.0 +Provides: bundled(crate(types)) = 0.1.0 Provides: bundled(crate(uluru)) = 3.0.0 Provides: bundled(crate(unicase)) = 2.6.0 -Provides: bundled(crate(unic-langid)) = 0.9.1 +Provides: bundled(crate(unic-langid)) = 0.9.5 Provides: bundled(crate(unic-langid-ffi)) = 0.1.0 -Provides: bundled(crate(unic-langid-impl)) = 0.9.1 -Provides: bundled(crate(unicode-bidi)) = 0.3.8 +Provides: bundled(crate(unic-langid-impl)) = 0.9.5 +Provides: bundled(crate(unicode-bidi)) = 0.3.15 +Provides: bundled(crate(unicode-bidi-ffi)) = 0.1.0 Provides: bundled(crate(unicode-ident)) = 1.0.6 +Provides: bundled(crate(unicode-ident)) = 1.0.8 +Provides: bundled(crate(unicode-linebreak)) = 0.1.5 Provides: bundled(crate(unicode-normalization)) = 0.1.22 -Provides: bundled(crate(unicode-segmentation)) = 1.10.0 Provides: bundled(crate(unicode-width)) = 0.1.10 Provides: bundled(crate(unicode-xid)) = 0.2.4 -Provides: bundled(crate(uniffi)) = 0.23.0 -Provides: bundled(crate(uniffi_bindgen)) = 0.23.0 -Provides: bundled(crate(uniffi_build)) = 0.23.0 -Provides: bundled(crate(uniffi_checksum_derive)) = 0.23.0 -Provides: bundled(crate(uniffi_core)) = 0.23.0 -Provides: bundled(crate(uniffi_macros)) = 0.23.0 -Provides: bundled(crate(uniffi_meta)) = 0.23.0 -Provides: bundled(crate(uniffi_testing)) = 0.23.0 -Provides: bundled(crate(url)) = 2.1.0 +Provides: bundled(crate(uniffi)) = 0.27.1 +Provides: bundled(crate(uniffi_bindgen)) = 0.27.1 +Provides: bundled(crate(uniffi_build)) = 0.27.1 +Provides: bundled(crate(uniffi_checksum_derive)) = 0.27.1 +Provides: bundled(crate(uniffi_core)) = 0.27.1 +Provides: bundled(crate(uniffi_macros)) = 0.27.1 +Provides: bundled(crate(uniffi_meta)) = 0.27.1 +Provides: bundled(crate(uniffi_testing)) = 0.27.1 +Provides: bundled(crate(uniffi_udl)) = 0.27.1 +Provides: bundled(crate(url)) = 2.5.0 +Provides: bundled(crate(utf8_iter)) = 1.0.3 Provides: bundled(crate(uuid)) = 1.3.0 Provides: bundled(crate(vcpkg)) = 0.2.999 Provides: bundled(crate(version_check)) = 0.9.4 Provides: bundled(crate(viaduct)) = 0.1.0 Provides: bundled(crate(void)) = 1.0.2 Provides: bundled(crate(walkdir)) = 2.3.2 -Provides: bundled(crate(wasm-encoder)) = 0.25.0 -Provides: bundled(crate(wast)) = 56.0.0 +Provides: bundled(crate(wasm-encoder)) = 0.205.0 +Provides: bundled(crate(wast)) = 205.0.0 Provides: bundled(crate(webext-storage)) = 0.1.0 Provides: bundled(crate(webext_storage_bridge)) = 0.1.0 Provides: bundled(crate(webrender)) = 0.62.0 Provides: bundled(crate(webrender_api)) = 0.62.0 Provides: bundled(crate(webrender_bindings)) = 0.1.0 Provides: bundled(crate(webrender_build)) = 0.0.2 -Provides: bundled(crate(webrtc-sdp)) = 0.3.10 -Provides: bundled(crate(weedle2)) = 4.0.0 +Provides: bundled(crate(webrtc-sdp)) = 0.3.11 +Provides: bundled(crate(weedle2)) = 5.0.0 Provides: bundled(crate(wgpu_bindings)) = 0.1.0 -Provides: bundled(crate(wgpu-core)) = 0.16.0 -Provides: bundled(crate(wgpu-hal)) = 0.16.0 -Provides: bundled(crate(wgpu-types)) = 0.16.0 +Provides: bundled(crate(wgpu-core)) = 0.20.0 +Provides: bundled(crate(wgpu-hal)) = 0.20.0 +Provides: bundled(crate(wgpu-types)) = 0.20.0 Provides: bundled(crate(whatsys)) = 0.3.1 Provides: bundled(crate(wpf-gpu-raster)) = 0.1.0 Provides: bundled(crate(wr_glyph_rasterizer)) = 0.1.0 +Provides: bundled(crate(writeable)) = 0.5.4 Provides: bundled(crate(wr_malloc_size_of)) = 0.0.2 Provides: bundled(crate(xmldecl)) = 0.2.0 Provides: bundled(crate(xml-rs)) = 0.8.4 Provides: bundled(crate(xpcom)) = 0.1.0 Provides: bundled(crate(xpcom_macros)) = 0.1.0 +Provides: bundled(crate(yoke)) = 0.7.3 +Provides: bundled(crate(yoke-derive)) = 0.7.3 Provides: bundled(crate(zeitstempel)) = 0.1.1 +Provides: bundled(crate(zerocopy)) = 0.7.32 +Provides: bundled(crate(zerofrom)) = 0.1.2 +Provides: bundled(crate(zerofrom-derive)) = 0.1.3 +Provides: bundled(crate(zerovec)) = 0.10.1 +Provides: bundled(crate(zerovec-derive)) = 0.10.1 %description Mozilla Firefox is an open-source web browser, designed for standards @@ -995,6 +1125,7 @@ echo "use_nodejs_scl %{?use_nodejs_scl}" echo "use_llvm_ts %{?use_llvm_ts}" echo "use_python3_scl %{?use_python3_scl}" echo "--------------------------------------------" +#clang -print-search-dirs %setup -q -n %{name}-%{version} # ---- RHEL specific patches --- @@ -1004,6 +1135,8 @@ echo "--------------------------------------------" %patch -P3 -p1 -b .build-big-endian-errors %if 0%{?rhel} == 7 %patch -P5 -p1 -b .build-rhel7-lower-node-min-version +# Disable gamepad due to old kernel +%patch -P11 -p1 -b .gamepad %ifarch ppc64 # abiv2 version not available in RHEL7 ppc # TODO most likely not needed with system nss @@ -1018,6 +1151,7 @@ echo "--------------------------------------------" %patch -P8 -p1 -b .disable-pipewire %endif %patch -P9 -p1 -b .rhbz-2131158-webrtc-nss-fix +%patch -P10 -p1 -b .build-ffvpx # -- Upstreamed patches -- %patch -P51 -p1 -b .mozilla-bmo1170092 @@ -1032,24 +1166,18 @@ echo "--------------------------------------------" %patch -P107 -p1 -b .mozilla-bmo1716707-swizzle %patch -P108 -p1 -b .mozilla-bmo1716707-svg %patch -P109 -p1 -b .mozilla-bmo1789216-disable-av1 +%patch -P110 -p1 -b .libaom # ---- Fedora specific patches ---- %patch -P151 -p1 -b .addons %patch -P152 -p1 -b .rhbz-1173156 -%patch -P153 -p1 -b .fedora-shebang %patch -P154 -p1 -b .addons-nss-hack # ARM run-time patch %ifarch aarch64 %patch -P155 -p1 -b .rhbz-1354671 %endif -# ---- Test patches ---- -%patch -P201 -p1 -b .firefox-tests-xpcshell-freeze - # ---- Security patches ---- -cd media/libvpx/libvpx -%patch -P301 -p1 -b .CVE-2023-44488-libvpx -cd - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -1125,11 +1253,9 @@ echo "ac_add_options --with-google-location-service-api-keyfile=`pwd`/google-loc echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key" >> .mozconfig # May result in empty --with-libclang-path= in earlier versions. -# So far this is needed only for c8s. -%if 0%{?rhel} == 8 && %{rhel_minor_version} >= 10 +# So far this is needed only for c8s/c9s. # Clang 17 upstream's detection fails, tell it where to look. echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig -%endif echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig @@ -1166,11 +1292,13 @@ function install_rpms_to_current_dir() { for package in $(ls $PACKAGE_DIR/$PACKAGE_RPM) do echo "$package" - rpm2cpio "$package" | cpio -idu + rpm2cpio "$package" | cpio -ivdu done } %if 0%{?bundle_nss} +%if 0%{?rhel} == 8 + # nspr rpm -ivh %{SOURCE402} rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=tests -ba %{_specdir}/nspr.spec pushd %{_buildrootdir} @@ -1180,24 +1308,20 @@ function install_rpms_to_current_dir() { echo "Setting nspr flags" # nss-setup-flags-env.inc sed -i 's@%{bundled_install_path}@%{_buildrootdir}%{bundled_install_path}@g' %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/nspr*.pc - cat %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/nspr*.pc export LDFLAGS="-L%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS" export LDFLAGS="-Wl,-rpath,%{bundled_install_path}/%{_lib} $LDFLAGS" export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS" export PKG_CONFIG_PATH=%{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig - pkg-config --libs-only-L nspr - pkg-config --libs nspr export PATH="%{_buildrootdir}%{bundled_install_path}/bin:$PATH" export PATH=%{_buildrootdir}/%{bundled_install_path}/bin:$PATH - echo $PKG_CONFIG_PATH - -%if 0%{?rhel} == 8 rpm -ivh %{SOURCE403} + %else rpm -ivh %{SOURCE404} %endif + # nss rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=tests -ba %{_specdir}/nss.spec pushd %{_buildrootdir} #cleanup @@ -1210,6 +1334,12 @@ function install_rpms_to_current_dir() { install_rpms_to_current_dir nss-softokn-freebl-devel*.rpm install_rpms_to_current_dir nss-util-3*.rpm install_rpms_to_current_dir nss-util-devel*.rpm +%if 0%{?rhel} > 8 + + install_rpms_to_current_dir nspr-4*.rpm + install_rpms_to_current_dir nspr-devel*.rpm + sed -i 's@%{bundled_install_path}@%{_buildrootdir}%{bundled_install_path}@g' %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/nspr*.pc +%endif popd %filter_provides_in %{bundled_install_path}/%{_lib} %filter_requires_in %{bundled_install_path}/%{_lib} @@ -1218,22 +1348,22 @@ function install_rpms_to_current_dir() { %filter_from_requires /libssl3.so.*/d %filter_from_requires /libnssutil3.so.*/d %filter_from_requires /libnspr4.so.*/d - find %{_buildrootdir} + + export LDFLAGS="-L%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS" + export LDFLAGS="-Wl,-rpath,%{bundled_install_path}/%{_lib} $LDFLAGS" + export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS" + export PKG_CONFIG_PATH=%{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig + export PATH="%{_buildrootdir}%{bundled_install_path}/bin:$PATH" %endif # Enable toolsets set +e -%if 0%{?rhel} == 8 && %{rhel_minor_version} < 6 - %ifarch aarch64 -source scl_source enable gcc-toolset-12 - %endif +%if 0%{?use_gcc_ts} +source scl_source enable gcc-toolset-13 %endif %if 0%{?use_dts} source scl_source enable devtoolset-%{dts_version} %endif -%if 0%{?use_rust_ts} -source scl_source enable rust-toolset -%endif %if 0%{?use_nodejs_scl} source scl_source enable rh-nodejs10 %endif @@ -1257,6 +1387,7 @@ which python3 mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} + cd .. mkdir rust-cbindgen cd rust-cbindgen @@ -1277,6 +1408,8 @@ rustc --version #mkdir -p .cargo #cat > .cargo/config < %{_buildrootdir}/cargo/config < .cargo/config < 30 -MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive" -%endif MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now" %if %{?debug_build} @@ -1421,7 +1546,7 @@ function install_rpms_to_current_dir() { for package in $(ls $PACKAGE_DIR/$PACKAGE_RPM) do echo "$package" - rpm2cpio "$package" | cpio -idu + rpm2cpio "$package" | cpio -ivdu done } @@ -1588,7 +1713,7 @@ ln -s %{mozappdir}/defaults/preferences $RPM_BUILD_ROOT/%{mozappdir}/browser/def sed -i -e 's|%PREFIX%|%{_prefix}|' %{buildroot}%{mozappdir}/defaults/preferences/all-redhat.js sed -i -e 's|%HOMEPAGE%|%{homepage}|' %{buildroot}%{mozappdir}/defaults/preferences/all-redhat.js # Enable modern crypto for the key export on the RHEL9 only (rhbz#1764205) -%if 0%{?rhel} == 9 +%if 0%{?rhel} >= 9 echo 'pref("security.pki.use_modern_crypto_with_pkcs12", true);' >> %{buildroot}%{mozappdir}/defaults/preferences/all-redhat.js %endif @@ -1622,13 +1747,17 @@ ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries %{__cp} failures-* %{buildroot}/%{version}-%{release}/ || true %endif -# Copy over run-mozilla.sh -%{__cp} build/unix/run-mozilla.sh %{buildroot}%{mozappdir} - # Add distribution.ini %{__mkdir_p} %{buildroot}%{mozappdir}/distribution %{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution +# CentOS +%if 0%{?centos} +%{__sed} -ie 's/redhat/centos/g' %{buildroot}%{mozappdir}/distribution +(source /etc/os-release; %{__sed} -ie 's/Red Hat Enterprise Linux/$NAME/' %{buildroot}%{mozappdir}/distribution) +cat %{buildroot}%{mozappdir}/distribution +%endif + # Install appdata file mkdir -p %{buildroot}%{_datadir}/metainfo %{__sed} -e "s/__VERSION__/%{version}/" \ @@ -1716,7 +1845,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{langpackdir} %endif %{mozappdir}/browser/omni.ja -%{mozappdir}/run-mozilla.sh %{mozappdir}/application.ini %{mozappdir}/pingsender %exclude %{mozappdir}/removed-files @@ -1737,11 +1865,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/dictionaries %{mozappdir}/omni.ja %{mozappdir}/platform.ini -%{mozappdir}/plugin-container %{mozappdir}/gmp-clearkey %{mozappdir}/fonts/TwemojiMozilla.ttf %{mozappdir}/glxtest %{mozappdir}/vaapitest +%ifarch aarch64 +%{mozappdir}/v4l2test +%endif %if !%{?system_nss} %exclude %{mozappdir}/libnssckbi.so @@ -1761,23 +1891,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Thu Jul 25 2024 songmingliang - 115.13.0-3.0.1 -- rebrand to anolis - -* Mon Jul 08 2024 Tomas Popela - 115.13.0-3 -- Update to 115.13.0 build3 - -* Tue Jul 02 2024 Eike Rathke - 115.13.0-2 -- Update to 115.13.0 build2 - -* Mon Jul 01 2024 Eike Rathke - 115.13.0-1 -- Update to 115.13.0 build1 - -* Tue Jun 04 2024 Eike Rathke - 115.12.0-1 -- Update to 115.12.0 build1 - -* Tue May 07 2024 Eike Rathke - 115.11.0-1 -- Update to 115.11.0 build1 +* Tue Aug 27 2024 Jan Horak - 128.2.0-1 +- Update to 128.2.0 * Tue Apr 09 2024 Eike Rathke - 115.10.0-1 - Update to 115.10.0 build1 diff --git a/mozilla-bmo1504834-part1.patch b/mozilla-bmo1504834-part1.patch index 5246c5a03faf9c1f91c61b7908f3814ba594f197..f117b897ec5cdbaca6a9789e23a8d13c0e56efdc 100644 --- a/mozilla-bmo1504834-part1.patch +++ b/mozilla-bmo1504834-part1.patch @@ -1,6 +1,6 @@ -diff -up firefox-115.2.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 firefox-115.2.0/gfx/2d/DrawTargetSkia.cpp ---- firefox-115.2.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 2023-09-20 22:15:11.850172571 +0200 -+++ firefox-115.2.0/gfx/2d/DrawTargetSkia.cpp 2023-09-20 22:16:10.446147737 +0200 +diff -up firefox-128.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 firefox-128.0/gfx/2d/DrawTargetSkia.cpp +--- firefox-128.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 2024-06-12 15:02:55.000000000 +0200 ++++ firefox-128.0/gfx/2d/DrawTargetSkia.cpp 2024-06-13 11:36:54.550728034 +0200 @@ -156,8 +156,8 @@ static IntRect CalculateSurfaceBounds(co } @@ -12,9 +12,9 @@ diff -up firefox-115.2.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 fire static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, const int32_t aStride, SurfaceFormat aFormat) { if (aFormat != SurfaceFormat::B8G8R8X8 || aSize.IsEmpty()) { -diff -up firefox-115.2.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 firefox-115.2.0/gfx/2d/Types.h ---- firefox-115.2.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 2023-08-21 15:43:23.000000000 +0200 -+++ firefox-115.2.0/gfx/2d/Types.h 2023-09-20 22:15:11.850172571 +0200 +diff -up firefox-128.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 firefox-128.0/gfx/2d/Types.h +--- firefox-128.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 2024-06-12 15:02:56.000000000 +0200 ++++ firefox-128.0/gfx/2d/Types.h 2024-06-13 11:36:54.551728036 +0200 @@ -89,18 +89,11 @@ enum class SurfaceFormat : int8_t { // This represents the unknown format. UNKNOWN, // TODO: Replace uses with Maybe. @@ -37,10 +37,10 @@ diff -up firefox-115.2.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 firefox-115.2.0 // The following values are OS and endian-independent synonyms. // -diff -up firefox-115.2.0/gfx/skia/skia/modules/skcms/skcms.cc.mozilla-bmo1504834-part1 firefox-115.2.0/gfx/skia/skia/modules/skcms/skcms.cc ---- firefox-115.2.0/gfx/skia/skia/modules/skcms/skcms.cc.mozilla-bmo1504834-part1 2023-08-21 15:43:23.000000000 +0200 -+++ firefox-115.2.0/gfx/skia/skia/modules/skcms/skcms.cc 2023-09-20 22:15:11.851172570 +0200 -@@ -30,6 +30,8 @@ +diff -up firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc.mozilla-bmo1504834-part1 firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc +--- firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc.mozilla-bmo1504834-part1 2024-06-12 15:02:57.000000000 +0200 ++++ firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc 2024-06-13 11:38:45.377835856 +0200 +@@ -31,6 +31,8 @@ #include #include #endif @@ -48,7 +48,7 @@ diff -up firefox-115.2.0/gfx/skia/skia/modules/skcms/skcms.cc.mozilla-bmo1504834 + #define SKCMS_PORTABLE #endif - static bool runtime_cpu_detection = true; + using namespace skcms_private; @@ -324,20 +326,28 @@ enum { static uint16_t read_big_u16(const uint8_t* ptr) { uint16_t be; diff --git a/mozilla-bmo1636168-fscreen.patch b/mozilla-bmo1636168-fscreen.patch index e8bb3103395d93b08e517830b11f73d9de2c7d1f..6ee70ad75ed00ee4eefeb2647c5ff4df66a3eda5 100644 --- a/mozilla-bmo1636168-fscreen.patch +++ b/mozilla-bmo1636168-fscreen.patch @@ -1,15 +1,7 @@ -diff -up firefox-114.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-114.0/widget/gtk/nsWindow.cpp ---- firefox-114.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff 2023-05-17 10:43:02.000000000 +0200 -+++ firefox-114.0/widget/gtk/nsWindow.cpp 2023-05-17 13:53:54.000443278 +0200 -@@ -100,6 +100,7 @@ - #include "ScreenHelperGTK.h" - #include "SystemTimeConverter.h" - #include "WidgetUtilsGtk.h" -+#include "nsIBrowserHandler.h" - - #ifdef ACCESSIBILITY - # include "mozilla/a11y/LocalAccessible.h" -@@ -173,7 +174,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR +diff -up firefox-128.0/widget/gtk/nsWindow.cpp.mozilla-bmo1636168-fscreen firefox-128.0/widget/gtk/nsWindow.cpp +--- firefox-128.0/widget/gtk/nsWindow.cpp.mozilla-bmo1636168-fscreen 2024-07-04 18:20:43.000000000 +0200 ++++ firefox-128.0/widget/gtk/nsWindow.cpp 2024-07-16 14:54:21.026716936 +0200 +@@ -174,7 +174,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK | @@ -19,7 +11,7 @@ diff -up firefox-114.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-114. /* utility functions */ static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX, -@@ -433,7 +435,8 @@ nsWindow::nsWindow() +@@ -430,7 +431,8 @@ nsWindow::nsWindow() mResizedAfterMoveToRect(false), mConfiguredClearColor(false), mGotNonBlankPaint(false), @@ -29,7 +21,7 @@ diff -up firefox-114.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-114. mWindowType = WindowType::Child; mSizeConstraints.mMaxSize = GetSafeWindowSize(mSizeConstraints.mMaxSize); -@@ -5263,6 +5266,19 @@ void nsWindow::OnWindowStateEvent(GtkWid +@@ -5374,6 +5376,19 @@ void nsWindow::OnWindowStateEvent(GtkWid ClearTransparencyBitmap(); } } @@ -49,30 +41,18 @@ diff -up firefox-114.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-114. } void nsWindow::OnDPIChanged() { -@@ -7409,6 +7425,19 @@ nsresult nsWindow::MakeFullScreen(bool a - } - } +@@ -7526,6 +7541,7 @@ nsresult nsWindow::MakeFullScreen(bool a -+ // if in kiosk, ensure the fullscreen is called -+ nsCOMPtr browserHandler = -+ do_GetService("@mozilla.org/browser/clh;1"); -+ if (browserHandler) { -+ bool isKiosk; -+ browserHandler->GetKiosk(&isKiosk); -+ if (isKiosk) { -+ LOG(" is kiosk, ensure the window switch to fullscreen\n"); -+ mPendingFullscreen = true; -+ } -+ } else { -+ LOG(" Cannot find the browserHandler service.\n"); -+ } - gtk_window_fullscreen(GTK_WINDOW(mShell)); - } else { - gtk_window_unfullscreen(GTK_WINDOW(mShell)); -diff -up firefox-114.0/widget/gtk/nsWindow.h.D110204-fscreen.diff firefox-114.0/widget/gtk/nsWindow.h ---- firefox-114.0/widget/gtk/nsWindow.h.D110204-fscreen.diff 2023-05-17 08:46:16.000000000 +0200 -+++ firefox-114.0/widget/gtk/nsWindow.h 2023-05-17 13:51:29.502159247 +0200 -@@ -752,6 +752,7 @@ class nsWindow final : public nsBaseWidg + if (mKioskMonitor.isSome()) { + KioskLockOnMonitor(); ++ mPendingFullscreen = true; + } else { + gtk_window_fullscreen(GTK_WINDOW(mShell)); + } +diff -up firefox-128.0/widget/gtk/nsWindow.h.mozilla-bmo1636168-fscreen firefox-128.0/widget/gtk/nsWindow.h +--- firefox-128.0/widget/gtk/nsWindow.h.mozilla-bmo1636168-fscreen 2024-07-04 18:20:43.000000000 +0200 ++++ firefox-128.0/widget/gtk/nsWindow.h 2024-07-16 14:25:51.636952919 +0200 +@@ -758,6 +758,7 @@ class nsWindow final : public nsBaseWidg * move-to-rect callback we set mMovedAfterMoveToRect/mResizedAfterMoveToRect. */ bool mWaitingForMoveToRectCallback : 1; diff --git a/mozilla-bmo1670333.patch b/mozilla-bmo1670333.patch index 7126d433733bea0c5876251879c94c9a119539f3..4d29f5d6807188185bddac4c6ee529a105cc5667 100644 --- a/mozilla-bmo1670333.patch +++ b/mozilla-bmo1670333.patch @@ -1,7 +1,7 @@ -diff -up firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-115.0/dom/media/mp4/MP4Demuxer.cpp ---- firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2023-06-06 23:14:43.000000000 +0200 -+++ firefox-115.0/dom/media/mp4/MP4Demuxer.cpp 2023-06-08 08:15:48.214109403 +0200 -@@ -32,6 +32,8 @@ mozilla::LogModule* GetDemuxerLog() { re +diff -up firefox-128.0/dom/media/mp4/MP4Demuxer.cpp.mozilla-bmo1670333 firefox-128.0/dom/media/mp4/MP4Demuxer.cpp +--- firefox-128.0/dom/media/mp4/MP4Demuxer.cpp.mozilla-bmo1670333 2024-07-04 18:20:27.000000000 +0200 ++++ firefox-128.0/dom/media/mp4/MP4Demuxer.cpp 2024-07-16 13:49:10.475630426 +0200 +@@ -33,6 +33,8 @@ mozilla::LogModule* GetDemuxerLog() { re DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \ __func__, ##__VA_ARGS__) @@ -10,7 +10,7 @@ diff -up firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-115.0/dom/me namespace mozilla { using TimeUnit = media::TimeUnit; -@@ -404,6 +406,12 @@ already_AddRefed MP4TrackD +@@ -419,6 +421,12 @@ already_AddRefed MP4TrackD [[fallthrough]]; case H264::FrameType::OTHER: { bool keyframe = type == H264::FrameType::I_FRAME; @@ -23,10 +23,10 @@ diff -up firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-115.0/dom/me if (sample->mKeyframe != keyframe) { NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe " "@ pts:%" PRId64 " dur:%" PRId64 -diff -up firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-115.0/dom/media/platforms/PDMFactory.cpp ---- firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333 2023-06-06 23:14:44.000000000 +0200 -+++ firefox-115.0/dom/media/platforms/PDMFactory.cpp 2023-06-08 08:09:33.145289602 +0200 -@@ -67,6 +67,8 @@ +diff -up firefox-128.0/dom/media/platforms/PDMFactory.cpp.mozilla-bmo1670333 firefox-128.0/dom/media/platforms/PDMFactory.cpp +--- firefox-128.0/dom/media/platforms/PDMFactory.cpp.mozilla-bmo1670333 2024-07-04 18:20:26.000000000 +0200 ++++ firefox-128.0/dom/media/platforms/PDMFactory.cpp 2024-07-16 14:16:04.635809901 +0200 +@@ -62,6 +62,8 @@ #include @@ -35,31 +35,28 @@ diff -up firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-115.0/ using DecodeSupport = mozilla::media::DecodeSupport; using DecodeSupportSet = mozilla::media::DecodeSupportSet; using MediaCodec = mozilla::media::MediaCodec; -@@ -562,7 +564,7 @@ void PDMFactory::CreateRddPDMs() { +@@ -543,7 +545,7 @@ void PDMFactory::CreateRddPDMs() { #ifdef MOZ_FFMPEG if (StaticPrefs::media_ffmpeg_enabled() && StaticPrefs::media_rdd_ffmpeg_enabled() && -- !CreateAndStartupPDM()) { -+ !(mFFmpegUsed = CreateAndStartupPDM())) { +- !StartupPDM(FFmpegRuntimeLinker::CreateDecoder())) { ++ !(mFFmpegUsed = StartupPDM(FFmpegRuntimeLinker::CreateDecoder()))) { mFailureFlags += GetFailureFlagBasedOnFFmpegStatus( FFmpegRuntimeLinker::LinkStatusCode()); } -@@ -738,9 +740,10 @@ void PDMFactory::CreateDefaultPDMs() { - - CreateAndStartupPDM(); +@@ -719,7 +721,7 @@ void PDMFactory::CreateDefaultPDMs() { + StartupPDM(AgnosticDecoderModule::Create(), + StaticPrefs::media_prefer_non_ffvpx()); - if (StaticPrefs::media_gmp_decoder_enabled() && + if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed && !StartupPDM(GMPDecoderModule::Create(), StaticPrefs::media_gmp_decoder_preferred())) { -+ gUseKeyframeFromContainer = true; mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup; - } - } -diff -up firefox-115.0/dom/media/platforms/PDMFactory.h.1670333 firefox-115.0/dom/media/platforms/PDMFactory.h ---- firefox-115.0/dom/media/platforms/PDMFactory.h.1670333 2023-06-06 23:14:42.000000000 +0200 -+++ firefox-115.0/dom/media/platforms/PDMFactory.h 2023-06-08 08:09:33.145289602 +0200 -@@ -103,6 +103,7 @@ class PDMFactory final { +diff -up firefox-128.0/dom/media/platforms/PDMFactory.h.mozilla-bmo1670333 firefox-128.0/dom/media/platforms/PDMFactory.h +--- firefox-128.0/dom/media/platforms/PDMFactory.h.mozilla-bmo1670333 2024-07-04 18:20:26.000000000 +0200 ++++ firefox-128.0/dom/media/platforms/PDMFactory.h 2024-07-16 13:49:10.476630421 +0200 +@@ -98,6 +98,7 @@ class PDMFactory final { RefPtr mNullPDM; DecoderDoctorDiagnostics::FlagsSet mFailureFlags; diff --git a/mozilla-bmo1789216-disable-av1.patch b/mozilla-bmo1789216-disable-av1.patch index ce91a124b54f58f2d2cf74682f3355625019e1ba..c7fe0c31671059cf070046290076cf1a5a017fb1 100644 --- a/mozilla-bmo1789216-disable-av1.patch +++ b/mozilla-bmo1789216-disable-av1.patch @@ -1,9 +1,7 @@ -diff --git a/media/ffvpx/libavcodec/allcodecs.c b/media/ffvpx/libavcodec/allcodecs.c ---- a/media/ffvpx/libavcodec/allcodecs.c -+++ b/media/ffvpx/libavcodec/allcodecs.c -@@ -755,12 +755,15 @@ - extern FFCodec ff_libaom_av1_encoder; - extern const FFCodec ff_libaribb24_decoder; +diff -up firefox-128.0/media/ffvpx/libavcodec/allcodecs.c.mozilla-bmo1789216-disable-av1 firefox-128.0/media/ffvpx/libavcodec/allcodecs.c +--- firefox-128.0/media/ffvpx/libavcodec/allcodecs.c.mozilla-bmo1789216-disable-av1 2024-06-12 15:03:01.000000000 +0200 ++++ firefox-128.0/media/ffvpx/libavcodec/allcodecs.c 2024-06-13 11:44:10.637215674 +0200 +@@ -764,8 +764,11 @@ extern const FFCodec ff_libaribb24_decod extern const FFCodec ff_libcelt_decoder; extern const FFCodec ff_libcodec2_encoder; extern const FFCodec ff_libcodec2_decoder; @@ -15,11 +13,7 @@ diff --git a/media/ffvpx/libavcodec/allcodecs.c b/media/ffvpx/libavcodec/allcode extern const FFCodec ff_libfdk_aac_encoder; extern const FFCodec ff_libfdk_aac_decoder; extern const FFCodec ff_libgsm_encoder; - extern const FFCodec ff_libgsm_decoder; - extern const FFCodec ff_libgsm_ms_encoder; -@@ -783,11 +786,10 @@ - extern const FFCodec ff_libspeex_encoder; - extern const FFCodec ff_libspeex_decoder; +@@ -793,7 +796,6 @@ extern const FFCodec ff_libspeex_decoder extern const FFCodec ff_libsvtav1_encoder; extern const FFCodec ff_libtheora_encoder; extern const FFCodec ff_libtwolame_encoder; @@ -27,14 +21,10 @@ diff --git a/media/ffvpx/libavcodec/allcodecs.c b/media/ffvpx/libavcodec/allcode extern const FFCodec ff_libvo_amrwbenc_encoder; extern const FFCodec ff_libvorbis_encoder; extern const FFCodec ff_libvorbis_decoder; - extern const FFCodec ff_libvpx_vp8_encoder; - extern const FFCodec ff_libvpx_vp8_decoder; -diff --git a/media/ffvpx/libavcodec/codec_list.c b/media/ffvpx/libavcodec/codec_list.c ---- a/media/ffvpx/libavcodec/codec_list.c -+++ b/media/ffvpx/libavcodec/codec_list.c -@@ -9,12 +9,14 @@ - &ff_flac_decoder, - #endif +diff -up firefox-128.0/media/ffvpx/libavcodec/codec_list.c.mozilla-bmo1789216-disable-av1 firefox-128.0/media/ffvpx/libavcodec/codec_list.c +--- firefox-128.0/media/ffvpx/libavcodec/codec_list.c.mozilla-bmo1789216-disable-av1 2024-06-13 11:40:12.668924117 +0200 ++++ firefox-128.0/media/ffvpx/libavcodec/codec_list.c 2024-06-13 11:44:41.411253372 +0200 +@@ -11,12 +11,14 @@ static const FFCodec * const codec_list[ #if CONFIG_MP3_DECODER &ff_mp3_decoder, #endif @@ -45,26 +35,22 @@ diff --git a/media/ffvpx/libavcodec/codec_list.c b/media/ffvpx/libavcodec/codec_ #if CONFIG_AV1_DECODER &ff_av1_decoder, #endif -+#endif - NULL }; -diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build ---- a/media/ffvpx/libavcodec/moz.build -+++ b/media/ffvpx/libavcodec/moz.build -@@ -84,11 +84,10 @@ - 'cbs.c', - 'cbs_av1.c', - 'golomb.c', - 'h264pred.c', ++#endif + #if CONFIG_LIBVORBIS_DECODER + &ff_libvorbis_decoder, + #endif +diff -up firefox-128.0/media/ffvpx/libavcodec/moz.build.mozilla-bmo1789216-disable-av1 firefox-128.0/media/ffvpx/libavcodec/moz.build +--- firefox-128.0/media/ffvpx/libavcodec/moz.build.mozilla-bmo1789216-disable-av1 2024-06-13 11:40:12.669924118 +0200 ++++ firefox-128.0/media/ffvpx/libavcodec/moz.build 2024-06-13 11:45:22.867304151 +0200 +@@ -94,7 +94,6 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: 'imgconvert.c', + 'libaom.c', + 'libaomenc.c', - 'libdav1d.c', + 'libvpxdec.c', + 'libvpxenc.c', 'mathtables.c', - 'qsv_api.c', - 'raw.c', - 'videodsp.c', - 'vp8.c', -@@ -107,14 +106,19 @@ - 'vp9mvs.c', - 'vp9prob.c', +@@ -119,10 +118,16 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: 'vp9recon.c', 'vpx_rac.c', ] @@ -81,9 +67,7 @@ diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build + 'libdav1d.c', + ] + - if CONFIG['MOZ_WAYLAND']: ++ + if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": LOCAL_INCLUDES += ['/media/mozva'] SOURCES += [ - 'vaapi_av1.c', - 'vaapi_decode.c', - diff --git a/nss-setup-flags-env.inc b/nss-setup-flags-env.inc index 45f6e7938f594917609aae6b766976c07dcd0484..334bfaaa574c358a9e7fdec2192d6542d7eaaee4 100644 --- a/nss-setup-flags-env.inc +++ b/nss-setup-flags-env.inc @@ -4,4 +4,4 @@ export LDFLAGS="-L%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS" export LDFLAGS="-Wl,-rpath,%{bundled_install_path}/%{_lib} $LDFLAGS" export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS" export PKG_CONFIG_PATH=%{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig -export PATH="{_buildrootdir}%{bundled_install_path}/bin:$PATH" +export PATH="%{_buildrootdir}%{bundled_install_path}/bin:$PATH" diff --git a/process-official-tarball b/process-official-tarball index 449e7bbd77a5dd4c6b7fc572fd9b6526bbf18086..e3aabb9507297cb1ef7c058252886887291b05d2 100755 --- a/process-official-tarball +++ b/process-official-tarball @@ -12,6 +12,11 @@ rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cur rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0230-novalid.html rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0231-isvalid.html rm -vf ./process-tarball-dir/*/layout/inspector/tests/chrome/test_fontVariationsAPI.css +# A forbidden code point was found in: +rm -vf ./process-tarball-dir/*/mobile/android/android-components/components/browser/errorpages/src/main/res/values-ar/strings.xml +rm -vf ./process-tarball-dir/*/mobile/android/android-components/components/feature/addons/src/main/res/values-ur/strings.xml +rm -vf ./process-tarball-dir/*/third_party/webkit/PerformanceTests/Speedometer3/resources/editors/dist/assets/codemirror-521de7ab.js +rm -vf ./process-tarball-dir/*/third_party/python/pip/pip-24.0.dist-info/AUTHORS.txt processed_tarball=${1/source/processed-source}