diff options
Diffstat (limited to 'data/patches')
| -rw-r--r-- | data/patches/about-addons.patch | 29 | ||||
| -rw-r--r-- | data/patches/fix-data-reporting-check.patch | 22 | ||||
| -rw-r--r-- | data/patches/reproducible-langpacks.patch | 45 |
3 files changed, 16 insertions, 80 deletions
diff --git a/data/patches/about-addons.patch b/data/patches/about-addons.patch index dae5a0d..4427c46 100644 --- a/data/patches/about-addons.patch +++ b/data/patches/about-addons.patch @@ -1,22 +1,25 @@ --- a/toolkit/mozapps/extensions/content/aboutaddons.html +++ b/toolkit/mozapps/extensions/content/aboutaddons.html -@@ -65,8 +65,8 @@ +@@ -174,12 +174,12 @@ <template name="addon-page-header"> <div class="sticky-container"> <div class="main-search"> -- <label for="search-addons" class="search-label" data-l10n-id="default-heading-search-label"></label> -- <search-addons data-l10n-id="search-header-shortcut" data-l10n-attrs="key"></search-addons> -+ <label hidden="true" for="search-addons" class="search-label" data-l10n-id="default-heading-search-label"></label> -+ <search-addons hidden="true" data-l10n-id="search-header-shortcut" data-l10n-attrs="key"></search-addons> +- <label ++ <label hidden="true" + for="search-addons" + class="search-label" + data-l10n-id="default-heading-search-label" + ></label> +- <search-addons></search-addons> ++ <search-addons hidden="true"></search-addons> </div> <div class="main-heading"> - <button class="back-button" action="go-back" data-l10n-id="header-back-button" hidden></button> -@@ -306,7 +306,7 @@ - <button class="primary" action="open-amo" data-l10n-id="find-more-addons"></button> + <button +@@ -660,6 +660,7 @@ </div> <div class="view-footer-item"> -- <a class="privacy-policy-link" data-l10n-id="privacy-policy" target="_blank"></a> -+ <a hidden="true" class="privacy-policy-link" data-l10n-id="privacy-policy" target="_blank"></a> - </div> - </template> - + <a ++ hidden="true" + class="privacy-policy-link" + data-l10n-id="privacy-policy" + target="_blank" 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 ') diff --git a/data/patches/reproducible-langpacks.patch b/data/patches/reproducible-langpacks.patch deleted file mode 100644 index b36a770..0000000 --- a/data/patches/reproducible-langpacks.patch +++ /dev/null @@ -1,45 +0,0 @@ -Prevent the extension manifests from embedding the current date. - -This is inspired by the Debian -"Use-build-id-as-langpack-version-for-reproducibility.patch" maintained for -their Firefox package as well as reproducible-builds.org guidelines from -https://reproducible-builds.org/docs/source-date-epoch/. - -Upstream status: https://phabricator.services.mozilla.com/D169979 - ---- ./python/mozbuild/mozbuild/action/langpack_manifest.py.old 2023-02-13 11:01:21.051537347 -0500 -+++ ./python/mozbuild/mozbuild/action/langpack_manifest.py 2023-02-13 11:04:33.141817330 -0500 -@@ -36,6 +36,15 @@ - pushlog_api_url = "{0}/json-rev/{1}" - - -+import os -+import time -+import datetime -+ -+def get_build_date(): -+ """Honor SOURCE_DATE_EPOCH for reproducibility.""" -+ return datetime.datetime.utcfromtimestamp( -+ int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) -+ - ### - # Retrievers a UTC datetime of the push for the current commit - # from a mercurial clone directory. -@@ -54,7 +63,7 @@ - with mozversioncontrol.get_repository_object(path=path) as repo: - phase = repo._run("log", "-r", ".", "-T" "{phase}") - if phase.strip() != "public": -- return datetime.datetime.utcnow() -+ return get_build_date() - repo_url = repo._run("paths", "default") - repo_url = repo_url.strip().replace("ssh://", "https://") - repo_url = repo_url.replace("hg://", "https://") -@@ -105,7 +114,7 @@ - dt = get_dt_from_hg(path) - - if dt is None: -- dt = datetime.datetime.utcnow() -+ dt = get_build_date() - - dt = dt.replace(microsecond=0) - return dt.strftime("%Y%m%d%H%M%S") |