diff --git a/.SRCINFO b/.SRCINFO
index 7bdd74d..70add39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
pkgbase = firedragon
pkgdesc = Librewolf fork build using Nightly sources with custom branding, Proton UI rework & Fission enabled.
- pkgver = 88.0a1.r636925+
+ pkgver = 88.0a1.r637287+
pkgrel = 1
url = https://gitlab.com/dr460nf1r3/settings/
+ install = firedragon.install
arch = x86_64
arch = aarch64
license = MPL
@@ -56,6 +57,7 @@ pkgbase = firedragon
optdepends = libappindicator-gtk3: Global menu support for GTK apps
optdepends = appmenu-gtk-module-git: Appmenu for GTK only
optdepends = plasma5-applets-window-appmenu: Appmenu for Plasma only
+ replaces = dragonwolf
options = !emptydirs
options = !makeflags
options = !strip
@@ -63,29 +65,33 @@ pkgbase = firedragon
source_x86_64 = firedragon.desktop
source_x86_64 = git+https://gitlab.com/dr460nf1r3/common.git
source_x86_64 = git+https://gitlab.com/dr460nf1r3/settings.git
- source_x86_64 = remove_addons.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/e123b80f7df1ad9043435f345c426717ca323579/remove_addons.patch
- source_x86_64 = context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/e123b80f7df1ad9043435f345c426717ca323579/context-menu.patch
+ source_x86_64 = remove_addons.patch
+ source_x86_64 = context-menu.patch
+ source_x86_64 = 0001-Use-remoting-name-for-GDK-application-names.patch
sha512sums_x86_64 = SKIP
sha512sums_x86_64 = 1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290
sha512sums_x86_64 = SKIP
sha512sums_x86_64 = SKIP
- sha512sums_x86_64 = 8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921
- sha512sums_x86_64 = a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061
+ sha512sums_x86_64 = 861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3
+ sha512sums_x86_64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
+ sha512sums_x86_64 = fd83824398fa5a2d3be8e82316c0c5eebe5a1e49c0b2e4eb6da3f4241c613dd21bb6fdb1eb8d4000007a02c5538e0db7fcd1e8e019a88147297628f2e0536fc9
source_aarch64 = hg+https://hg.mozilla.org/mozilla-unified#revision=autoland
source_aarch64 = firedragon.desktop
source_aarch64 = git+https://gitlab.com/dr460nf1r3/common.git
source_aarch64 = git+https://gitlab.com/dr460nf1r3/settings.git
- source_aarch64 = remove_addons.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/e123b80f7df1ad9043435f345c426717ca323579/remove_addons.patch
- source_aarch64 = context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/e123b80f7df1ad9043435f345c426717ca323579/context-menu.patch
- source_aarch64 = arm.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/e123b80f7df1ad9043435f345c426717ca323579/arm.patch
+ source_aarch64 = remove_addons.patch
+ source_aarch64 = context-menu.patch
+ source_aarch64 = arm.patch
source_aarch64 = build-arm-libopus.patch
+ source_aarch64 = 0001-Use-remoting-name-for-GDK-application-names.patch
sha512sums_aarch64 = SKIP
sha512sums_aarch64 = 1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290
sha512sums_aarch64 = SKIP
sha512sums_aarch64 = SKIP
- sha512sums_aarch64 = 8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921
- sha512sums_aarch64 = a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061
- sha512sums_aarch64 = 179d922764a959c3eccd1ff98e16c629516d04c9a3a8fe6d199f8de88ad7163a026e4415836728a01a89703f1f31247addcead2da2b341b1849e4627a742c5b9
+ sha512sums_aarch64 = 861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3
+ sha512sums_aarch64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
+ sha512sums_aarch64 = 7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f
sha512sums_aarch64 = 6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35
+ sha512sums_aarch64 = fd83824398fa5a2d3be8e82316c0c5eebe5a1e49c0b2e4eb6da3f4241c613dd21bb6fdb1eb8d4000007a02c5538e0db7fcd1e8e019a88147297628f2e0536fc9
pkgname = firedragon
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
new file mode 100644
index 0000000..b68b7eb
--- /dev/null
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -0,0 +1,42 @@
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -4315,11 +4315,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+ // consistently.
+
+ // Set program name to the one defined in application.ini.
+- {
+- nsAutoCString program(gAppData->name);
+- ToLowerCase(program);
+- g_set_prgname(program.get());
+- }
++ g_set_prgname(gAppData->remotingName);
+
+ // Initialize GTK here for splash.
+
+--- a/widget/gtk/nsAppShell.cpp
++++ b/widget/gtk/nsAppShell.cpp
+@@ -24,6 +24,7 @@
+ # include "WakeLockListener.h"
+ #endif
+ #include "gfxPlatform.h"
++#include "nsAppRunner.h"
+ #include "ScreenHelperGTK.h"
+ #include "HeadlessScreenHelper.h"
+ #include "mozilla/widget/ScreenManager.h"
+@@ -153,13 +154,9 @@ nsresult nsAppShell::Init() {
+ // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
+ //
+ // Only bother doing this for the parent process, since it's the one
+- // creating top-level windows. (At this point, a child process hasn't
+- // received the list of registered chrome packages, so the
+- // GetBrandShortName call would fail anyway.)
+- nsAutoString brandName;
+- mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
+- if (!brandName.IsEmpty()) {
+- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
++ // creating top-level windows.
++ if (gAppData) {
++ gdk_set_program_class(gAppData->remotingName);
+ }
+ }
+ }
diff --git a/PKGBUILD b/PKGBUILD
index ced22d1..984b2f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgname=firedragon
_pkgname=FireDragon
-pkgver=88.0a1.r636925+
+pkgver=88.0a1.r637287+
pkgrel=1
pkgdesc="Librewolf fork build using Nightly sources with custom branding, Proton UI rework & Fission enabled."
arch=(x86_64 aarch64)
@@ -40,31 +40,35 @@ source_x86_64=("hg+$_repo#revision=autoland"
$pkgname.desktop
"git+https://gitlab.com/dr460nf1r3/common.git"
"git+https://gitlab.com/dr460nf1r3/settings.git"
- "remove_addons.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/remove_addons.patch"
- "context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/context-menu.patch")
+ remove_addons.patch
+ context-menu.patch
+ 0001-Use-remoting-name-for-GDK-application-names.patch)
source_aarch64=("hg+$_repo#revision=autoland"
$pkgname.desktop
"git+https://gitlab.com/dr460nf1r3/common.git"
"git+https://gitlab.com/dr460nf1r3/settings.git"
- "remove_addons.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/remove_addons.patch"
- "context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/context-menu.patch"
- "arm.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/arm.patch"
- build-arm-libopus.patch)
+ remove_addons.patch
+ context-menu.patch
+ arm.patch
+ build-arm-libopus.patch
+ 0001-Use-remoting-name-for-GDK-application-names.patch)
sha512sums_x86_64=('SKIP'
'1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290'
'SKIP'
'SKIP'
- '8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921'
- 'a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061')
+ '861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3'
+ 'bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3'
+ 'fd83824398fa5a2d3be8e82316c0c5eebe5a1e49c0b2e4eb6da3f4241c613dd21bb6fdb1eb8d4000007a02c5538e0db7fcd1e8e019a88147297628f2e0536fc9')
sha512sums_aarch64=('SKIP'
'1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290'
'SKIP'
'SKIP'
- '8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921'
- 'a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061'
- '179d922764a959c3eccd1ff98e16c629516d04c9a3a8fe6d199f8de88ad7163a026e4415836728a01a89703f1f31247addcead2da2b341b1849e4627a742c5b9'
- '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35')
+ '861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3'
+ 'bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3'
+ '7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f'
+ '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35'
+ 'fd83824398fa5a2d3be8e82316c0c5eebe5a1e49c0b2e4eb6da3f4241c613dd21bb6fdb1eb8d4000007a02c5538e0db7fcd1e8e019a88147297628f2e0536fc9')
pkgver() {
cd mozilla-unified
@@ -94,6 +98,8 @@ ac_add_options --prefix=/usr
ac_add_options --enable-release
ac_add_options --enable-hardening
ac_add_options --enable-rust-simd
+ac_add_options --with-ccache
+ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
export CC='clang'
export CXX='clang++'
export AR=llvm-ar
@@ -124,9 +130,11 @@ ac_add_options --with-system-jpeg
ac_add_options --enable-pulseaudio
ac_add_options --enable-alsa
ac_add_options --enable-jack
+ac_add_options --disable-warnings-as-errors
ac_add_options --disable-crashreporter
+ac_add_options --disable-tests
+ac_add_options --disable-debug
ac_add_options --disable-updater
-ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
# Disables crash reporting, telemetry and other data gathering tools
mk_add_options MOZ_CRASHREPORTER=0
@@ -167,12 +175,14 @@ ac_add_options --enable-optimize
END
fi
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
+ patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
+
# Remove some pre-installed addons that might be questionable
- # patch -p1 -i ../remove_addons.patch
+ patch -p1 -i ../remove_addons.patch
# To enable global menubar
- # Set these to true:
- # browser.proton.enabled
+ # Set these to true
# browser.proton.appmenu.enabled
# Disabling Pocket
diff --git a/arm.patch b/arm.patch
new file mode 100644
index 0000000..f518113
--- /dev/null
+++ b/arm.patch
@@ -0,0 +1,12 @@
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
+index f8977a6..34f52fc 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp
++++ b/js/src/wasm/WasmSignalHandlers.cpp
+@@ -247,7 +247,7 @@ using mozilla::DebugOnly;
+ // If you run into compile problems on a tier-3 platform, you can disable the
+ // emulation here.
+
+-#if defined(__linux__) && defined(__arm__)
++#if 0 && defined(__linux__) && defined(__arm__)
+ # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #endif
diff --git a/context-menu.patch b/context-menu.patch
new file mode 100644
index 0000000..920d6d5
--- /dev/null
+++ b/context-menu.patch
@@ -0,0 +1,24 @@
+diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
+index 8e44d005f4..abf133843f 100644
+--- a/browser/base/content/browser-context.inc
++++ b/browser/base/content/browser-context.inc
+@@ -87,9 +87,6 @@
+
+-
+
+@@ -224,9 +221,6 @@
+
+-
+
+