This commit is contained in:
Joan Figueras 2022-09-10 01:20:18 +02:00
parent 64ea461ef9
commit e512cdec5c
3 changed files with 26 additions and 72 deletions

View file

@ -1,6 +1,6 @@
pkgbase = icecat
pkgdesc = GNU version of the Firefox browser.
pkgver = 91.12.0
pkgver = 102.2.0
pkgrel = 1
url = http://www.gnu.org/software/gnuzilla/
arch = x86_64
@ -34,6 +34,10 @@ pkgbase = icecat
makedepends = git
makedepends = lld
makedepends = perl-rename
makedepends = wasi-compiler-rt
makedepends = wasi-libc
makedepends = wasi-libc++
makedepends = wasi-libc++abi
depends = gtk3
depends = libxt
depends = mime-types
@ -51,15 +55,17 @@ pkgbase = icecat
options = !emptydirs
options = !makeflags
options = !strip
source = https://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-298024d727053a1609df4003fb4438836d5181f4.tar.gz
source = https://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-e77a1fa25ac66250e88d5d9901a2ba670edb94cc.tar.gz
source = icecat.desktop
source = icecat-safe.desktop
source = 0001-Use-remoting-name-for-GDK-application-names.patch::https://raw.githubusercontent.com/archlinux/svntogit-packages/0adcedc05ce67d53268575f8801c8de872206901/firefox/trunk/0001-Use-remoting-name-for-GDK-application-names.patch
source = https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch
sha256sums = 599774c0ca1d2265c4788d0dd4beb95547cca12997f08b6c487d36cc97091331
source = arc4random.patch::https://hg.mozilla.org/mozilla-central/raw-rev/970ebbe54477
source = arc4random_buf.patch::https://hg.mozilla.org/mozilla-central/raw-rev/a61813bd9f0a
sha256sums = ef38a884f063eda441b9d43c3515622d558c58e3a0148030ad1823e5dea871bd
sha256sums = e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d
sha256sums = 33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208
sha256sums = bb9769a8fe720abea2bba5b895c70c4fba0d44bb553399d83350268edf85cdeb
sha256sums = d3ea2503dff0a602bb058153533ebccd8232e8aac1dc82437a55d724b8d22bc2
sha256sums = 68fc08b5ee1cfd45bd72d484fe299688b09e5f7ba8e27445fd27ba71d792538c
sha256sums = 6a8799d135761a405eb8c9be03c20287fe616bb0a101b898ad08bdb26c3d6447
pkgname = icecat

View file

@ -1,57 +0,0 @@
From 0000000000000000000000000000000000000000 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 | 12 +++++-------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index bb14d84338334..f5c0222987fb0 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4299,11 +4299,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 60de473de07ab..004c066575c17 100644
--- a/widget/gtk/nsAppShell.cpp
+++ b/widget/gtk/nsAppShell.cpp
@@ -24,6 +24,8 @@
# include "WakeLockListener.h"
#endif
#include "gfxPlatform.h"
+#include "nsAppRunner.h"
+#include "mozilla/XREAppData.h"
#include "ScreenHelperGTK.h"
#include "HeadlessScreenHelper.h"
#include "mozilla/widget/ScreenManager.h"
@@ -152,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);
}
}
}

View file

@ -5,9 +5,9 @@
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
pkgname=icecat
pkgver=91.12.0
pkgver=102.2.0
pkgrel=1
_commit=298024d727053a1609df4003fb4438836d5181f4
_commit=e77a1fa25ac66250e88d5d9901a2ba670edb94cc
pkgdesc="GNU version of the Firefox browser."
arch=(x86_64)
url="http://www.gnu.org/software/gnuzilla/"
@ -15,7 +15,8 @@ license=('GPL' 'MPL' 'LGPL')
depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
makedepends=(m4 unzip zip diffutils python-setuptools python-jsonschema yasm mesa imake inetutils
xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2
python nodejs python-psutil cbindgen nasm wget mercurial git lld perl-rename)
python nodejs python-psutil cbindgen nasm wget mercurial git lld perl-rename
wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi)
optdepends=('networkmanager: Location detection via available WiFi networks'
'libnotify: Notification integration'
'pulseaudio: Audio support'
@ -26,14 +27,16 @@ options=(!emptydirs !makeflags !strip)
source=(https://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-${_commit}.tar.gz
icecat.desktop icecat-safe.desktop
"0001-Use-remoting-name-for-GDK-application-names.patch::https://raw.githubusercontent.com/archlinux/svntogit-packages/0adcedc05ce67d53268575f8801c8de872206901/firefox/trunk/0001-Use-remoting-name-for-GDK-application-names.patch"
'https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch')
'https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch'
'arc4random.patch::https://hg.mozilla.org/mozilla-central/raw-rev/970ebbe54477'
'arc4random_buf.patch::https://hg.mozilla.org/mozilla-central/raw-rev/a61813bd9f0a')
sha256sums=('599774c0ca1d2265c4788d0dd4beb95547cca12997f08b6c487d36cc97091331'
sha256sums=('ef38a884f063eda441b9d43c3515622d558c58e3a0148030ad1823e5dea871bd'
'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d'
'33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208'
'bb9769a8fe720abea2bba5b895c70c4fba0d44bb553399d83350268edf85cdeb'
'd3ea2503dff0a602bb058153533ebccd8232e8aac1dc82437a55d724b8d22bc2')
'd3ea2503dff0a602bb058153533ebccd8232e8aac1dc82437a55d724b8d22bc2'
'68fc08b5ee1cfd45bd72d484fe299688b09e5f7ba8e27445fd27ba71d792538c'
'6a8799d135761a405eb8c9be03c20287fe616bb0a101b898ad08bdb26c3d6447')
prepare() {
cd gnuzilla-${_commit}
@ -126,8 +129,9 @@ EOF
bash makeicecat
cd output/icecat-${pkgver}
# https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
patch -Np1 -i ../../../0001-Use-remoting-name-for-GDK-application-names.patch
# https://hg.mozilla.org/mozilla-central/rev/a61813bd9f0a
patch -Np1 -i ../../../arc4random.patch
patch -Np1 -i ../../../arc4random_buf.patch
# cbindgen
patch -Np1 -i ../../../fix-ftbfs-newer-cbindgen.patch
@ -149,6 +153,7 @@ ac_add_options --enable-rust-simd
ac_add_options --enable-linker=lld
ac_add_options --disable-elf-hack
ac_add_options --disable-bootstrap
ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot
# Branding
ac_add_options --enable-official-branding