From 231cc830d0ff4d3e8dcde8653108d253cea3c6d4 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 24 Aug 2020 23:30:30 -0700
Subject: Updated to 80.0 Fixed telelmetry disabling hacks again

---
 PKGBUILD                           | 26 +++----------
 arc4_remove-health-reporting.patch |  6 ++-
 bug1654465.diff                    | 77 --------------------------------------
 mozconfig.common.override          |  5 ++-
 mozconfig.in                       |  5 ++-
 5 files changed, 18 insertions(+), 101 deletions(-)
 delete mode 100644 bug1654465.diff

diff --git a/PKGBUILD b/PKGBUILD
index ba55c02..00716d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _modclang=0
 #_modclang=1 # FIXME
 
 pkgname=firefox
-pkgver=79.0
+pkgver=80.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 aarch64)
@@ -43,7 +43,6 @@ conflicts=(firefox-esr)
 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
-        bug1654465.diff
         $pkgname.desktop
         distribution.ini
         mozconfig.in
@@ -54,18 +53,17 @@ source=(
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch
         )
-b2sums=('6a21cf8b0d53db067b020b969180a04233171113c0a4d64e5c3599fb2c991705e4faf7995acab578c7683f30dc074c834e36d23a84c5869ef7f015f86eebb871'
+b2sums=('3099426b27cd3c89b63be7d796c8c5a87d0ee9bd8252e5bde23ed3a61f71d611e7427ffee506224e81a88ef109eefe944f2cf3367bd636a6ed46b7351d0a4b1b'
         'SKIP'
         'e4cf5d0ddd2c7271f1723b5c313f0aa8a7bf2242fb301ceba1ab5a4dca655ca7b9461d0aaebe5eaccf84b2f7a4c4199cbb0c18eab2bdaff273fcb730ec27219e'
-        'a71968df168ba78eb46323177f5223d9d9f68325330751ff713e47c0d35e3bb366610cf0a8e3068421ea844b7fadff7a987cc93495a371aa9ba08695ee8ab262'
         'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
-        '6e351d0be6e6c82512ac0b6e1aad0111c1eeeb947d9e411733618cb531533f857d849b7759e0e5282279bdbfbdd62fa0b1e4af500ede06f20278c6c248e5816f'
+        '83eb896637669476878c45c68ce5c30da106cc60b41eb4944f39007f6b4a37e6b70e5ca0afedb7dba6e5fc765b4dc10c12960cd4e449a6c4e864e4179bbfb166'
         'aa87016dabc182a4da3db1f29f4a6b274095be883febf848ddbe86615639b6a85f12b2c78ce6b18bba18516982330fb775083f4bab330738d95ee26d70f02dfa'
         'ffb7ca117004a084b1bd7baed6a11b0914ec391459d662fc8887edc3206eb25c41b09f713e9bfe0ed474333d9537295842b0617dd29e9ce222fde548cd9111aa'
-        '1e8cdc2968a78fa395b77b654496dbbf21d37308a7fd560ab5cff8dc092d9b5123c374af8a5a18dec7fd2a053f411a1478ebfd928365208d22042391da444b4b'
+        '1c7ac58af8b817067c7d79ffef8d9100f513d77f4fc1a2bce2684ff8d8d3cbc3d37b31865c7e5d873fd71d4649374bbd25ca08166d8afb25ffbd597759655063'
         '087ea758132905cab848e3a13a13537b42f70ba3a8bfd1ef4e2933d3e874e94038b50ee583b9e7e0c7b7cc7c2cf570f7f613b661f47121b7bf207f433b939f3d'
-        '4c0f100c52721f9d9a840d7de1f1d5310578ef7fbc350c62341d96b2af23d8bcb774a289429693153635964860cbb05074149bf043941dec87a1d86655b4d4b6'
+        '020695637162ce981929f54ea556100bf17e92931179a5849ca8265dfc0016f1b6599d9f77e9f71f192a1a4bb3b2d1eadbf5d5554e6c33bfa3f9388b0a3c7c6e'
         '635a84c64ea9dccf41fbde33b58a72a8123ecd841995ad045bd329e23855f56ffce05670fe2d69a12c4cef7a7399bc6becfc5f40bfd8cea9a4006074672a634d')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353')  # Mozilla Software Releases
 
@@ -76,9 +74,6 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1654465
-  patch -Np1 -i ../bug1654465.diff
-
   if [ "${_modclang}" != "1" ]; then
     # Apply gcc pgo patches
     patch -p0 $srcdir/${pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/arc4_enable-pgo-for-gcc.patch
@@ -131,10 +126,6 @@ build() {
   # clang does not support -fstack-clash-protection, so remove it
   export CFLAGS="$(echo $CFLAGS | sed 's/ -fstack-clash-protection//' - )"
   export CXXFLAGS="$(echo $CXXFLAGS | sed 's/ -fstack-clash-protection//' - )"
-#  # -fno-plt with cross-LTO causes obscure LLVM errors
-#  # LLVM ERROR: Function Import: link error
-#  CFLAGS="${CFLAGS/-fno-plt/}"
-#  CXXFLAGS="${CXXFLAGS/-fno-plt/}"
 
   # Do 3-tier PGO
   echo "Building instrumented browser..."
@@ -162,15 +153,13 @@ build() {
   cat >.mozconfig - <<END
 ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
 ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
+mk_add_options MOZ_OBJDIR=${PWD@Q}/obj
 END
   ./mach build
   else
     echo "Building optimized browser..."
     xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" ./mach build
   fi
-
-  # echo "Building symbol archive..."
-  # ./mach buildsymbols
 }
 
 package() {
@@ -185,9 +174,6 @@ package() {
   rm "$pkgdir/usr/bin/firefox"
   ln -s "/usr/lib/$pkgname/firefox" "$pkgdir/usr/bin/firefox"
 
-  # find . -name '*crashreporter-symbols-full.zip' -exec \
-  # cp -fvt "$startdir" {} +
-
 
   # icons
   local i theme=official
diff --git a/arc4_remove-health-reporting.patch b/arc4_remove-health-reporting.patch
index ac9d159..daca4d1 100644
--- a/arc4_remove-health-reporting.patch
+++ b/arc4_remove-health-reporting.patch
@@ -1,6 +1,6 @@
 --- a/moz.configure
 +++ b/moz.configure
-@@ -5,7 +5,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this
+@@ -5,12 +5,10 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  imply_option('MOZ_PLACES', True)
@@ -8,3 +8,7 @@
  imply_option('MOZ_SERVICES_SYNC', True)
  imply_option('MOZ_DEDICATED_PROFILES', True)
  imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True)
+-imply_option('MOZ_NORMANDY', True)
+ 
+ with only_when(target_is_linux & compile_environment):
+     option(env='MOZ_NO_PIE_COMPAT',
diff --git a/bug1654465.diff b/bug1654465.diff
deleted file mode 100644
index f9982cb..0000000
--- a/bug1654465.diff
+++ /dev/null
@@ -1,77 +0,0 @@
- build/moz.configure/rust.configure                         |  2 +-
- config/makefiles/rust.mk                                   |  5 +++++
- .../mozbuild/test/configure/test_toolchain_configure.py    | 14 --------------
- 3 files changed, 6 insertions(+), 15 deletions(-)
-
-diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
-index aaa693059d95..c90ae5ca7b25 100644
---- c/build/moz.configure/rust.configure
-+++ i/build/moz.configure/rust.configure
-@@ -146,7 +146,7 @@ def rust_compiler(rustc_info, cargo_info, build_project):
-         or by directly running the installer from https://rustup.rs/
-         '''))
-     if build_project == 'tools/crashreporter':
--        rustc_min_version = Version('1.31.0')
-+        rustc_min_version = Version('1.38.0')
-     else:
-         rustc_min_version = Version('1.43.0')
-     cargo_min_version = rustc_min_version
-diff --git c/config/makefiles/rust.mk i/config/makefiles/rust.mk
-index a9abcc9af4c0..b5c7973104ce 100644
---- c/config/makefiles/rust.mk
-+++ i/config/makefiles/rust.mk
-@@ -63,6 +63,11 @@ ifndef MOZ_DEBUG_RUST
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
- cargo_rustc_flags += -Clto
- endif
-+# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when
-+# using -Clto.
-+ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
-+RUSTFLAGS += -Cembed-bitcode=yes
-+endif
- endif
- endif
- 
-diff --git c/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py i/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-index e1921ece6865..759d4d98cc0d 100755
---- c/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-+++ i/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-@@ -1796,38 +1796,24 @@ class RustTest(BaseConfigureTest):
-                                      arm_arch=7, fpu='neon', thumb2=True, float_abi='softfp')),
-             'thumbv7neon-linux-androideabi')
- 
--        self.assertEqual(
--            self.get_rust_target('arm-unknown-linux-androideabi',
--                                 version='1.32.0',
--                                 arm_target=ReadOnlyNamespace(
--                                     arm_arch=7, fpu='neon', thumb2=True, float_abi='softfp')),
--            'armv7-linux-androideabi')
--
-         self.assertEqual(
-             self.get_rust_target('arm-unknown-linux-androideabi',
-                                  arm_target=ReadOnlyNamespace(
-                                      arm_arch=7, fpu='neon', thumb2=False, float_abi='softfp')),
-             'armv7-linux-androideabi')
- 
-         self.assertEqual(
-             self.get_rust_target('arm-unknown-linux-androideabi',
-                                  arm_target=ReadOnlyNamespace(
-                                      arm_arch=7, fpu='vfpv2', thumb2=True, float_abi='softfp')),
-             'armv7-linux-androideabi')
- 
-         self.assertEqual(
-             self.get_rust_target('armv7-unknown-linux-gnueabihf',
-                                  arm_target=ReadOnlyNamespace(
-                                      arm_arch=7, fpu='neon', thumb2=True, float_abi='hard')),
-             'thumbv7neon-unknown-linux-gnueabihf')
- 
--        self.assertEqual(
--            self.get_rust_target('armv7-unknown-linux-gnueabihf',
--                                 version='1.32.0',
--                                 arm_target=ReadOnlyNamespace(
--                                     arm_arch=7, fpu='neon', thumb2=True, float_abi='hard')),
--            'armv7-unknown-linux-gnueabihf')
--
-         self.assertEqual(
-             self.get_rust_target('armv7-unknown-linux-gnueabihf',
-                                  arm_target=ReadOnlyNamespace(
diff --git a/mozconfig.common.override b/mozconfig.common.override
index 4ee9fe5..ef118ac 100644
--- a/mozconfig.common.override
+++ b/mozconfig.common.override
@@ -1,4 +1,7 @@
-export MOZ_TELEMETRY_REPORTING=0
+export MOZ_TELEMETRY_REPORTING=
+export MOZ_SERVICES_HEALTHREPORT=0
+export MOZ_CRASHREPORTER=0
+export MOZ_NORMANDY=0
 export MOZ_DATA_REPORTING=0
 # accessibility required for ff71+
 #export ACCESSIBILITY=0
diff --git a/mozconfig.in b/mozconfig.in
index c00d166..88f206c 100644
--- a/mozconfig.in
+++ b/mozconfig.in
@@ -25,6 +25,7 @@ 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 MOZ_TELEMETRY_REPORTING=
 export MOZILLA_OFFICIAL=1
 export MOZ_REQUIRE_SIGNING=0
 export MOZ_ADDON_SIGNING=0
@@ -51,7 +52,7 @@ ac_add_options --enable-jack
 
 # Disables
 # accessibility required for ff71+
-#ac_add_options --disable-accessibility
+ac_add_options --disable-accessibility
 ac_add_options --disable-cdp
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
@@ -69,6 +70,6 @@ ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-webrtc
 # # Disabling webspeech breaks compiling ff67+
-# ac_add_options --disable-webspeech
+ac_add_options --disable-webspeech
 
 mk_add_options MOZ_MAKE_FLAGS="-j4"
-- 
cgit v1.2.1