Updated to 78.0.1

8 files changed, 59 insertions, 107 deletions

diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
index 8cc3786..73ae042 100644
--- a/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -1,19 +1,18 @@
-From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001
-Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steffens@gmail.com>
+From 5025aab61517c8608b555ba929c61eb0706bd6bd 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(-)
+ toolkit/xre/nsAppRunner.cpp |  6 +-----
+ widget/gtk/nsAppShell.cpp   | 11 ++++-------
+ 2 files changed, 5 insertions(+), 12 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 0b808ef215f06..28911c0ffeaec 100644
+index da8289200e72..452195b146f3 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3728,11 +3728,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -3785,11 +3785,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
@@ -27,7 +26,7 @@ index 0b808ef215f06..28911c0ffeaec 100644
    // Initialize GTK here for splash.
  
 diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 0686ff814916b..ae4a4ea55f420 100644
+index 163a93e2d1a4..4b6d45217671 100644
 --- a/widget/gtk/nsAppShell.cpp
 +++ b/widget/gtk/nsAppShell.cpp
 @@ -24,6 +24,7 @@
@@ -38,19 +37,23 @@ index 0686ff814916b..ae4a4ea55f420 100644
  #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);
+@@ -175,13 +176,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.21.0
+2.26.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 08ffb36..53fdefd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,19 +19,18 @@ _modclang=0
 
 _pkgname=firefox
 pkgname=${_pkgname}-esr
