diff --git a/extra/firefox/checksums b/extra/firefox/checksums index 87469e22..0a32c730 100644 --- a/extra/firefox/checksums +++ b/extra/firefox/checksums @@ -1,5 +1,4 @@ -e619d0f524c95bf78af0008cc22fe284ff398d72fc0b6cc9d8737b3b5a9b9eb7 -ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7 +8a562e5a397b57e9bf383c2988308ab494c5d28844e792c658fedea27756584a 86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b 3dca92562f352f1aa448830af7f7396df5ed472f4295e549e8181bbc61d15341 42d489e60eae7d2807ef109a4eb1dd3d0e52e8ea9a8a19074495453e588f0625 diff --git a/extra/firefox/patches/fix-clang-as.patch b/extra/firefox/patches/fix-clang-as.patch deleted file mode 100644 index 125487d2..00000000 --- a/extra/firefox/patches/fix-clang-as.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile ---- a/security/nss/lib/freebl/Makefile -+++ b/security/nss/lib/freebl/Makefile -@@ -753,7 +753,6 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$(OBJ_SUFFIX): CFLAGS += -mssse3 - # .set Htbl, %rdi - # So we can't use Clang's integrated assembler with intel-gcm.s. - ifdef CC_IS_CLANG --$(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): CFLAGS += -no-integrated-as - endif - endif - -diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp ---- a/security/nss/lib/freebl/freebl.gyp -+++ b/security/nss/lib/freebl/freebl.gyp -@@ -19,13 +19,10 @@ - 'conditions': [ - [ 'cc_is_clang==1 and force_integrated_as!=1', { - 'cflags': [ -- '-no-integrated-as', - ], - 'cflags_mozilla': [ -- '-no-integrated-as', - ], - 'asflags_mozilla': [ -- '-no-integrated-as', - ], - }], - ], -diff --git a/security/nss/lib/freebl/freebl_base.gypi b/security/nss/lib/freebl/freebl_base.gypi ---- a/security/nss/lib/freebl/freebl_base.gypi -+++ b/security/nss/lib/freebl/freebl_base.gypi -@@ -74,13 +74,10 @@ - 'conditions': [ - [ 'cc_is_clang==1 and fuzz!=1 and coverage!=1 and force_integrated_as!=1', { - 'cflags': [ -- '-no-integrated-as', - ], - 'cflags_mozilla': [ -- '-no-integrated-as', - ], - 'asflags_mozilla': [ -- '-no-integrated-as', - ], - }], - ], --- -2.35.1 - diff --git a/extra/firefox/sources b/extra/firefox/sources index 386829ff..f03d7e79 100644 --- a/extra/firefox/sources +++ b/extra/firefox/sources @@ -1,5 +1,4 @@ https://ftp.mozilla.org/pub/firefox/releases/VERSION/source/firefox-VERSION.source.tar.xz -patches/fix-clang-as.patch patches/fix-linux-header.patch patches/libwebrtc-screen-cast-sync.patch patches/no-dbus.patch diff --git a/extra/firefox/version b/extra/firefox/version index e0d95c90..9eb2a421 100644 --- a/extra/firefox/version +++ b/extra/firefox/version @@ -1 +1 @@ -106.0.4 1 +107.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 362f91a6..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 -./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 4872ac44..00000000 --- a/testing/firefox/checksums +++ /dev/null @@ -1,6 +0,0 @@ -d02a55e89c831469c93898f048009e3f49e4ccb8b36df811ecb2cc47062d91e9 -86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b -42d489e60eae7d2807ef109a4eb1dd3d0e52e8ea9a8a19074495453e588f0625 -4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9 -ed51ce8a6730c489ea9dda354f02c579fb3632925096a0260bfae7a6b82ceace -5b0aad43012e4c175a6dde70b006fa9f07c4b0d70e9632414f16ac55d5243be4 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-linux-header.patch b/testing/firefox/patches/fix-linux-header.patch deleted file mode 100644 index 9f7fc51a..00000000 --- a/testing/firefox/patches/fix-linux-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c -index 73e85c6ccc..9eca548638 100644 ---- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c -+++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c -@@ -31,6 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - #if defined(LINUX) -+#include - #include "addrs-netlink.h" - #include - #include diff --git a/testing/firefox/patches/no-dbus.patch b/testing/firefox/patches/no-dbus.patch deleted file mode 100644 index 18f547d5..00000000 --- a/testing/firefox/patches/no-dbus.patch +++ /dev/null @@ -1,56 +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(); 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/patches/no-perl.patch b/testing/firefox/patches/no-perl.patch deleted file mode 100644 index bcde015a..00000000 --- a/testing/firefox/patches/no-perl.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/moz.configure b/moz.configure -index 95763e2..dc0ed30 100755 ---- a/moz.configure -+++ b/moz.configure -@@ -527,60 +527,6 @@ def awk_for_old_configure(value): - - add_old_configure_assignment("AWK", awk_for_old_configure) - -- --# Perl detection --# ============================================================== --perl = check_prog("PERL", ("perl5", "perl")) -- --# Until the PERL variable is not necessary in old-configure -- -- --@depends(perl) --def perl_for_old_configure(value): -- return value -- -- --add_old_configure_assignment("PERL", perl_for_old_configure) -- -- --@template --def perl_version_check(min_version): -- @depends(perl) -- @checking("for minimum required perl version >= %s" % min_version) -- def get_perl_version(perl): -- return Version( -- check_cmd_output( -- perl, -- "-e", -- "print $]", -- onerror=lambda: die("Failed to get perl version."), -- ) -- ) -- -- @depends(get_perl_version) -- def check_perl_version(version): -- if version < min_version: -- die("Perl %s or higher is required.", min_version) -- -- @depends(perl) -- @checking("for full perl installation") -- @imports("subprocess") -- def has_full_perl_installation(perl): -- ret = subprocess.call([perl, "-e", "use Config; exit(!-d $Config{archlib})"]) -- return ret == 0 -- -- @depends(has_full_perl_installation) -- def require_full_perl_installation(has_full_perl_installation): -- if not has_full_perl_installation: -- die( -- "Cannot find Config.pm or $Config{archlib}. " -- "A full perl installation is required." -- ) -- -- --perl_version_check("5.006") -- -- - # GNU make detection - # ============================================================== - option(env="MAKE", nargs=1, help="Path to GNU make") diff --git a/testing/firefox/patches/python-3.11.patch b/testing/firefox/patches/python-3.11.patch deleted file mode 100644 index 97ac3cef..00000000 --- a/testing/firefox/patches/python-3.11.patch +++ /dev/null @@ -1,30 +0,0 @@ -# https://src.fedoraproject.org/rpms/firefox/c/4d45de9bff7b7ef01f7d3c9e53a61adc9cf3ce9e?branch=4d45de9bff7b7ef01f7d3c9e53a61adc9cf3ce9e - -diff -up firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py.build-python-3.11 firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py ---- firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py.build-python-3.11 2022-06-23 09:10:31.000000000 +0200 -+++ firefox-102.0/xpcom/idl-parser/xpidl/xpidl.py 2022-07-15 16:18:52.048351493 +0200 -@@ -1572,13 +1572,13 @@ class IDLParser(object): - t_ignore = " \t" - - def t_multilinecomment(self, t): -- r"/\*(?s).*?\*/" -+ r"/\*(?s:.)*?\*/" - t.lexer.lineno += t.value.count("\n") - if t.value.startswith("/**"): - self._doccomments.append(t.value) - - def t_singlelinecomment(self, t): -- r"(?m)//.*?$" -+ r"(?m://.*?$)" - - def t_IID(self, t): - return t -@@ -1591,7 +1591,7 @@ class IDLParser(object): - return t - - def t_LCDATA(self, t): -- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P.*?\n?)%\}[ ]*(C\+\+)?" -+ r"(?s:%\{[ ]*C\+\+[ ]*\n(?P.*?\n?)%\}[ ]*(C\+\+)?)" - t.type = "CDATA" - t.value = t.lexer.lexmatch.group("cdata") - t.lexer.lineno += t.value.count("\n") 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 <