Follow upstream

9 files changed, 30 insertions, 221 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92a515fb099e..1f435e471e8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firedragon-hg
 	pkgdesc = Librewolf fork build using Nightly sources with custom branding, Proton UI rework & Fission enabled.
-	pkgver = 90.0a1.r647896
+	pkgver = 90.0a1.r648161
 	pkgrel = 1
 	url = https://gitlab.com/dr460nf1r3/settings/
 	install = firedragon.install
@@ -20,6 +20,7 @@ pkgbase = firedragon-hg
 	makedepends = rust
 	makedepends = xorg-server-xwayland
 	makedepends = xorg-server-xvfb
+	makedepends = dump_syms
 	makedepends = autoconf2.13
 	makedepends = mercurial
 	makedepends = clang
@@ -71,21 +72,10 @@ pkgbase = firedragon-hg
 	source = firedragon.desktop
 	source = git+https://gitlab.com/dr460nf1r3/common.git
 	source = git+https://gitlab.com/dr460nf1r3/settings.git
-	source = remove_addons.patch
-	source = context-menu.patch
-	source = mozilla-vpn-ad.patch
-	source = builtin_js.patch
 	sha512sums = SKIP
 	sha512sums = 1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = d4bc43a7922a2391d9f2a2d0654e4c3cb6ec08aeead5249e933dec28bbd5d4a945591e03db54e91298f41a4bc50acb4f7bc2a0df4094e458be33f146b6186879
-	sha512sums = 29677a878286464e9bdd8d605515ef6105e0d409c54ce4e100f2474d090728869953b5a16e5c872325c71a94b83d35e86a8ca45d089ea14454713ff8dceff6f2
-	sha512sums = 1d1e6e2675750e9b09533ff891ee253418fa0ae2d2b86d448b35fbbd712d3b43353babcda5c80273c897ef3ee1aec50e3bc8f80b5d2d1e18f2176556cf792286
-	sha512sums = 25c9fa51d0ebfeea9ad88c83325dae1d0643499253946278ffeaf04b7d1aad61a76e24a5b0e1689877fa6fd5ca67135006dd8edecb54418012c826f94ca22555
-	source_aarch64 = arm.patch
-	source_aarch64 = build-arm-libopus.patch
-	sha512sums_aarch64 = 7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f
-	sha512sums_aarch64 = 6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35
 
 pkgname = firedragon-hg
+
diff --git a/PKGBUILD b/PKGBUILD
index 98245e8ae39c..8e79a2d6f746 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 pkgname=firedragon-hg
 _pkgname=FireDragon
 __pkgname=firedragon
-pkgver=90.0a1.r647896
+pkgver=90.0a1.r648161
 pkgrel=1
 pkgdesc="Librewolf fork build using Nightly sources with custom branding, Proton UI rework & Fission enabled."
 arch=(x86_64 aarch64)
