From c4132fec15e41d3ca1a7bdfc990f46da34a9620e Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 20 Dec 2018 17:17:00 -0800
Subject: Added comments to explain assorted PKGBUILD hacks

---
 PKGBUILD | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 8cd894f..72287af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,14 @@
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 
 # # I maintain this because:
+# Arch version uses eme
 # Arch version uses git
+# Arch version uses python2
+# Arch version doesn't use alsa
 # Arch version requires signed addons
+# Arch version doesn't remove system addons
 # Arch version lacks privacy and security by default
-# Arch version doesn't support alsa
 # Arch version enables debug symbols
-# Arch version makepdepends on python2
 
 pkgname=firefox
 pkgver=64.0
@@ -98,6 +100,7 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 END
 
+# MOZ_TELEMETRY_REPORTING only applied correctly when set in this override file
   cat >$srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/build/mozconfig.common.override <<END
 export MOZ_TELEMETRY_REPORTING=0
 export MOZ_DATA_REPORTING=0
@@ -119,9 +122,13 @@ END
 
 #   patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/config/mozconfigs/whitelist $srcdir/whitelist.diff
 #   patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/config/mozconfigs/linux64/common-opt $srcdir/common-opt.diff
+#   patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/build/mozconfig.common.override $srcdir/mozconfig.common.override.diff
+
+  # Patch out health reporting so that MOZ_DATA_REPORTING=0 can be applied.
   patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/moz.configure $srcdir/moz.configure.diff
+
+  # Remove @RESPATH@/browser/features/* to prevent system addons from being part of the output package.
   patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/installer/package-manifest.in $srcdir/package-manifest.diff
-#   patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/build/mozconfig.common.override $srcdir/mozconfig.common.override.diff
 
 
 }
@@ -132,7 +139,6 @@ build() {
 #   mkdir --parents $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/extensions/webcompat-reporter/locales
 #   mkdir --parents $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/services/sync/locales
 
-#  export MOZ_SOURCE_REPO="$_repo"
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
   # LTO needs more open files
-- 
cgit v1.2.1