From 915d2febc1e3fc8db65c8f671240deba512a81d8 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 13 Nov 2021 23:53:29 -0800 Subject: Updated to 91.3.0 --- ...e-remoting-name-for-GDK-application-names.patch | 20 ++- PKGBUILD | 150 +++++++++++++++------ arc4_remove-health-reporting.patch | 20 +-- arc4_remove-system-addons.patch | 4 +- mozconfig.in | 76 ----------- mozconfig.in.clang | 35 ++--- mozconfig.in.clang.pgo | 72 ---------- 7 files changed, 150 insertions(+), 227 deletions(-) delete mode 100644 mozconfig.in delete mode 100644 mozconfig.in.clang.pgo diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch index 73ae042..17e0e2c 100644 --- a/0001-Use-remoting-name-for-GDK-application-names.patch +++ b/0001-Use-remoting-name-for-GDK-application-names.patch @@ -1,18 +1,18 @@ -From 5025aab61517c8608b555ba929c61eb0706bd6bd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" 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 | 11 ++++------- - 2 files changed, 5 insertions(+), 12 deletions(-) + 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 da8289200e72..452195b146f3 100644 +index d3bb8096ad02e..95ccce28fa786 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3785,11 +3785,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -4262,11 +4262,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // consistently. // Set program name to the one defined in application.ini. @@ -26,18 +26,19 @@ index da8289200e72..452195b146f3 100644 // Initialize GTK here for splash. diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp -index 163a93e2d1a4..4b6d45217671 100644 +index 60de473de07ab..004c066575c17 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp -@@ -24,6 +24,7 @@ +@@ -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" -@@ -175,13 +176,9 @@ nsresult nsAppShell::Init() { +@@ -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 @@ -54,6 +55,3 @@ index 163a93e2d1a4..4b6d45217671 100644 } } } --- -2.26.1 - diff --git a/PKGBUILD b/PKGBUILD index f85f244..77aa819 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,23 +15,23 @@ # Arch version enables debug symbols # Arch version lacks privacy and security by default -_modclang=0 -#_modclang=1 # FIXME +_modclang=1 +_modpgo=0 _pkgname=firefox pkgname=${_pkgname}-esr -pkgver=78.15.0 +pkgver=91.3.0 _pkgver=${pkgver}esr pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64 aarch64) license=(MPL GPL LGPL) url="https://www.mozilla.org/firefox/" -depends=(gtk2 gtk3 libxt mime-types dbus-glib ffmpeg ttf-font libpulse alsa-lib +depends=(gtk3 libxt mime-types dbus-glib ffmpeg ttf-font libpulse alsa-lib bzip2 libffi icu libjpeg-turbo libevent libvpx nspr nss pixman libpng sqlite libwebp zlib) makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack nodejs cbindgen nasm - python-setuptools python-psutil python-zstandard lld) + python-setuptools python-psutil python-zstandard lld dump_syms) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'alsa-utils: ALSA support' @@ -39,6 +39,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'pulseaudio: PulseAudio support' 'speech-dispatcher: Text-to-Speech' 'hunspell-en_CA: Spell checking, Canadian English' + 'xdg-desktop-portal: Screensharing with Wayland' 'firefox-preferences: Custom vendor.js with security by default' 'firefox-preferences-basic: Custom vendor.js with less breaking changes') options=(!emptydirs !makeflags) @@ -48,47 +49,74 @@ source=( "https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pkgname-$_pkgver.source.tar.xz"{,.asc} 0001-Use-remoting-name-for-GDK-application-names.patch $pkgname.desktop + identity-icons-brand.svg distribution.ini - mozconfig.in + #mozconfig.in.gcc mozconfig.in.clang - mozconfig.in.clang.pgo mozconfig.common.override - arc4_enable-pgo-for-gcc.patch + #arc4_enable-lto-for-gcc.patch + #firefox-gcc-build.patch + #arc4_enable-pgo-for-gcc.patch + pgo.patch arc4_remove-health-reporting.patch arc4_remove-system-addons.patch ) -b2sums=('dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316' +b2sums=('316ac4c7e673eb1db88da9e7c1ea7eea6c3f6b6ca4d4066100c165512e52374c84f637aed1fd5037b126ce2cf51945a5a6276a4974f557ed1da7ffe1674135f2' 'SKIP' - 'e4cf5d0ddd2c7271f1723b5c313f0aa8a7bf2242fb301ceba1ab5a4dca655ca7b9461d0aaebe5eaccf84b2f7a4c4199cbb0c18eab2bdaff273fcb730ec27219e' + 'cfd09442eb344fb80b2233da86a101082926b9942849d988d0e43cac4cb6c15690dc8eae42514e114260b712c206cacd81f773e401cf8f861ee4b805fb872643' '1c3af4cc5199cf7b9f3aad9ceab98b3e8a3dc0d38f50896ed2f32ac648f1e904a1cdda5da559964885989edbfab4c4bf65448e9a0f71d946c77ec0ab5a6aff4c' + '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535' - '157b457814a0ca7e2bb0405efdbc7ddb00c8b28e994483f48be3bc69f35aa51030496f774d32179a9fcad04a94712cf40449cc5e2584ccdbe769ba2553b43f80' - '471d01a9d0914d8c1b62cd5ebe5c6ee319a28f3bc629b415bb39edaa280383919e09967ecaa3fdeab7bbce12ccba4e0440bf18474f538addc528672cee618e3a' - 'bd967166ec95f134114d26de85559c8e4a0d18a40ea63d1fc045897198274ed6e523bb320632395e9b5277eb122c49e41d989413a3a019f8a868f7ab7743dc0d' + '645e9438585624c5ae20cd5fd8e59c912734ea6e5bbfb33ddeb226f3b88e1b443c334684b0445b748f6cbe64506acf8710f265b87efa6bfc2f0aa5623680aed0' '1c7ac58af8b817067c7d79ffef8d9100f513d77f4fc1a2bce2684ff8d8d3cbc3d37b31865c7e5d873fd71d4649374bbd25ca08166d8afb25ffbd597759655063' - '087ea758132905cab848e3a13a13537b42f70ba3a8bfd1ef4e2933d3e874e94038b50ee583b9e7e0c7b7cc7c2cf570f7f613b661f47121b7bf207f433b939f3d' - '020695637162ce981929f54ea556100bf17e92931179a5849ca8265dfc0016f1b6599d9f77e9f71f192a1a4bb3b2d1eadbf5d5554e6c33bfa3f9388b0a3c7c6e' - '635a84c64ea9dccf41fbde33b58a72a8123ecd841995ad045bd329e23855f56ffce05670fe2d69a12c4cef7a7399bc6becfc5f40bfd8cea9a4006074672a634d') + '87dd810443be6acf41dad2cbdf8b14ba6ae68d55364e80560e96200e1acb866858068234088bae261c26e65e171b49d4f530ee4098f41e5c8cf855d1f2fe0e12' + '1dce1277c0c8b83089551057ed61c8794aa65242d0c19573dab96081f00b1042af73fbc0a40ba49dfa31eff46f4636ffd985cf8e6bd28db614a639ca6c11c74e' + '379adf3726664668f6167eaeab35dec40342d9288ff081d22a8363f163ab0945b17ce69e7d4276a31e99e56f690afa070c410c51a5060ed835356fd216256e7b') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases prepare() { -# mkdir mozbuild + 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 - if [ "${_modclang}" != "1" ]; then + + if [ "${_modclang}" == "0" ]; then + # Apply gcc lto patches + patch -Np1 -i ../arc4_enable-lto-for-gcc.patch + patch -Np1 -i ../firefox-gcc-build.patch + fi + + if [ "${_modclang}" == "0" ] && [ "${_modpgo}" == "1" ]; then # Apply gcc pgo patches - patch -p0 $srcdir/${_pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/arc4_enable-pgo-for-gcc.patch + patch -Np1 -i ../arc4_enable-pgo-for-gcc.patch + patch -Np1 -i ../pgo.patch fi - if [ "${_modclang}" == "1" ]; then - # Add the custom mozconfig for pgo - cp $srcdir/mozconfig.in.clang.pgo $srcdir/${_pkgname}-${pkgver}/.mozconfig + if [ "${_modclang}" == "1" ] && [ "${_modpgo}" == "1" ]; then + # Add the custom mozconfig for clang pgo + cp $srcdir/mozconfig.in.clang $srcdir/${_pkgname}-${pkgver}/.mozconfig + cat >$srcdir/${_pkgname}-${pkgver}/.mozconfig - <$srcdir/${_pkgname}-${pkgver}/.mozconfig - <$srcdir/${_pkgname}-${pkgver}/.mozconfig - <.mozconfig - <$srcdir/${_pkgname}-${pkgver}/.mozconfig - <.mozconfig - <