From ddf4b8bbd24e7e208f68ccc8940e9e6c09dc4118 Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Tue, 21 Nov 2023 21:18:21 -0600 Subject: [PATCH] firefox: 120.0 --- extra/firefox/checksums | 2 +- extra/firefox/sources | 2 +- extra/firefox/version | 2 +- testing/firefox/README | 123 ------------------ testing/firefox/build | 76 ----------- testing/firefox/checksums | 7 - testing/firefox/depends | 33 ----- .../patches/fix-target-detection.patch | 19 --- testing/firefox/patches/fix-vaapi.patch | 19 --- testing/firefox/patches/musl-sandbox.patch | 29 ----- testing/firefox/patches/no-atk.patch | 16 --- testing/firefox/patches/no-dbus.patch | 69 ---------- testing/firefox/patches/no-fribidi.patch | 12 -- testing/firefox/post-install | 12 -- testing/firefox/sources | 7 - testing/firefox/version | 1 - 16 files changed, 3 insertions(+), 426 deletions(-) delete mode 100644 testing/firefox/README delete mode 100755 testing/firefox/build delete mode 100644 testing/firefox/checksums delete mode 100644 testing/firefox/depends delete mode 100644 testing/firefox/patches/fix-target-detection.patch delete mode 100644 testing/firefox/patches/fix-vaapi.patch delete mode 100644 testing/firefox/patches/musl-sandbox.patch delete mode 100644 testing/firefox/patches/no-atk.patch delete mode 100644 testing/firefox/patches/no-dbus.patch delete mode 100644 testing/firefox/patches/no-fribidi.patch delete mode 100755 testing/firefox/post-install delete mode 100644 testing/firefox/sources delete mode 100644 testing/firefox/version diff --git a/extra/firefox/checksums b/extra/firefox/checksums index b9c0908b..987b661d 100644 --- a/extra/firefox/checksums +++ b/extra/firefox/checksums @@ -1,4 +1,4 @@ -02f24f52586fe3d99b437dafd10cc863b5d3d7bc9ddbbc046cd33155d48f97d4c1 +22dea096107311b96ef0ef37ea5b0a50292d0b05a95adea0c42cd8516fa9231de7 3e4e722acd2ab2e38a16ec23b29296318d77cc54f034d4b21d91bde085e26bc0a3 49e95cf848c09df618587bb8286bed3ed9531e24554b9ef275f070201078dba7f5 ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc diff --git a/extra/firefox/sources b/extra/firefox/sources index c6d611e6..70b06fb8 100644 --- a/extra/firefox/sources +++ b/extra/firefox/sources @@ -1,4 +1,4 @@ -https://ftp.mozilla.org/pub/firefox/releases/119.0.1/source/firefox-119.0.1.source.tar.xz +https://ftp.mozilla.org/pub/firefox/releases/120.0/source/firefox-120.0.source.tar.xz patches/fix-target-detection.patch patches/fix-vaapi.patch patches/musl-sandbox.patch diff --git a/extra/firefox/version b/extra/firefox/version index 45a198a1..6867bbb1 100644 --- a/extra/firefox/version +++ b/extra/firefox/version @@ -1 +1 @@ -119.0.1 1 +120.0 1 diff --git a/testing/firefox/README b/testing/firefox/README deleted file mode 100644 index 70214c4d..00000000 --- a/testing/firefox/README +++ /dev/null @@ -1,123 +0,0 @@ -firefox -________________________________________________________________________________ - -Mozilla Firefox or simply Firefox, is a free and open-source web browser -developed by the Mozilla Foundation and its subsidiary, the Mozilla Corporation. -Firefox uses the Gecko rendering engine to display web pages. [0] - -Upstream: https://www.mozilla.org/firefox - - -[000] Index -________________________________________________________________________________ - -* Installation ........................................................... [001] - * Runtime Dependencies ................................................. [002] - * Privacy Package ...................................................... [003] -* Setup .................................................................. [004] - * Enable VAAPI Acceleration ............................................ [005] -* Usage .................................................................. [006] -* References ............................................................. [007] - - -[001] Installation -________________________________________________________________________________ - -+------------------------------------------------------------------------------+ -| | -| $ kiss b firefox | -| | -+------------------------------------------------------------------------------+ - - ---[002] Runtime Dependencies --------------------------------------------------- - - Firefox needs a few additional things to be fully functional. One is an icon - theme and the other is a font. If you have already installed the fonts and - icon theme of your choosing, this step can be skipped. - - +----------------------------------------------------------------------------+ - | | - | $ kiss b [hicolor-icon-theme|adwaita-icon-theme] | - | $ kiss b ttf-croscore | - | | - +----------------------------------------------------------------------------+ - - ---[003] Privacy Package -------------------------------------------------------- - - Provided is also an optional privacy package which makes Firefox perform zero - unsolicited network requests. More information can be found in the - documentation (@/firefox-privacy) Expect some website breakage when using this - privacy package YMMV. - - +----------------------------------------------------------------------------+ - | | - | $ kiss b firefox-privacy | - | | - +----------------------------------------------------------------------------+ - - -[004] Setup -________________________________________________________________________________ - -As of Firefox 91. There is no need to set special environment variables to -enable Wayland support (in a Wayland only environment like ours). The browser -should start with no further configuration. - - ---[005] Enable VAAPI Acceleration ---------------------------------------------- - -As of Firefox 102, only the following modification to about:config should be -required, with no need to disable any sandbox features. - -+------------------------------------------------------------------------------+ -| | -| about:config | -| | -| media.ffmpeg.vaapi.enabled=true | -| | -+------------------------------------------------------------------------------+ - -If using AMDGPU, the following kernel option must be enabled. [1] - -+------------------------------------------------------------------------------+ -| | -| .config | -| | -| CONFIG_CHECKPOINT_RESTORE=y | -| | -+------------------------------------------------------------------------------+ - -You may also need to set the following environment variable. - -+------------------------------------------------------------------------------+ -| | -| .profile | -| | -| export MOZ_WAYLAND_DRM_DEVICE=/dev/dri/renderD128 | -| | -+------------------------------------------------------------------------------+ - -To verify that VAAPI is working, launch Firefox with the following argument and -attempt to watch a video. Pay attention for errors in the output. - -+------------------------------------------------------------------------------+ -| | -| $ firefox --MOZ_LOG=PlatformDecoderModule:4 | -| | -+------------------------------------------------------------------------------+ - - -[006] Usage -________________________________________________________________________________ - -Refer to the browser's help output and online documentation for further -information. - - -[007] References -________________________________________________________________________________ - -[0] https://en.wikipedia.org/wiki/Firefox - diff --git a/testing/firefox/build b/testing/firefox/build deleted file mode 100755 index fef79673..00000000 --- a/testing/firefox/build +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -e - -for p in *.patch; do - patch -p1 < "$p" -done - -sed '/UNZIP/d' toolkit/moz.configure > _ -mv -f _ toolkit/moz.configure - -# If using libc++, CXXSTDLIB needs to be set manually. -case $("$CC" -print-file-name=libc++.so) in */*) - export CXXSTDLIB=c++ -esac - -export CFLAGS="$CFLAGS -w" -export CXXFLAGS="$CXXFLAGS -w" - -# Instruct the compiler to trim absolute paths in resulting binaries and instead -# change them to relative paths ($PWD/... ./...). -export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$PWD=." - -export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox,--enable-new-dtags" -export RUSTFLAGS="$RUSTFLAGS -Cdebuginfo=0" -export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system -export MOZ_DEBUG_FLAGS=-g0 -export MOZBUILD_STATE_PATH="$PWD/state" -export MOZ_NOSPAM=1 - -cat > .mozconfig << EOF -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib -ac_add_options --enable-default-toolkit=cairo-gtk3-wayland-only -ac_add_options --enable-strip -ac_add_options --enable-release -ac_add_options --enable-rust-simd -ac_add_options --enable-audio-backends=alsa -ac_add_options --enable-install-strip -ac_add_options --enable-official-branding -ac_add_options --enable-application=browser -ac_add_options --enable-optimize -ac_add_options --with-system-ffi -ac_add_options --with-system-jpeg -ac_add_options --with-system-libvpx -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-pixman -ac_add_options --with-system-png -ac_add_options --with-system-webp -ac_add_options --with-system-zlib -ac_add_options --without-wasm-sandboxed-libraries -ac_add_options --disable-eme -ac_add_options --disable-dbus -ac_add_options --disable-tests -ac_add_options --disable-vtune -ac_add_options --disable-updater -ac_add_options --disable-jemalloc -ac_add_options --disable-elf-hack -ac_add_options --disable-callgrind -ac_add_options --disable-profiling -ac_add_options --disable-necko-wifi -ac_add_options --disable-crashreporter -ac_add_options --disable-accessibility -ac_add_options --disable-debug -ac_add_options --disable-debug-symbols -ac_add_options --disable-parental-controls -ac_add_options --disable-system-extension-dirs -EOF - -./mach build -DESTDIR="$1" ./mach install - -# Remove a lot of uneeded "stuff". -rm -rf \ - "$1/usr/include" \ - "$1/usr/lib/firefox-devel" \ - "$1/usr/share/idl" diff --git a/testing/firefox/checksums b/testing/firefox/checksums deleted file mode 100644 index 646ac459..00000000 --- a/testing/firefox/checksums +++ /dev/null @@ -1,7 +0,0 @@ -9566b2a165f2baf797a0521afc031c78474f83fd0a2f647975bf6d7d09628c593e -3e4e722acd2ab2e38a16ec23b29296318d77cc54f034d4b21d91bde085e26bc0a3 -49e95cf848c09df618587bb8286bed3ed9531e24554b9ef275f070201078dba7f5 -ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc -8c0f419eb138061e67dbe2ac73e9c8332649fb90aacb57ac4f00d5de94c0cf23a8 -80b730f4e9c58d33b26915b4a4c11e02443a07914cd7cea44ce17e93d0e0ba4cee -2914dbf6d620c3403fbe99fcd04618eaab4257b706470dec3bacc5952f79a0fa31 diff --git a/testing/firefox/depends b/testing/firefox/depends deleted file mode 100644 index fbbaacd4..00000000 --- a/testing/firefox/depends +++ /dev/null @@ -1,33 +0,0 @@ -alsa-lib -bzip2 -cairo -cbindgen make -clang make -expat -ffmpeg -fontconfig -freetype-harfbuzz -gdk-pixbuf -glib -gtk+3 -libdrm -libffi -libjpeg-turbo -libpng -libvpx -libwebp -llvm make -m4 make -mesa -nasm make -nodejs make -nspr -nss -pango -pixman -pkgconf make -python make -rust make -wayland -wayland-protocols make -zlib diff --git a/testing/firefox/patches/fix-target-detection.patch b/testing/firefox/patches/fix-target-detection.patch deleted file mode 100644 index 8e115a3d..00000000 --- a/testing/firefox/patches/fix-target-detection.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure -index 7a2fd1a..ba5ba62 100644 ---- a/build/moz.configure/rust.configure -+++ b/build/moz.configure/rust.configure -@@ -403,9 +403,13 @@ def detect_rustc_target( - ] - if len(narrowed) == 1: - return narrowed[0].rust_target -+ elif narrowed: -+ candidates = narrowed -+ -+ aliased_vendor = "unknown" if host_or_target.vendor == "pc" else host_or_target.vendor - - # Finally, see if the vendor can be used to disambiguate. -- narrowed = [c for c in candidates if c.target.vendor == host_or_target.vendor] -+ narrowed = [c for c in candidates if c.target.vendor == aliased_vendor] - if len(narrowed) == 1: - return narrowed[0].rust_target - diff --git a/testing/firefox/patches/fix-vaapi.patch b/testing/firefox/patches/fix-vaapi.patch deleted file mode 100644 index 5daaeb75..00000000 --- a/testing/firefox/patches/fix-vaapi.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/widget/gtk/GfxInfo.cpp b/widget/gtk/GfxInfo.cpp -index 24885ca..3815eb4 100644 ---- a/widget/gtk/GfxInfo.cpp -+++ b/widget/gtk/GfxInfo.cpp -@@ -1095,14 +1095,6 @@ const nsTArray& GfxInfo::GetGfxDriverInfo() { - nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_LESS_THAN, V(23, 1, 1, 0), - "FEATURE_HARDWARE_VIDEO_DECODING_AMD_DISABLE", "Mesa 23.1.1.0"); - -- // Disable on Release/late Beta on AMD --#if !defined(EARLY_BETA_OR_EARLIER) -- APPEND_TO_DRIVER_BLOCKLIST(OperatingSystem::Linux, DeviceFamily::AtiAll, -- nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING, -- nsIGfxInfo::FEATURE_BLOCKED_DEVICE, -- DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), -- "FEATURE_HARDWARE_VIDEO_DECODING_DISABLE", ""); --#endif - //////////////////////////////////// - // FEATURE_HW_DECODED_VIDEO_ZERO_COPY - ALLOWLIST - APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Linux, DeviceFamily::All, diff --git a/testing/firefox/patches/musl-sandbox.patch b/testing/firefox/patches/musl-sandbox.patch deleted file mode 100644 index c3bb72b2..00000000 --- a/testing/firefox/patches/musl-sandbox.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp -index dffefac..19cc432 100644 ---- a/security/sandbox/linux/SandboxFilter.cpp -+++ b/security/sandbox/linux/SandboxFilter.cpp -@@ -1595,6 +1595,11 @@ class ContentSandboxPolicy : public SandboxPolicyCommon { - case __NR_clone3: - return Error(ENOSYS); - -+# ifdef __NR_fork -+ case __NR_fork: -+ return Error(ENOSYS); -+# endif -+ - # ifdef __NR_fadvise64 - case __NR_fadvise64: - return Allow(); -@@ -1736,10 +1741,10 @@ class GMPSandboxPolicy : public SandboxPolicyCommon { - return Allow(); - case __NR_sched_get_priority_min: - case __NR_sched_get_priority_max: -+ case __NR_sched_setscheduler: - return Allow(); - case __NR_sched_getparam: -- case __NR_sched_getscheduler: -- case __NR_sched_setscheduler: { -+ case __NR_sched_getscheduler: { - Arg pid(0); - return If(pid == 0, Allow()).Else(Trap(SchedTrap, nullptr)); - } diff --git a/testing/firefox/patches/no-atk.patch b/testing/firefox/patches/no-atk.patch deleted file mode 100644 index 807b7de6..00000000 --- a/testing/firefox/patches/no-atk.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp -index b77fadc..520305a 100644 ---- a/widget/gtk/nsWindow.cpp -+++ b/widget/gtk/nsWindow.cpp -@@ -659,9 +659,11 @@ void nsWindow::Destroy() { - // We need to detach accessible object here because mContainer is a custom - // widget and doesn't call gtk_widget_real_destroy() from destroy handler - // as regular widgets. -+#ifdef ACCESSIBILITY - if (AtkObject* ac = gtk_widget_get_accessible(GTK_WIDGET(mContainer))) { - gtk_accessible_set_widget(GTK_ACCESSIBLE(ac), nullptr); - } -+#endif - - gtk_widget_destroy(mShell); - mShell = nullptr; diff --git a/testing/firefox/patches/no-dbus.patch b/testing/firefox/patches/no-dbus.patch deleted file mode 100644 index e6af794e..00000000 --- a/testing/firefox/patches/no-dbus.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -r fc5ee47dac3e toolkit/components/remote/moz.build ---- a/toolkit/components/remote/moz.build Tue Jun 28 12:00:27 2022 -0500 -+++ b/toolkit/components/remote/moz.build Thu Jun 30 00:35:24 2022 -0500 -@@ -26,7 +26,7 @@ - "nsUnixRemoteServer.h", - "RemoteUtils.h", - ] -- else: -+ elif CONFIG["MOZ_X11"]: - SOURCES += [ - "nsGTKRemoteServer.cpp", - "nsXRemoteClient.cpp", -diff -r fc5ee47dac3e toolkit/components/remote/nsRemoteService.cpp ---- a/toolkit/components/remote/nsRemoteService.cpp Tue Jun 28 12:00:27 2022 -0500 -+++ b/toolkit/components/remote/nsRemoteService.cpp Thu Jun 30 00:35:24 2022 -0500 -@@ -6,12 +6,14 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - #ifdef MOZ_WIDGET_GTK --# ifdef MOZ_ENABLE_DBUS -+# if defined(MOZ_ENABLE_DBUS) - # include "nsDBusRemoteServer.h" - # include "nsDBusRemoteClient.h" --# else -+# elif defined(MOZ_X11) - # include "nsGTKRemoteServer.h" - # include "nsXRemoteClient.h" -+# else -+# include "nsRemoteClient.h" - # endif - #elif defined(XP_WIN) - # include "nsWinRemoteServer.h" -@@ -94,8 +96,10 @@ - #ifdef MOZ_WIDGET_GTK - # if defined(MOZ_ENABLE_DBUS) - client = MakeUnique(); -+# elif defined(MOZ_X11) -+ client = MakeUnique(); - # else -- client = MakeUnique(); -+ return REMOTE_NOT_FOUND; - # endif - #elif defined(XP_WIN) - client = MakeUnique(); -@@ -138,8 +142,10 @@ - #ifdef MOZ_WIDGET_GTK - # if defined(MOZ_ENABLE_DBUS) - mRemoteServer = MakeUnique(); -+# elif defined(MOZ_X11) -+ mRemoteServer = MakeUnique(); - # else -- mRemoteServer = MakeUnique(); -+ return; - # endif - #elif defined(XP_WIN) - mRemoteServer = MakeUnique(); ---- a/widget/gtk/nsAppShell.cpp -+++ b/widget/gtk/nsAppShell.cpp -@@ -296,8 +296,10 @@ - do_GetService(POWERMANAGERSERVICE_CONTRACTID); - - if (powerManagerService) { -+#ifdef MOZ_ENABLE_DBUS - powerManagerService->AddWakeLockListener( - WakeLockListener::GetSingleton()); -+#endif - } else { - NS_WARNING( - "Failed to retrieve PowerManagerService, wakelocks will be broken!"); diff --git a/testing/firefox/patches/no-fribidi.patch b/testing/firefox/patches/no-fribidi.patch deleted file mode 100644 index 89b4468a..00000000 --- a/testing/firefox/patches/no-fribidi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild -index a1b58eb59b..d35da57db3 100644 ---- a/config/system-headers.mozbuild -+++ b/config/system-headers.mozbuild -@@ -267,7 +267,6 @@ system_headers = [ - 'freetype/t1tables.h', - 'freetype/ttnameid.h', - 'freetype/tttables.h', -- 'fribidi/fribidi.h', - 'FSp_fopen.h', - 'fstream', - 'fstream.h', diff --git a/testing/firefox/post-install b/testing/firefox/post-install deleted file mode 100755 index f4d91a7e..00000000 --- a/testing/firefox/post-install +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -cat <