firefox: 100.0

2022-05-05 12:55:58 +05:30 · 2022-05-05 12:55:58 +05:30 · 9fac541bdd
commit 9fac541bdd
parent da69e75817
6 changed files with 87 additions and 1679 deletions
--- a/extra/firefox/build
+++ b/extra/firefox/build
@ -1,12 +1,9 @@
 #!/bin/sh -e

-for p in *.patch; do
+for p in no-x11/*.patch *.patch; do
    patch -p1 < "$p"
 done

-mv widget/x11/keysym2ucs.c widget/gtk/keysym2ucs.c
-mv widget/x11/keysym2ucs.h widget/gtk/keysym2ucs.h
-
 # Build autoconf 2.13 for Firefox's sole use.
 # See: https://bugzilla.mozilla.org/show_bug.cgi?id=104642
 (
@ -70,6 +67,7 @@ ac_add_options --enable-alsa
 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
@ -95,7 +93,6 @@ 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-pulseaudio
 ac_add_options --disable-accessibility
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
--- a/extra/firefox/checksums
+++ b/extra/firefox/checksums
@ -1,9 +1,10 @@
-76d22279ce99588a728bb2d034064be0d5918b5900631f2148d4565b8a72e00b
+664c0cc4e0fb70886aa4e652d144996045d533a18eebc7d61093103cbb2d5e7f
+5a5089d5ddec57e0f41b1370ace7907d1b74df96b57be53623b9f52f28f92121
 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
 ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7
 86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b
+7f0fc610ea9c39d18d4cd3f0bdec35d3579dd844fd964421207fb26d8c52700f
 4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9
-b70872a93fb765a14ea9f8c539ee7713cb211f0f76fde29f21e4d52e43ae6816
--- a/extra/firefox/patches/no-dbus.patch
+++ b/extra/firefox/patches/no-dbus.patch
@ -0,0 +1,79 @@
+diff --git a/third_party/rust/audio_thread_priority/Cargo.toml b/third_party/rust/audio_thread_priority/Cargo.toml
+index 188eced..dabc898 100644
+--- a/third_party/rust/audio_thread_priority/Cargo.toml
+++ b/third_party/rust/audio_thread_priority/Cargo.toml
+@@ -34,7 +34,6 @@ optional = true
+ version = "0.15.0"
+ 
+ [features]
+-default = ["with_dbus", "winapi"]
+ terminal-logging = ["simple_logger"]
+ with_dbus = ["dbus"]
+ [target."cfg(target_os = \"linux\")".dependencies.dbus]
+diff --git a/third_party/rust/audio_thread_priority/.cargo-checksum.json b/third_party/rust/audio_thread_priority/.cargo-checksum.json
+index 7e535d3..2c7d591 100644
+--- a/third_party/rust/audio_thread_priority/.cargo-checksum.json
+++ b/third_party/rust/audio_thread_priority/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"f2a927f4fdf4171eb2111ad9f770fd113d058d6d7dffa10fce7bd7577edda582","LICENSE":"32ee9dbf6196874fc9d406c54a888a6c4cbb9aa4a7f35b46befeaff43a78fe85","Makefile":"0f9a771cfb30c7c4b9961d82fdca4e9e229a955bb2e636474a4101389e18e938","README.md":"c123692b3b50dd621b896a8269814d609cbf1e532b461bf4a77854ddd607eb7a","atp_test.cpp":"8075a040941a65fb9e3f7cbf0535853ca6661c3ac442ec35569b42b24bbec797","audio_thread_priority.h":"f0ecaf1b674f794cde0dc834028e074d4e4675d22ae96acf08b2ae1dceb3474e","generate_osx_bindings.sh":"06e4e03450f788ced18d31fff5660919e6f6ec1119ddace363ffeb82f0518a71","src/lib.rs":"975de6a74e0adb999a08bc41f08a3bd68fe11c154731bc12c43df546ddb32949","src/mach_sys.rs":"352560fcb9b41d877cff92e5b3b04d6dc68b1f30508ce4b9aed78940120a883e","src/rt_linux.rs":"4ea9f6eb1902aff0126d1b957be7f723d599e9a8bbd75ca8013a2820ef5fe68a","src/rt_mach.rs":"e4587fdf640df37f251e50c6c9313f6a73eae4d54f4b8a84cefc6bc730e94be8","src/rt_win.rs":"c41f6e277051a92f8d38939cf9d78ee6deea736a4686b3bcd185492e47e1650a"},"package":"8b7cd1bfd03dab20ad72e0c5e58d65818d62c0d199d8dec8361053d0f073dbae"}
+\ No newline at end of file
+{"files":{"Cargo.toml":"7c54f0856a9ee89d9f7b92085b7605cea741f72ea0df60754f4fa0076a19d9d5","LICENSE":"32ee9dbf6196874fc9d406c54a888a6c4cbb9aa4a7f35b46befeaff43a78fe85","Makefile":"0f9a771cfb30c7c4b9961d82fdca4e9e229a955bb2e636474a4101389e18e938","README.md":"c123692b3b50dd621b896a8269814d609cbf1e532b461bf4a77854ddd607eb7a","atp_test.cpp":"8075a040941a65fb9e3f7cbf0535853ca6661c3ac442ec35569b42b24bbec797","audio_thread_priority.h":"f0ecaf1b674f794cde0dc834028e074d4e4675d22ae96acf08b2ae1dceb3474e","generate_osx_bindings.sh":"06e4e03450f788ced18d31fff5660919e6f6ec1119ddace363ffeb82f0518a71","src/lib.rs":"975de6a74e0adb999a08bc41f08a3bd68fe11c154731bc12c43df546ddb32949","src/mach_sys.rs":"352560fcb9b41d877cff92e5b3b04d6dc68b1f30508ce4b9aed78940120a883e","src/rt_linux.rs":"4ea9f6eb1902aff0126d1b957be7f723d599e9a8bbd75ca8013a2820ef5fe68a","src/rt_mach.rs":"e4587fdf640df37f251e50c6c9313f6a73eae4d54f4b8a84cefc6bc730e94be8","src/rt_win.rs":"c41f6e277051a92f8d38939cf9d78ee6deea736a4686b3bcd185492e47e1650a"},"package":"8b7cd1bfd03dab20ad72e0c5e58d65818d62c0d199d8dec8361053d0f073dbae"}
+\ No newline at end of file
+diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build
+index d3bab6cf..656b32c7 100644
+--- a/toolkit/components/remote/moz.build
+++ b/toolkit/components/remote/moz.build
+@@ -26,7 +26,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+             "nsUnixRemoteServer.h",
+             "RemoteUtils.h",
+         ]
+-    else:
+    elif CONFIG["MOZ_X11"]:
+         SOURCES += [
+             "nsGTKRemoteServer.cpp",
+             "nsXRemoteClient.cpp",
+diff --git a/toolkit/components/remote/nsRemoteService.cpp b/toolkit/components/remote/nsRemoteService.cpp
+index ef4b95cb..4941f213 100644
+--- a/toolkit/components/remote/nsRemoteService.cpp
+++ b/toolkit/components/remote/nsRemoteService.cpp
+@@ -12,12 +12,14 @@
+ 
+ #ifdef MOZ_WIDGET_GTK
+ #  include "mozilla/WidgetUtilsGtk.h"
+-#  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"
+@@ -102,8 +104,10 @@ RemoteResult nsRemoteService::StartClient(const char* aDesktopStartupID) {
+ #ifdef MOZ_WIDGET_GTK
+ #  if defined(MOZ_ENABLE_DBUS)
+   client = MakeUnique<nsDBusRemoteClient>();
+-#  else
+#  elif defined(MOZ_X11)
+   client = MakeUnique<nsXRemoteClient>();
+#  else
+  return REMOTE_NOT_FOUND;
+ #  endif
+ #elif defined(XP_WIN)
+   client = MakeUnique<nsWinRemoteClient>();
+@@ -146,8 +150,10 @@ void nsRemoteService::StartupServer() {
+ #ifdef MOZ_WIDGET_GTK
+ #  if defined(MOZ_ENABLE_DBUS)
+   mRemoteServer = MakeUnique<nsDBusRemoteServer>();
+-#  else
+#  elif defined(MOZ_X11)
+   mRemoteServer = MakeUnique<nsGTKRemoteServer>();
+#  else
+  return;
+ #  endif
+ #elif defined(XP_WIN)
+   mRemoteServer = MakeUnique<nsWinRemoteServer>();
--- a/extra/firefox/patches/no-x11.patch
+++ b/extra/firefox/patches/no-x11.patch
--- a/extra/firefox/sources
+++ b/extra/firefox/sources
@ -1,9 +1,10 @@
 https://ftp.mozilla.org/pub/firefox/releases/VERSION/source/firefox-VERSION.source.tar.xz
+https://github.com/ATiltedTree/firefox-wayland/archive/dbf17551a416c3357687411765b48755278bd94a.tar.gz no-x11
 https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
 https://github.com/yasm/yasm/releases/download/v1.3.0/yasm-1.3.0.tar.gz yasm
 https://fossies.org/linux/misc/zip30.tar.gz zip
 https://fossies.org/linux/misc/unzip60.tar.gz unzip
 patches/fix-clang-as.patch
 patches/fix-linux-header.patch
+patches/no-dbus.patch
 patches/no-fribidi.patch
-patches/no-x11.patch
--- a/extra/firefox/version
+++ b/extra/firefox/version
@ -1 +1 @@
-99.0.1 1
+100.0 1
 @ -1 +1 @@
 .0.1 1
 .0 1