update

6 files changed, 154 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b5d30d14681..acf3ca04814b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -62,36 +62,36 @@ pkgbase = librewolf-nightly
 	options = !strip
 	source_x86_64 = hg+https://hg.mozilla.org/mozilla-unified#revision=autoland
 	source_x86_64 = librewolf-nightly.desktop
-	source_x86_64 = git+https://gitlab.com/librewolf-community/browser/common.git
+	source_x86_64 = git+https://gitlab.com/vnepogodin/librewolf-common.git
 	source_x86_64 = git+https://gitlab.com/vnepogodin/librewolf-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 = 7fdfc23fbf637ef036f51b439e56a84fd12d7f50a894b7318d287da1584ed8be1958c1e403735e9edab8888699f3a68df5c69854d4b87187af1c76734644e44e
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = SKIP
-	sha512sums_x86_64 = 8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921
-	sha512sums_x86_64 = a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061
-	sha512sums_x86_64 = afb4a230b3e87cfb71687b3fe375c78463e02a6f7b1daa15bf6127f6414c6c29bf2d8df372b59b4df7f90fc8929582e8aab4e3db5e8b54b1817c96aad00d92ea
+	sha512sums_x86_64 = 667d9127f4d88ab06bf2cf3693c8dbbf79051b341fbf561f0ba746b26a9670d65d0b9130e77bf4c12cc4d2f89d75286e03292c84bd396147a1c639ddc32daab3
+	sha512sums_x86_64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
+	sha512sums_x86_64 = 9e5c064938029332e5a72d0c214e62dd8cfe11ad304ecbbc8ea6dda8f85536f13b8b42b9a1798d084f6846302fe4df5e197ecc9efeff6e186d6bffe333760706
 	source_aarch64 = hg+https://hg.mozilla.org/mozilla-unified#revision=autoland
 	source_aarch64 = librewolf-nightly.desktop
-	source_aarch64 = git+https://gitlab.com/librewolf-community/browser/common.git
+	source_aarch64 = git+https://gitlab.com/vnepogodin/librewolf-common.git
 	source_aarch64 = git+https://gitlab.com/vnepogodin/librewolf-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 = 7fdfc23fbf637ef036f51b439e56a84fd12d7f50a894b7318d287da1584ed8be1958c1e403735e9edab8888699f3a68df5c69854d4b87187af1c76734644e44e
 	sha512sums_aarch64 = SKIP
 	sha512sums_aarch64 = SKIP
-	sha512sums_aarch64 = 8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921
-	sha512sums_aarch64 = a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061
-	sha512sums_aarch64 = 179d922764a959c3eccd1ff98e16c629516d04c9a3a8fe6d199f8de88ad7163a026e4415836728a01a89703f1f31247addcead2da2b341b1849e4627a742c5b9
+	sha512sums_aarch64 = 667d9127f4d88ab06bf2cf3693c8dbbf79051b341fbf561f0ba746b26a9670d65d0b9130e77bf4c12cc4d2f89d75286e03292c84bd396147a1c639ddc32daab3
+	sha512sums_aarch64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
+	sha512sums_aarch64 = 7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f
 	sha512sums_aarch64 = 6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35
-	sha512sums_aarch64 = afb4a230b3e87cfb71687b3fe375c78463e02a6f7b1daa15bf6127f6414c6c29bf2d8df372b59b4df7f90fc8929582e8aab4e3db5e8b54b1817c96aad00d92ea
+	sha512sums_aarch64 = 9e5c064938029332e5a72d0c214e62dd8cfe11ad304ecbbc8ea6dda8f85536f13b8b42b9a1798d084f6846302fe4df5e197ecc9efeff6e186d6bffe333760706
 
 pkgname = librewolf-nightly
 
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
index 5eeb011a3406..9fd7a120f39d 100644
--- a/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -1,18 +1,6 @@
-From 83f234464554c7f4393cd1dbdeb3a68d3ae0ccae Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 25 Mar 2019 20:30:11 +0100
-Subject: [PATCH] Use remoting name for GDK application names
-
----
- toolkit/xre/nsAppRunner.cpp | 6 +-----
- widget/gtk/nsAppShell.cpp   | 7 +++----
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 984b998133bd..b6c9f013940c 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -4285,11 +4285,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
@@ -25,10 +13,9 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
  
    // Initialize GTK here for splash.
  
-diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 0daa78fdbbad..49038d0bb1c8 100644
 --- a/widget/gtk/nsAppShell.cpp
 +++ b/widget/gtk/nsAppShell.cpp
+@@ -24,6 +24,7 @@
  #  include "WakeLockListener.h"
  #endif
  #include "gfxPlatform.h"
@@ -36,18 +23,20 @@ index 0daa78fdbbad..49038d0bb1c8 100644
  #include "ScreenHelperGTK.h"
  #include "HeadlessScreenHelper.h"
  #include "mozilla/widget/ScreenManager.h"
