Hotfix for gnome on xorg

3 files changed, 63 insertions, 2 deletions

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..8cc3786
--- /dev/null
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -0,0 +1,56 @@
+From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001
+Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steffens@gmail.com>
+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 0b808ef215f06..28911c0ffeaec 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3728,11 +3728,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.
+ 
+diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
+index 0686ff814916b..ae4a4ea55f420 100644
+--- 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"
+@@ -171,10 +172,8 @@ 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.21.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 42b129f..42a21df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
 
 pkgname=firefox
 pkgver=68.0.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -37,6 +37,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags)
 source=("https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc}
         $pkgname.desktop $pkgname-symbolic.svg
+        0001-Use-remoting-name-for-GDK-application-names.patch
         pgo-1.patch
         moz.configure.diff
         package-manifest.diff)
@@ -44,6 +45,7 @@ sha256sums=('6037f77bdab29d79ca5e3fbd1d32f6c209e09d2066189a13dc7f7491227f5568'
             'SKIP'
             '54dcf5e1b91db3f586a7e27814552f96578b9d9495b7b10b268e36f64b49d4d1'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
+            'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
             'a8c15c9d54ef8b360c0932f4ccf5e74954f14e9a9c2a1ae924b6c392075b2b8c'
             'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e'
             '927e400d6920b98d2fe7db2b6498f195135909a76e0da49441223956364d8227')
@@ -53,6 +55,9 @@ prepare() {
 #   mkdir mozbuild
   cd ${pkgname}-${pkgver}
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
+  patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
+
   # Apply pgo patches
   patch -p0 $srcdir/${pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/pgo-1.patch
 
diff --git a/makepkg.conf.firefox b/makepkg.conf.firefox
index 70ce388..b109d28 100644
--- a/makepkg.conf.firefox
+++ b/makepkg.conf.firefox
@@ -41,7 +41,7 @@ CPPFLAGS="-D_FORTIFY_SOURCE"
 # # cargo contained in firefox 68 breaks if -flto is set here
 CFLAGS="-march=x86-64 -mtune=generic -O3 -pipe -fno-plt -fstack-protector-strong -fstack-clash-protection -Wno-error=odr -Wno-error=stringop-overflow -Walloc-size-larger-than=$(getconf ULONG_MAX)"
 CXXFLAGS="-march=x86-64 -mtune=generic -O3 -pipe -fno-plt -fstack-protector-strong -fstack-clash-protection -Wno-error=odr -Wno-error=stringop-overflow -Walloc-size-larger-than=$(getconf ULONG_MAX)"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now,-fuse-ld=gold"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j4"
 #-- Debugging flags