revertme - icecat - failed attempts to pass antifeatures-checkwip-icecat

1 files changed, 49 insertions, 1 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 2b763c67b..89893c7de 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -91,7 +91,7 @@ _check_build_config() {
   then echo "Some anti-features are not disabled in build configuration files, aborting:"
        for key in ${antifeatures[@]} ; do echo "  - ${key} is enabled" ; done ;
        # FIXME: - .datareporting is enabled
-#        return 1
+       return 1
   fi
 
   popd > /dev/null
@@ -127,6 +127,7 @@ ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=nu.parabola
 ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
+export MOZILLA_OFFICIAL=
 export MOZ_APP_NAME=${pkgname}
 export MOZ_APP_REMOTINGNAME=${pkgname}
 export MOZ_TELEMETRY_REPORTING=
@@ -143,7 +144,15 @@ ac_add_options --enable-alsa
 ac_add_options --enable-jack
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
+ac_add_options --disable-tests
 ac_add_options --disable-eme
+
+
+# REVERTME: unsuccessful attempt to fix the failing _check_build_config()
+# ac_add_options --disable-datareporting # FIXME: no such option
+# ac_add_options --disable-healthreport  # FIXME: no such option
+# ac_add_options --disable-normandy      # FIXME: no such option
+# ac_add_options --disable-telemetry     # FIXME: no such option
 END
 
 
@@ -215,6 +224,25 @@ END
 
   ## libre patching ##
 
+  # Disable various components at the source level
+  # REVERTME: unsuccessful attempt to fix the failing _check_build_config()
+  #           these two LOCs allow _check_build_config() to pass for iceweasel;
+  #             but is not sufficient for icecat (v78.6.0)
+  #           the second LOC is already handled in the gnuzilla source
+  sed -i 's/;1/;0/' toolkit/components/telemetry/components.conf
+#   sed -Ei 's/((MOZ_SERVICES_HEALTHREPORT|MOZ_NORMANDY).+)True/\1False/' browser/moz.configure
+
+  # REVERTME: unsuccessful attempt to fix the failing _check_build_config()
+  # also tried 'MOZ_CRASHREPORTER'           # unknown key
+  # also tried 'MOZ_UPDATE_CHANNEL'          # unknown key
+  # also tried 'MOZ_SERVICES_HEALTHREPORTER' # unknown key
+  # also tried 'MOZ_SERVICES_METRICS'        # unknown key
+  # also tried 'MOZ_DATA_REPORTING'          # unknown key
+  sed -i "s|\(.*MOZ_NORMANDY.*\)|\1\nimply_option('MOZ_TELEMETRY_REPORTING', False)|" browser/moz.configure
+
+  # REVERTME: unsuccessful attempt to fix the failing _check_build_config()
+#   echo 'pref("toolkit.telemetry.unified", false);' >> browser/app/profile/${pkgname}.js
+
   # Patch and remove anything that's left
   echo "applying libre.patch"
   patch -Np1 -i "${srcdir}"/libre.patch
@@ -227,6 +255,26 @@ build() {
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
   export MACH_USE_SYSTEM_PYTHON=1
 
+
+  # REVERTME: unsuccessful attempt to fix the failing _check_build_config()
+#   export MOZ_TELEMETRY_REPORTING=
+#   export MOZ_REQUIRE_SIGNING=
+#   export MOZ_SERVICES_HEALTHREPORT=
+#   export MOZ_CRASHREPORTER=
+#   export MOZ_UPDATE_CHANNEL=
+#   export MOZ_PAY=
+#   export MOZ_SERVICES_HEALTHREPORTER=
+#   export MOZ_SERVICES_FXACCOUNTS=
+#   export MOZ_SERVICES_METRICS=
+#   export MOZ_DATA_REPORTING=
+#   #export MOZ_NORMANDY=0       # NFG: must not be set in environment
+#   #export MOZ_SERVICES_SYNC=0  # NFG: must not be set in environment
+#   export MOZ_DEVICES=
+
+#   export MOZ_SERVICES_FXACCOUNTS=1  # TODO: this may be needed for the sync feature
+#   export MOZ_SERVICES_SYNC=1        # TODO: this may be needed for the sync feature
+
+
   # LTO needs more open files
   ulimit -n 4096