From 497cdf100f405204a22f5de96f142b9d040697e8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Sep 2023 17:47:50 -0400 Subject: Update to 115.3.0. Thanks to Chippy for providing preliminary patches upon which these changes are based. * makeicecat (FFMAJOR, FFMINOR, SOURCEBALL_CHECKSUM): Update to 115.3.0. (fail, skip_thru_matching_endif, remove_if_block) (remove_if_block_in_file, sort_inner_list) (sort_inner_list_in_file): New shell functions. (configure, configure_search, apply_branding) (apply_batch_branding): Adapt to upstream changes. * data/patches/about-addons.patch: Adapt as needed. * data/patches/fix-data-reporting-check.patch, data/patches/reproducible-langpacks.patch: Remove obsolete patches. * data/settings.js: Block undesirable functionality. Use in place of . --- data/patches/fix-data-reporting-check.patch | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 data/patches/fix-data-reporting-check.patch (limited to 'data/patches/fix-data-reporting-check.patch') diff --git a/data/patches/fix-data-reporting-check.patch b/data/patches/fix-data-reporting-check.patch deleted file mode 100644 index 99aac2a..0000000 --- a/data/patches/fix-data-reporting-check.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/old-configure.in -+++ b/old-configure.in -@@ -2783,7 +2783,7 @@ - dnl If we have any service that uploads data (and requires data submission - dnl policy alert), set MOZ_DATA_REPORTING. - dnl We need SUBST for build system and DEFINE for xul preprocessor. --if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER" || test -n "$MOZ_NORMANDY"; then -+if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1 || test "$MOZ_NORMANDY" = 1; then - MOZ_DATA_REPORTING=1 - AC_DEFINE(MOZ_DATA_REPORTING) - AC_SUBST(MOZ_DATA_REPORTING) ---- a/old-configure -+++ b/old-configure -@@ -10359,7 +10359,7 @@ - - - --if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER" || test -n "$MOZ_NORMANDY"; then -+if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1 || test "$MOZ_NORMANDY" = 1; then - MOZ_DATA_REPORTING=1 - cat >> confdefs.pytmp <<\EOF - (''' MOZ_DATA_REPORTING ''', ' 1 ') -- cgit v1.2.3