-pkgver=68.9.0
+pkgver=78.0.1
 _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=(gtk3 mozilla-common libxt startup-notification 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 python-setuptools yasm mesa imake inetutils
-             xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 python
-             nodejs python2-psutil cbindgen nasm)
+makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
+             autoconf2.13 rust clang llvm jack gtk2 nodejs cbindgen nasm
+             python-setuptools python-psutil)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'alsa-utils: ALSA support'
@@ -46,9 +45,8 @@ conflicts=(firefox)
 provides=(firefox)
 source=(
         "https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pkgname-$_pkgver.source.tar.xz"{,.asc}
-        no-relinking.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
-        $_pkgname.desktop
+        $pkgname.desktop
         distribution.ini
         mozconfig.in
         mozconfig.in.clang
@@ -58,16 +56,15 @@ source=(
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch
         )
-b2sums=('f04f8ca1abe802edb6d37c0de5f8024d513331fd80c9b701c93de74cbafc0650b1c0f58e54a2dbe6bee0457698dc386093aab7749c9b0738bf146bfbae6bf4e2'
+b2sums=('acd30b135e7a82a2af4f5426b71cb245e97c6182227e036508c9782ba406929d556cec061b74bf8069a559c9c19cc2fd0350397e2a6eed25f6f25f0638b424b1'
         'SKIP'
-        '30e0eb38e6e5b25c47475ff45c908acbaa14ba6e0a29891767b4ea07bf707ac19f63a3f31e399b155749bd3102d1cfa0a5b8146032a476ede388f05b2eaffbda'
-        '08c821bece2e71483668eedc0ab3211b1fa5057b7b99fdc9104a1dbab4707d74463f3cbcdce353a1ec4777e479b3ac27a585dd35115339fccb81c83bc0ef763b'
-        '51d7eb22cb568f0437ece2433091d8b54012324edd2fe52ec52cc00f1ad0d4bd84a4d549d78b4d77bbd6ae1c1e7d029d9d4dbff61c60f714362ef791f09fba8b'
+        'e4cf5d0ddd2c7271f1723b5c313f0aa8a7bf2242fb301ceba1ab5a4dca655ca7b9461d0aaebe5eaccf84b2f7a4c4199cbb0c18eab2bdaff273fcb730ec27219e'
+        '7eae0abdb737744a01f1d575966b69e0f7235c803f90e21b165dbfe00c7f28ea35dd3d6bd2c341d0e2324ed7f7545f22b461e3d3f54b886ae9eb10939e77d740'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
-        '9c51f5a5207a13791f7b1ff98f12b1c72b1dd7b50bc2152396ebecb0458ebcaefc0677fa9ab8f14582a3b6639d5a4141816a0148344d8012d541a105b89dc8f4'
-        '056a9f859e1ebea8b10d9e2b9a520bc6585e6543c4b238d91e80ddb8613f98a47a6b659023cab31a29caa3f9880a11577c489e553c746b9de900910153ac17da'
-        '7eed022ab6b9325c5a918e9700ba25bcb9aa51c8612a282611f641032b5d8a6db5d4b59ecd3382d2ef31f6bc62832650784d7be49264cff291e4424ad04d4235'
-        '2579551298fc7670f4c8a3e3c496e2c92c39614d0960e87c30fa7cf581cd4ebc9d30d86ef69dd000294bafe618fa2087fbd9fd772d9ce2b1613ed8e540469206'
+        '52a5c7a483a1d235e3d1d9b513d731860f6806b2f66b423de70b5f6af3a11805a9b600c4e4e70eabf259b5bd50915aa47605bdb7e6a4fa92712f76e3c877f25b'
+        'fdcf242a18b9d152e72f1e540cbd5bd51d9e472d1fafe695c7fa36cc9bc3b718e0df413ae4abe0c20787317b9ec16eab3d53664fa08b58ca6fc9f63db8f4e051'
+        '17f7f1b9c87eb97b1a6d18c2c4d85b06a3040274eecfea81f140d68a273938be681c7e647fd5a6857965bfa0e279fc3844ba1a87c5bfd3dffb9f854cd5a01129'
+        '1e8cdc2968a78fa395b77b654496dbbf21d37308a7fd560ab5cff8dc092d9b5123c374af8a5a18dec7fd2a053f411a1478ebfd928365208d22042391da444b4b'
         '087ea758132905cab848e3a13a13537b42f70ba3a8bfd1ef4e2933d3e874e94038b50ee583b9e7e0c7b7cc7c2cf570f7f613b661f47121b7bf207f433b939f3d'
         '4c0f100c52721f9d9a840d7de1f1d5310578ef7fbc350c62341d96b2af23d8bcb774a289429693153635964860cbb05074149bf043941dec87a1d86655b4d4b6'
         '635a84c64ea9dccf41fbde33b58a72a8123ecd841995ad045bd329e23855f56ffce05670fe2d69a12c4cef7a7399bc6becfc5f40bfd8cea9a4006074672a634d')
@@ -77,9 +74,6 @@ prepare() {
 #   mkdir mozbuild
   cd ${_pkgname}-${pkgver}
 
-  # Avoid relinking during buildsymbols
-  patch -Np1 -i ../no-relinking.patch
-
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
@@ -112,7 +106,7 @@ prepare() {
 
 
   # Hide mobile promo
-  echo ".fxaMobilePromo {  display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css
+#  echo ".fxaMobilePromo {  display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css
   # Hide plugindeprecation-notice
   echo "#plugindeprecation-notice {  display: none !important; }" >> toolkit/mozapps/extensions/content/extensions.css
   # Hide warnings on unsigned extensions
@@ -211,8 +205,8 @@ package() {
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$_pkgname-symbolic.svg"
 
   # install desktop file
-  install -Dvm644 ../$_pkgname.desktop \
-    "$pkgdir/usr/share/applications/$_pkgname.desktop"
+  install -Dvm644 ../$pkgname.desktop \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
 
    # Use system certificates
   local nssckbi="$pkgdir/usr/lib/$pkgname/libnssckbi.so"
diff --git a/firefox.desktop b/firefox-esr.desktop
index da9c3a8..12734c8 100644
--- a/firefox.desktop
+++ b/firefox-esr.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=Firefox
+Name=Firefox ESR
 GenericName=Web Browser
 GenericName[ar]=متصفح ويب
 GenericName[ast]=Restolador Web
@@ -112,7 +112,7 @@ Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;п�
 Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web
 Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;Firefox;ff;互联网;网站;
 Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;火狐
-Exec=/usr/lib/firefox/firefox %u
+Exec=firefox %u
 Icon=firefox
 Terminal=false
 X-MultipleArgs=false
diff --git a/mozconfig.common.override b/mozconfig.common.override
index 6e05ceb..4ee9fe5 100644
--- a/mozconfig.common.override
+++ b/mozconfig.common.override
@@ -1,3 +1,4 @@
 export MOZ_TELEMETRY_REPORTING=0
 export MOZ_DATA_REPORTING=0
-export ACCESSIBILITY=0 
+# accessibility required for ff71+
+#export ACCESSIBILITY=0
diff --git a/mozconfig.in b/mozconfig.in
index 6fff2ee..852faf8 100644
--- a/mozconfig.in
+++ b/mozconfig.in
@@ -1,5 +1,5 @@
 ac_add_options --enable-application=browser
-export MOZ_APP_REMOTINGNAME=firefox
+export MOZ_APP_REMOTINGNAME=${pkgname//-/}
 
 # Compiler and Linker
 ac_add_options --prefix=/usr
@@ -24,13 +24,13 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.artixlinux
 ac_add_options --with-unsigned-addon-scopes=app,system
-#ac_add_options --allow-addon-sideload
+ac_add_options --allow-addon-sideload
 export MOZILLA_OFFICIAL=1
 export MOZ_REQUIRE_SIGNING=0
 export MOZ_ADDON_SIGNING=0
 
 # System libraries
-ac_add_options --with-system-bz2
+#ac_add_options --with-system-bz2
 ac_add_options --with-system-ffi
 ac_add_options --with-system-icu
 ac_add_options --with-system-jpeg
@@ -40,7 +40,7 @@ ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --enable-system-pixman
 ac_add_options --with-system-png
-ac_add_options --enable-system-sqlite
+#ac_add_options --enable-system-sqlite
 ac_add_options --with-system-webp
 ac_add_options --with-system-zlib
 
@@ -48,16 +48,15 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-alsa
 ac_add_options --enable-av1
 ac_add_options --enable-jack
-ac_add_options --enable-startup-notification
 
 # Disables
-ac_add_options --disable-accessibility
+# accessibility required for ff71+
+#ac_add_options --disable-accessibility
 ac_add_options --disable-cdp
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
 ac_add_options --disable-eme
-ac_add_options --disable-gconf
 # # marionette required for the xorg tests
 # ac_add_options --disable-marionette
 ac_add_options --disable-necko-wifi
diff --git a/mozconfig.in.clang b/mozconfig.in.clang
index a4263fb..c7f1743 100644
--- a/mozconfig.in.clang
+++ b/mozconfig.in.clang
@@ -1,5 +1,5 @@
 ac_add_options --enable-application=browser
-export MOZ_APP_REMOTINGNAME=firefox
+export MOZ_APP_REMOTINGNAME=${pkgname//-/}
 
 # Compiler and Linker
 ac_add_options --prefix=/usr
@@ -8,7 +8,7 @@ ac_add_options --enable-optimize
 ac_add_options --disable-hardening
 ac_add_options --enable-rust-simd
 #ac_add_options --enable-linker=gold
-ac_add_options --disable-elf-hack
+#ac_add_options --disable-elf-hack
 #ac_add_options --enable-strip
 #ac_add_options --enable-install-strip
 export CC='clang --target=x86_64-unknown-linux-gnu'
@@ -22,10 +22,10 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.artixlinux
 ac_add_options --with-unsigned-addon-scopes=app,system
-#ac_add_options --allow-addon-sideload
+ac_add_options --allow-addon-sideload
 
 # System libraries
-ac_add_options --with-system-bz2
+#ac_add_options --with-system-bz2
 ac_add_options --with-system-ffi
 ac_add_options --with-system-icu
 ac_add_options --with-system-jpeg
@@ -35,7 +35,7 @@ ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --enable-system-pixman
 ac_add_options --with-system-png
-ac_add_options --enable-system-sqlite
+#ac_add_options --enable-system-sqlite
 ac_add_options --with-system-webp
 ac_add_options --with-system-zlib
 
@@ -43,7 +43,6 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-alsa
 ac_add_options --enable-av1
 ac_add_options --enable-jack
-ac_add_options --enable-startup-notification
 
 # Disables
 ac_add_options --disable-accessibility
@@ -52,7 +51,6 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
 ac_add_options --disable-eme
-ac_add_options --disable-gconf
 # # marionette required for the xorg tests
 # ac_add_options --disable-marionette
 ac_add_options --disable-necko-wifi
diff --git a/mozconfig.in.clang.pgo b/mozconfig.in.clang.pgo
index a1c2ac5..a3f47d8 100644
--- a/mozconfig.in.clang.pgo
+++ b/mozconfig.in.clang.pgo
@@ -1,5 +1,5 @@
 ac_add_options --enable-application=browser
-export MOZ_APP_REMOTINGNAME=firefox
+export MOZ_APP_REMOTINGNAME=${pkgname//-/}
 
 # Compiler and Linker
 ac_add_options --prefix=/usr
@@ -8,7 +8,7 @@ ac_add_options --enable-optimize
 ac_add_options --disable-hardening
 ac_add_options --enable-rust-simd
 #ac_add_options --enable-linker=gold
-ac_add_options --disable-elf-hack
+#ac_add_options --disable-elf-hack
 #ac_add_options --enable-strip
 #ac_add_options --enable-install-strip
 export CC='clang --target=x86_64-unknown-linux-gnu'
@@ -22,10 +22,10 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.artixlinux
 ac_add_options --with-unsigned-addon-scopes=app,system
-#ac_add_options --allow-addon-sideload
+ac_add_options --allow-addon-sideload
 
 # System libraries
-ac_add_options --with-system-bz2
+#ac_add_options --with-system-bz2
 ac_add_options --with-system-ffi
 ac_add_options --with-system-icu
 ac_add_options --with-system-jpeg
@@ -35,7 +35,7 @@ ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --enable-system-pixman
 ac_add_options --with-system-png
-ac_add_options --enable-system-sqlite
+#ac_add_options --enable-system-sqlite
 ac_add_options --with-system-webp
 ac_add_options --with-system-zlib
 
@@ -43,7 +43,6 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-alsa
 ac_add_options --enable-av1
 ac_add_options --enable-jack
-ac_add_options --enable-startup-notification
 
 # Disables
 ac_add_options --disable-accessibility
@@ -52,7 +51,6 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
 ac_add_options --disable-eme
-ac_add_options --disable-gconf
 # # marionette required for the xorg tests
 # ac_add_options --disable-marionette
 ac_add_options --disable-necko-wifi
diff --git a/no-relinking.patch b/no-relinking.patch
deleted file mode 100644
index 6dd9884..0000000
--- a/no-relinking.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-
-# HG changeset patch
-# User Mike Shal <mshal@mozilla.com>
-# Date 1570127498 25200
-# Node ID b8bc2504f108d8a2216ee11405cbbe4cf7a0eaec
-# Parent  9a4d6aacc48080f019024c02ac7da1fd576b39fe
-Bug XYZ - Only force re-linking on 1-tier PGO builds; r?#firefox-build-system-reviewers
-
-
-diff --git a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -465,25 +465,27 @@ ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
- 	$(foreach pgd,$(wildcard *.pgd),pgomgr -clear $(pgd);)
- else
- ifdef GNU_CC
- 	-$(RM) *.gcda
- endif
- endif
- endif
- 
-+ifdef MOZ_1TIER_PGO
- ifneq (,$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
- ifneq (,$(filter target,$(MAKECMDGOALS)))
- ifdef GNU_CC
- # Force rebuilding libraries and programs in both passes because each
- # pass uses different object files.
- $(PROGRAM) $(SHARED_LIBRARY) $(LIBRARY): FORCE
- endif
- endif
- endif
-+endif
- 
- endif # NO_PROFILE_GUIDED_OPTIMIZE
- 
- ##############################################
- 
- clean clobber realclean clobber_all::
- 	-$(RM) $(ALL_TRASH)
- 	-$(RM) -r $(ALL_TRASH_DIRS)
-