- nsresult nsAppShell::Init() {
-     // option when program uses gdk_set_program_class().
-     //
-     // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
--    nsAutoString brandName;
--    mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
--    if (!brandName.IsEmpty()) {
--      gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
-+    if (gAppData) {
-+      gdk_set_program_class(gAppData->remotingName);
+@@ -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);
+       }
      }
    }
- 
--- 
-2.24.0
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 246e8a77685f..a834fed30f32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -34,18 +34,18 @@ _linux_commit=e123b80f7df1ad9043435f345c426717ca323579
 _repo=https://hg.mozilla.org/mozilla-unified
 source_x86_64=("hg+$_repo#revision=autoland"
                $pkgname.desktop
-               "git+https://gitlab.com/librewolf-community/browser/common.git"
+               "git+https://gitlab.com/vnepogodin/librewolf-common.git"
                "git+https://gitlab.com/vnepogodin/librewolf-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/librewolf-community/browser/common.git"
+                "git+https://gitlab.com/vnepogodin/librewolf-common.git"
                 "git+https://gitlab.com/vnepogodin/librewolf-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"
+                remove_addons.patch
+                context-menu.patch
+                arm.patch
                 build-arm-libopus.patch
                 0001-Use-remoting-name-for-GDK-application-names.patch)
 
@@ -53,18 +53,18 @@ sha512sums_x86_64=('SKIP'
                    '7fdfc23fbf637ef036f51b439e56a84fd12d7f50a894b7318d287da1584ed8be1958c1e403735e9edab8888699f3a68df5c69854d4b87187af1c76734644e44e'
                    'SKIP'
                    'SKIP'
-                   '8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921'
-                   'a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061'
-                   'afb4a230b3e87cfb71687b3fe375c78463e02a6f7b1daa15bf6127f6414c6c29bf2d8df372b59b4df7f90fc8929582e8aab4e3db5e8b54b1817c96aad00d92ea')
+                   '667d9127f4d88ab06bf2cf3693c8dbbf79051b341fbf561f0ba746b26a9670d65d0b9130e77bf4c12cc4d2f89d75286e03292c84bd396147a1c639ddc32daab3'
+                   'bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3'
+                   '9e5c064938029332e5a72d0c214e62dd8cfe11ad304ecbbc8ea6dda8f85536f13b8b42b9a1798d084f6846302fe4df5e197ecc9efeff6e186d6bffe333760706')
 sha512sums_aarch64=('SKIP'
                     '7fdfc23fbf637ef036f51b439e56a84fd12d7f50a894b7318d287da1584ed8be1958c1e403735e9edab8888699f3a68df5c69854d4b87187af1c76734644e44e'
                     'SKIP'
                     'SKIP'
-                    '8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921'
-                    'a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061'
-                    '179d922764a959c3eccd1ff98e16c629516d04c9a3a8fe6d199f8de88ad7163a026e4415836728a01a89703f1f31247addcead2da2b341b1849e4627a742c5b9'
+                    '667d9127f4d88ab06bf2cf3693c8dbbf79051b341fbf561f0ba746b26a9670d65d0b9130e77bf4c12cc4d2f89d75286e03292c84bd396147a1c639ddc32daab3'
+                    'bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3'
+                    '7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f'
                     '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35'
-                    'afb4a230b3e87cfb71687b3fe375c78463e02a6f7b1daa15bf6127f6414c6c29bf2d8df372b59b4df7f90fc8929582e8aab4e3db5e8b54b1817c96aad00d92ea')
+                    '9e5c064938029332e5a72d0c214e62dd8cfe11ad304ecbbc8ea6dda8f85536f13b8b42b9a1798d084f6846302fe4df5e197ecc9efeff6e186d6bffe333760706')
 
 pkgver() {
   cd mozilla-unified
@@ -175,7 +175,6 @@ fi
 
   # To enable global menubar
   # Set these to true
-  # browser.proton.enabled
   # browser.proton.appmenu.enabled
 
   # Disabling Pocket
diff --git a/arm.patch b/arm.patch
new file mode 100644
index 000000000000..f5181134d45c
--- /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 000000000000..920d6d5c0b04
--- /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 @@
+       <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();"/>
+@@ -224,9 +221,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);"/>
+       <menuseparator id="context-sep-sendpagetodevice" class="sync-ui-item"
+                      hidden="true"/>
+       <menu id="context-sendpagetodevice"
diff --git a/remove_addons.patch b/remove_addons.patch
new file mode 100644
index 000000000000..3d7cf06b1fc7
--- /dev/null
+++ b/remove_addons.patch
@@ -0,0 +1,73 @@
+diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
+index 0eb3c53e76..ed7c31d725 100644
+--- a/browser/extensions/moz.build
++++ b/browser/extensions/moz.build
+@@ -4,4 +4,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-DIRS += ["doh-rollout", "formautofill", "screenshots", "webcompat", "report-site-issue"]
++DIRS += [
++    "formautofill",
++    "screenshots",
++    "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 b9b18fe..af7c583 100644
+--- a/browser/locales/l10n.toml
++++ b/browser/locales/l10n.toml
+@@ -133,10 +133,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/**"