fix newtab page

3 files changed, 72 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65a0e3b6eeda..3d25f88bbd34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -64,23 +64,26 @@ pkgbase = librewolf-nightly
 	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/librewolf-community/settings.git#commit=c5c75a39dd91a8772255a78493853be6553262b2
+	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 = 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
 	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/librewolf-community/settings.git#commit=c5c75a39dd91a8772255a78493853be6553262b2
+	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 = build-arm-libopus.patch
+	source_aarch64 = 0001-Use-remoting-name-for-GDK-application-names.patch
 	sha512sums_aarch64 = SKIP
 	sha512sums_aarch64 = 7fdfc23fbf637ef036f51b439e56a84fd12d7f50a894b7318d287da1584ed8be1958c1e403735e9edab8888699f3a68df5c69854d4b87187af1c76734644e44e
 	sha512sums_aarch64 = SKIP
@@ -89,6 +92,7 @@ pkgbase = librewolf-nightly
 	sha512sums_aarch64 = a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061
 	sha512sums_aarch64 = 179d922764a959c3eccd1ff98e16c629516d04c9a3a8fe6d199f8de88ad7163a026e4415836728a01a89703f1f31247addcead2da2b341b1849e4627a742c5b9
 	sha512sums_aarch64 = 6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35
+	sha512sums_aarch64 = afb4a230b3e87cfb71687b3fe375c78463e02a6f7b1daa15bf6127f6414c6c29bf2d8df372b59b4df7f90fc8929582e8aab4e3db5e8b54b1817c96aad00d92ea
 
 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
new file mode 100644
index 000000000000..5eeb011a3406
--- /dev/null
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -0,0 +1,53 @@
+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) {
+   // 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.
+ 
+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
+ #  include "WakeLockListener.h"
+ #endif
+ #include "gfxPlatform.h"
++#include "nsAppRunner.h"
+ #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);
+     }
+   }
+ 
+-- 
+2.24.0
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index af682b7f05ed..167a015ec548 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,31 +31,33 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'plasma5-applets-window-appmenu: appmenu for plasma only')
 options=(!emptydirs !makeflags !strip)
 _linux_commit=e123b80f7df1ad9043435f345c426717ca323579
-_settings_commit=c5c75a39dd91a8772255a78493853be6553262b2
 _repo=https://hg.mozilla.org/mozilla-unified
 conflicts=('librewolf')
 provides=('librewolf')
 source_x86_64=("hg+$_repo#revision=autoland"
                $pkgname.desktop
                "git+https://gitlab.com/librewolf-community/browser/common.git"
-               "git+https://gitlab.com/librewolf-community/settings.git#commit=${_settings_commit}"
+               "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")
+               "context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/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/librewolf-community/settings.git#commit=${_settings_commit}"
+                "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"
-                build-arm-libopus.patch)
+                build-arm-libopus.patch
+                0001-Use-remoting-name-for-GDK-application-names.patch)
 
 sha512sums_x86_64=('SKIP'
                    '7fdfc23fbf637ef036f51b439e56a84fd12d7f50a894b7318d287da1584ed8be1958c1e403735e9edab8888699f3a68df5c69854d4b87187af1c76734644e44e'
                    'SKIP'
                    'SKIP'
                    '8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921'
-                   'a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061')
+                   'a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061'
+                   'afb4a230b3e87cfb71687b3fe375c78463e02a6f7b1daa15bf6127f6414c6c29bf2d8df372b59b4df7f90fc8929582e8aab4e3db5e8b54b1817c96aad00d92ea')
 sha512sums_aarch64=('SKIP'
                     '7fdfc23fbf637ef036f51b439e56a84fd12d7f50a894b7318d287da1584ed8be1958c1e403735e9edab8888699f3a68df5c69854d4b87187af1c76734644e44e'
                     'SKIP'
@@ -63,7 +65,8 @@ sha512sums_aarch64=('SKIP'
                     '8a8ae3276914cd8812feb99acac8c2363f5530656593bebaed5cf67defec19153c30409b6fba418162c7e7f2876554202bbcf5f356d7e785488859879161d921'
                     'a4274739be161710d90fdb674315ef4b0696ce6e092641a62f7a18c5a773de959a38fe52e0c8683821753a99e4337ea3e448579937d684e22345f7d936161061'
                     '179d922764a959c3eccd1ff98e16c629516d04c9a3a8fe6d199f8de88ad7163a026e4415836728a01a89703f1f31247addcead2da2b341b1849e4627a742c5b9'
-                    '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35')
+                    '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35'
+                    'afb4a230b3e87cfb71687b3fe375c78463e02a6f7b1daa15bf6127f6414c6c29bf2d8df372b59b4df7f90fc8929582e8aab4e3db5e8b54b1817c96aad00d92ea')
 
 pkgver() {
   cd mozilla-unified
@@ -166,6 +169,9 @@ 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