diff options
| author | Mark H Weaver <mhw@netris.org> | 2020-08-17 02:32:09 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2020-09-06 13:17:46 -0400 |
| commit | 1fffb85edab4533b87b34dd24c5144d6748cb594 (patch) | |
| tree | 1811c36439167b211125e39541ac95e1117939c5 /data/patches/fix-data-reporting-check.patch | |
| parent | 15a7c3d991a670b6489d4f432b52a188358f4ca5 (diff) | |
Preliminary update to 78.2.0.
* data/branding/icecat-wordmark.svg: Move to ...
* data/branding/icecat/content/icecat-wordmark.svg: ... here.
* data/branding/icecat/content/jar.mn: Add icecat-wordmark.svg.
* data/buildscripts/mozconfig-common: Add system directories to the
set of addon scopes that need not be signed by Mozilla, and allow
addon sideloading as well. Remove --disable-mainenance-service build
option, which is no longer accepted.
* data/buildscripts/mozconfig-gnulinux: Remove --disable-gconf build
option, which is no longer accepted.
* data/patches/default-search-duckduckgo.patch,
dont-pin-search-engines-to-top-sites.patch,
data/patches/duckduckgo-no-params.patch,
data/patches/fix-data-reporting-check.patch,
data/patches/icecat-about-dialog.patch: Adapt to apply cleanly to v78.
* data/patches/moz-configure-changes.patch: Disable MOZ_NORMANDY.
* data/patches/icecat-preferences.patch: Remove, pending rewrite.
* data/settings.js: Add several new IceCat-specific default settings.
* makeicecat: Adapt to v78.
Diffstat (limited to 'data/patches/fix-data-reporting-check.patch')
| -rw-r--r-- | data/patches/fix-data-reporting-check.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/patches/fix-data-reporting-check.patch b/data/patches/fix-data-reporting-check.patch index d586dc5..99aac2a 100644 --- a/data/patches/fix-data-reporting-check.patch +++ b/data/patches/fix-data-reporting-check.patch @@ -1,22 +1,22 @@ ---- a/old-configure.in.orig 1980-01-01 18:59:51.000000000 -0500 -+++ b/old-configure.in 2019-10-28 04:13:17.343606008 -0400 -@@ -3116,7 +3116,7 @@ +--- 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"; then -+if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then +-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.orig 1980-01-01 18:59:51.000000000 -0500 -+++ b/old-configure 2019-10-28 04:15:41.772322191 -0400 -@@ -12150,7 +12150,7 @@ +--- 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"; then -+if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then +-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 ') |