@@ -23,7 +23,7 @@ depends=(gtk3 libxt mime-types dbus-glib
          ffmpeg nss-hg ttf-font libpulse
          libvpx libjpeg zlib icu libevent libpipewire02)
 makedepends=(unzip zip diffutils yasm mesa imake inetutils ccache
-             rust xorg-server-xwayland xorg-server-xvfb
+             rust xorg-server-xwayland xorg-server-xvfb dump_syms
              autoconf2.13 mercurial clang llvm jack gtk2 nodejs cbindgen nasm
              python-setuptools python-psutil python-zstandard git binutils lld)
 optdepends=('firejail-git: Sandboxing the browser using the included profiles'
@@ -39,30 +39,17 @@ optdepends=('firejail-git: Sandboxing the browser using the included profiles'
             'appmenu-gtk-module-git: Appmenu for GTK only'
             'plasma5-applets-window-appmenu: Appmenu for Plasma only')
 options=(!emptydirs !makeflags !strip)
-_linux_commit=e123b80f7df1ad9043435f345c426717ca323579
 _repo=https://hg.mozilla.org/mozilla-unified
 install=firedragon.install
 source=("hg+$_repo#revision=autoland"
         $__pkgname.desktop
         "git+https://gitlab.com/dr460nf1r3/common.git"
-        "git+https://gitlab.com/dr460nf1r3/settings.git"
-        remove_addons.patch
-        context-menu.patch
-        mozilla-vpn-ad.patch
-        builtin_js.patch)
-source_aarch64=(arm.patch
-                build-arm-libopus.patch)
+        "git+https://gitlab.com/dr460nf1r3/settings.git")
 
 sha512sums=('SKIP'
             '1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290'
             'SKIP'
-            'SKIP'
-            'd4bc43a7922a2391d9f2a2d0654e4c3cb6ec08aeead5249e933dec28bbd5d4a945591e03db54e91298f41a4bc50acb4f7bc2a0df4094e458be33f146b6186879'
-            '29677a878286464e9bdd8d605515ef6105e0d409c54ce4e100f2474d090728869953b5a16e5c872325c71a94b83d35e86a8ca45d089ea14454713ff8dceff6f2'
-            '1d1e6e2675750e9b09533ff891ee253418fa0ae2d2b86d448b35fbbd712d3b43353babcda5c80273c897ef3ee1aec50e3bc8f80b5d2d1e18f2176556cf792286'
-            '25c9fa51d0ebfeea9ad88c83325dae1d0643499253946278ffeaf04b7d1aad61a76e24a5b0e1689877fa6fd5ca67135006dd8edecb54418012c826f94ca22555')
-sha512sums_aarch64=('7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f'
-                    '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35')
+            'SKIP')
 
 pkgver() {
   cd mozilla-unified
@@ -75,10 +62,7 @@ prepare() {
   fi
   cd mozilla-unified
 
-  #
-  # If you want to disable LTO/PGO (compile too long), delete the lines below beginning with
-  # `ac_add_options --enable-lto' and ending with 'export RANLIB=llvm-ranlib`
-  #
+  local _patches_dir="${srcdir}/common/patches-hg"
 
   cat >../mozconfig <<END
 ac_add_options --enable-application=browser
@@ -177,39 +161,30 @@ END
 fi
 
   # Fix build-time error
-  patch -p1 -i ../builtin_js.patch
+  patch -Np1 -i ${_patches_dir}/builtin_js.patch
 
   # Remove some pre-installed addons that might be questionable
-  patch -p1 -i ../remove_addons.patch
-
-  # Remove mozilla vpn ads
-  patch -p1 -i ../mozilla-vpn-ad.patch
+  patch -Np1 -i ${_patches_dir}/remove_addons.patch
 
   # Disabling Pocket
-  sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build
-
-  patch -p1 -i ../context-menu.patch
+  patch -Np1 -i ${_patches_dir}/sed-patches/disable-pocket.patch
 
-  # This one only to remove an annoying error message:
-  sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/BrowserGlue.jsm
+  # Remove Mozilla VPN ads
+  patch -Np1 -i ${_patches_dir}/mozilla-vpn-ad.patch
 
   # Remove Internal Plugin Certificates
-  _cert_sed='s#if (aCert.organizationalUnit == "Mozilla [[:alpha:]]\+") {\n'
-  _cert_sed+='[[:blank:]]\+return AddonManager\.SIGNEDSTATE_[[:upper:]]\+;\n'
-  _cert_sed+='[[:blank:]]\+}#'
-  _cert_sed+='// NOTE: removed#g'
-  sed -z "$_cert_sed" -i toolkit/mozapps/extensions/internal/XPIInstall.jsm
+  patch -Np1 -i ${_patches_dir}/sed-patches/remove-internal-plugin-certs.patch
 
   # Allow SearchEngines option in non-ESR builds
-  sed -i 's#"enterprise_only": true,#"enterprise_only": false,#g' browser/components/enterprisepolicies/schemas/policies-schema.json
-
-  _settings_services_sed='s#firefox.settings.services.mozilla.com#f.s.s.m.c.qjz9zk#g'
+  patch -Np1 -i ${_patches_dir}/sed-patches/allow-searchengines-non-esr.patch
 
   # Stop some undesired requests (https://gitlab.com/librewolf-community/browser/common/-/issues/10)
-  sed "$_settings_services_sed" -i browser/components/newtab/data/content/activity-stream.bundle.js
-  sed "$_settings_services_sed" -i modules/libpref/init/all.js
-  sed "$_settings_services_sed" -i services/settings/Utils.jsm
-  sed "$_settings_services_sed" -i toolkit/components/search/SearchUtils.jsm
+  patch -Np1 -i ${_patches_dir}/sed-patches/stop-undesired-requests.patch
+
+  # Assorted patches
+  patch -Np1 -i ${_patches_dir}/context-menu.patch
+  patch -Np1 -i ${_patches_dir}/browser-confvars.patch
+  patch -Np1 -i ${_patches_dir}/urlbarprovider-interventions.patch
 
   rm -f ${srcdir}/common/source_files/mozconfig
   cp -r ${srcdir}/common/source_files/* ./
@@ -323,8 +298,6 @@ pref("spellchecker.dictionary_path", "/usr/share/hunspell");
 // pref("extensions.autoDisableScopes", 11);
 END
 
-  # cd ${srcdir}/settings
-  # git checkout ${_settings_commit}
   cd ${srcdir}/mozilla-unified
   cp -r ${srcdir}/settings/* ${pkgdir}/usr/lib/${__pkgname}/
 
diff --git a/arm.patch b/arm.patch
deleted file mode 100644
index f5181134d45c..000000000000
--- a/arm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/build-arm-libopus.patch b/build-arm-libopus.patch
deleted file mode 100644
index 27dfec73b46b..000000000000
--- a/build-arm-libopus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up a/media/libopus/silk/arm/arm_silk_map.c b/media/libopus/silk/arm/arm_silk_map.c
-index 18d73db..7911576 100644
---- a/media/libopus/silk/arm/arm_silk_map.c
-+++ b/media/libopus/silk/arm/arm_silk_map.c
-@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
- # include "config.h"
- #endif
-
--#include "main_FIX.h"
-+#include "fixed/main_FIX.h"
- #include "NSQ.h"
- #include "SigProc_FIX.h"
diff --git a/builtin_js.patch b/builtin_js.patch
deleted file mode 100644
index a984fefa7fc5..000000000000
--- a/builtin_js.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
-index 9189ceb214..eee87893e4 100644
---- a/js/src/builtin/TestingFunctions.cpp
-+++ b/js/src/builtin/TestingFunctions.cpp
-@@ -7382,16 +7382,6 @@ JS_FOR_WASM_FEATURES(WASM_FEATURE, WASM_FEATURE)
- "helperThreadCount()",
- "  Returns the number of helper threads available for off-thread tasks."),
- 
--    JS_FN_HELP("createShapeSnapshot", CreateShapeSnapshot, 1, 0,
--"createShapeSnapshot(obj)",
--"  Returns an object containing a shape snapshot for use with\n"
--"  checkShapeSnapshot.\n"),
--
--    JS_FN_HELP("checkShapeSnapshot", CheckShapeSnapshot, 2, 0,
--"checkShapeSnapshot(snapshot, [obj])",
--"  Check shape invariants based on the given snapshot and optional object.\n"
--"  If there's no object argument, the snapshot's object is used.\n"),
--
-     JS_FN_HELP("enableShapeConsistencyChecks", EnableShapeConsistencyChecks, 0, 0,
- "enableShapeConsistencyChecks()",
- "  Enable some slow Shape assertions.\n"),
diff --git a/context-menu.patch b/context-menu.patch
deleted file mode 100644
index df3ab3d8d0df..000000000000
--- a/context-menu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
-index ee0f14db4f..2c9cd75170 100644
---- a/browser/base/content/browser-context.inc
-+++ b/browser/base/content/browser-context.inc
-@@ -101,9 +101,6 @@
-       <menuitem id="context-savelink"
-                 data-l10n-id="main-context-menu-save-link"
-                 oncommand="gContextMenu.saveLink();"/>
--      <menuitem id="context-savelinktopocket"
--                data-l10n-id="main-context-menu-save-link-to-pocket"
--                oncommand= "Pocket.savePage(gContextMenu.browser, gContextMenu.linkURL);"/>
-       <menuitem id="context-copyemail"
-                 data-l10n-id="main-context-menu-copy-email"
-                 oncommand="gContextMenu.copyEmail();"/>
-@@ -254,9 +251,6 @@
-       <menuitem id="context-savepage"
-                 data-l10n-id="main-context-menu-page-save"
-                 oncommand="gContextMenu.savePageAs();"/>
--      <menuitem id="context-pocket"
--                data-l10n-id="main-context-menu-save-to-pocket"
--                oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/>
-       <menu id="context-sendpagetodevice"
-             class="sync-ui-item"
-             data-l10n-id="main-context-menu-send-to-device"
diff --git a/firedragon.install b/firedragon.install
index 2bd7f94d8a5d..ebf0931f0dad 100644
--- a/firedragon.install
+++ b/firedragon.install
@@ -7,7 +7,14 @@ msg() {
 }
 
 post_install() {
-    post_upgrade
+    msg "Firejail profiles are now present in firejail-git."
+    echo ""
+    msg "To use profile-sync-daemon add firedragon to ~/.config/psd/psd.conf"
+    echo ""
+    msg "If you prefer strict hardened settings execute 'mkdir ~/.firedragon && cp /usr/lib/firedragon/firedragon.overrides.cfg ~/.firedragon/'"
+    echo ""
+    msg "Enjoy the Firedragon 🔥🐉"
+    echo ""
 }
 
 post_upgrade() {
@@ -15,7 +22,7 @@ post_upgrade() {
     echo ""
     msg "To use profile-sync-daemon add firedragon to ~/.config/psd/psd.conf"
     echo ""
-    msg "If you prefer strict hardened settings execute 'mkdir ~/.firedragon && cp /usr/lib/firedragon/firedragon.overrides.cfg ~/.firedragon/'"
+    msg "If you prefer strict hardened settings execute 'cp /usr/lib/firedragon/firedragon.overrides.cfg ~/.firedragon/'"
     echo ""
     msg "Enjoy the Firedragon 🔥🐉"
     echo ""
diff --git a/mozilla-vpn-ad.patch b/mozilla-vpn-ad.patch
deleted file mode 100644
index e05d64da904d..000000000000
--- a/mozilla-vpn-ad.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
-index 91e0798843..85953d2537 100644
---- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
-+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
-@@ -54,13 +54,7 @@
-       <div class="info">
-         <h1 id="info-title" data-l10n-id="about-private-browsing-info-title"></h1>
-         <p id="info-body" data-l10n-id="about-private-browsing-info-description"></p>
--        <a id="private-browsing-myths" data-l10n-id="about-private-browsing-info-myths"></a>
-       </div>
-     </div>
--
--    <div class="promo">
--      <p id="private-browsing-vpn-text" class="vpn-promo" data-l10n-id="about-private-browsing-need-more-privacy"></p>
--      <a id="private-browsing-vpn-link" class="vpn-promo" data-l10n-id="about-private-browsing-turn-on-vpn"></a>
--    </div>
-   </body>
- </html>
diff --git a/remove_addons.patch b/remove_addons.patch
deleted file mode 100644
index f1ce9d5a5c0e..000000000000
--- a/remove_addons.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
-index 269dcb2..ed7c31d 100644
---- a/browser/extensions/moz.build
-+++ b/browser/extensions/moz.build
-@@ -5,10 +5,7 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- DIRS += [
--    "doh-rollout",
-     "formautofill",
-     "screenshots",
--    "webcompat",
--    "report-site-issue",
-     "pictureinpicture",
- ]
-diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
-index 496379c..dd6f359 100644
---- a/browser/locales/Makefile.in
-+++ b/browser/locales/Makefile.in
-@@ -61,7 +61,6 @@ l10n-%:
- ifneq (,$(wildcard ../extensions/formautofill/locales))
- 	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
- endif
--	@$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- 	@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- 	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
-@@ -82,7 +81,6 @@ endif
- 	@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
- 	@$(MAKE) chrome AB_CD=$*
- 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
--	@$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
- 
- package-win32-installer: $(SUBMAKEFILES)
- 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
-diff --git a/browser/locales/filter.py b/browser/locales/filter.py
-index bb2e992..7d7768e 100644
---- a/browser/locales/filter.py
-+++ b/browser/locales/filter.py
-@@ -20,7 +20,6 @@ def test(mod, path, entity=None):
-         "browser",
-         "browser/extensions/formautofill",
-         "browser/extensions/fxmonitor",
--        "browser/extensions/report-site-issue",
-         "extensions/spellcheck",
-         "other-licenses/branding/firefox",
-         "browser/branding/official",
-diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
-index f4cb7ca..4efac13 100644
---- a/browser/locales/l10n.ini
-+++ b/browser/locales/l10n.ini
-@@ -14,7 +14,6 @@ dirs = browser
-      devtools/startup
-      browser/extensions/formautofill
-      browser/extensions/fxmonitor
--     browser/extensions/report-site-issue
- 
- [includes]
- # non-central apps might want to use %(topsrcdir)s here, or other vars
-diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
-index d44e3ccd07..7ab8c78e97 100644
---- a/browser/locales/l10n.toml
-+++ b/browser/locales/l10n.toml
-@@ -135,10 +135,6 @@ locales = [
-     reference = "browser/extensions/fxmonitor/locales/en-US/**"
-     l10n = "{l}browser/extensions/fxmonitor/**"
-
--[[paths]]
--    reference = "browser/extensions/report-site-issue/locales/en-US/**"
--    l10n = "{l}browser/extensions/report-site-issue/**"
--
- [[paths]]
-     reference = "services/sync/locales/en-US/**"
-     l10n = "{l}services/sync/**"