From a654ea1469f74aa4a898dd73ee0538c7405ef85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Wed, 12 Oct 2022 23:06:52 +0000 Subject: [PATCH] thunderbird: update helper to build icedove 102.x --- .../branding/content/about-wordmark.png | Bin 11502 -> 0 bytes .../branding/content/about-wordmark.svg | 331 ++++-------------- .../DATA/thunderbird/process-json-files.py | 20 +- helpers/make-thunderbird | 50 ++- 4 files changed, 115 insertions(+), 286 deletions(-) delete mode 100644 helpers/DATA/thunderbird/branding/content/about-wordmark.png diff --git a/helpers/DATA/thunderbird/branding/content/about-wordmark.png b/helpers/DATA/thunderbird/branding/content/about-wordmark.png deleted file mode 100644 index b0b03473b0aa2e967bd71a0f4fb4331bbf8b7b61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11502 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 a1tfLn)QP< - - - - - - - - image/svg+xml - - - - - - - - - - + id="aboutWordmark" + x="0px" + y="0px" + width="130px" + height="38px" + viewBox="0 0 130 38" + xml:space="preserve" + inkscape:version="1.2 (1:1.2.1+202207142221+cd75a1ee6d)" + sodipodi:docname="about-wordmark.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/">image/svg+xml + diff --git a/helpers/DATA/thunderbird/process-json-files.py b/helpers/DATA/thunderbird/process-json-files.py index 5eb07f6..53ee523 100644 --- a/helpers/DATA/thunderbird/process-json-files.py +++ b/helpers/DATA/thunderbird/process-json-files.py @@ -51,10 +51,18 @@ class RemoteSettings: DUMPS_PATH_ABSOLUTE = arguments.MAIN_PATH / DUMPS_PATH_RELATIVE _WRAPPER_NAME = 'data' + _LAST_MODIFIED_KEY_NAME = 'last_modified' + + @classmethod + def get_collection_timestamp(cls, collection): + return max((record[cls._LAST_MODIFIED_KEY_NAME] + for record in collection.content), default=0) @classmethod def wrap(cls, processed): - return File(processed.path, {cls._WRAPPER_NAME: processed.content}) + return File(processed.path, + {cls._WRAPPER_NAME: processed.content, + 'timestamp': cls.get_collection_timestamp(processed)}) @classmethod def unwrap(cls, parsed_jsons): @@ -88,13 +96,15 @@ class RemoteSettings: while timestamp in timestamps: timestamp += 1 timestamps.append(timestamp) - record['last_modified'] = timestamp + record[cls._LAST_MODIFIED_KEY_NAME] = timestamp if parsed_schema is not None: validate(record, schema=parsed_schema) result.append(record) + result.sort( + key=lambda record: record[cls._LAST_MODIFIED_KEY_NAME], reverse=True) cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True) return File(cls.OUTPUT_PATH, result) @@ -109,7 +119,7 @@ class RemoteSettings: class Changes(RemoteSettings): JSON_PATHS = tuple(RemoteSettings.DUMPS_PATH_ABSOLUTE.glob('*/*.json')) - OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes.json' + OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes' @classmethod def wrap(cls, processed): @@ -124,8 +134,8 @@ class Changes(RemoteSettings): for collection in unwrapped_jsons: if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json': latest_change = {} - latest_change['last_modified'] = max( - (record['last_modified'] for record in collection.content), default=0) + latest_change[cls._LAST_MODIFIED_KEY_NAME] = cls.get_collection_timestamp( + collection) latest_change['bucket'] = collection.path.parent.name latest_change['collection'] = collection.path.stem changes.append(latest_change) diff --git a/helpers/make-thunderbird b/helpers/make-thunderbird index 2f87918..3079138 100644 --- a/helpers/make-thunderbird +++ b/helpers/make-thunderbird @@ -1,5 +1,6 @@ #!/bin/bash # +# Copyright (C) 2022 Luis Guzmán # Copyright (C) 2020 Ruben Rodriguez # Copyright (C) 2019 David Trudgian # @@ -18,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=15 +VERSION=16 . ./config @@ -117,7 +118,10 @@ EOF #cp toolkit/components/telemetry/healthreport-prefs.js mobile/android/chrome/content/healthreport-prefs.js # Browser legal page sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml -sed -i 's|https://www.mozilla.org/thunderbird/legal/privacy/|https://trisquel.info/legal|' comm/mail/components/newmailaccount/content/accountProvisioner.js comm/mail/app/profile/all-thunderbird.js +sed -i 's|https://www.mozilla.org/thunderbird/legal/privacy/|https://trisquel.info/legal|' comm/mail/app/profile/all-thunderbird.js +sed -i 's|https://www.mozilla.org/en-US/privacy/thunderbird/|https://trisquel.info/legal|' comm/mail/app/profile/all-thunderbird.js +sed -i 's|https://www.mozilla.org/privacy/|https://trisquel.info/legal|' comm/mail/components/newmailaccount/content/accountProvisioner.xhtml +grep -rl https://www.mozilla.org/privacy/thunderbird/ | xargs sed -i 's|https://www.mozilla.org/privacy/thunderbird/|https://trisquel.info/legal|' # Org branding sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in # Disable DRM support, armhf has no such option. @@ -132,8 +136,6 @@ ac_add_options --disable-eme %%endif ARCH ######################################################## -sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in - sed '/^MOZ_PKG_NAME/s/.*/MOZ_PKG_NAME=icedove/' -i debian/build/config.mk cat << EOF >> debian/build/config.mk @@ -172,8 +174,12 @@ find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -i sed 's|https://www.icedove.net/features/|https://trisquel.info/wiki/icedove|' -i comm/mail/base/content/utilityOverlay.js sed 's|https://www.icedove.net/get-involved/|https://trisquel.info/wiki/|' -i comm/mail/base/content/utilityOverlay.js -sed 's|https://donate.mozilla.org/.*help-menu|https://trisquel.info/donate/|' -i comm/mail/base/content/utilityOverlay.js +sed 's|https://give.icedove.net/.*|https://trisquel.info/donate/"|' -i comm/mail/base/content/utilityOverlay.js +sed 's|https://www.icedove.net/.*/features/|https://trisquel.info/wiki/icedove|' -i comm/mailnews/base/content/msgAccountCentral.xhtml sed 's|https://give.icedove.net/.*|https://trisquel.info/donate/"|' -i comm/mailnews/base/content/msgAccountCentral.xhtml +sed 's|https://support.mozilla.org/products/icedove|https://trisquel.info/wiki/icedove|' -i comm/mailnews/base/content/msgAccountCentral.xhtml +sed 's|https://www.icedove.net/.*/get-involved/|https://trisquel.info/wiki/|' -i comm/mailnews/base/content/msgAccountCentral.xhtml +sed 's|https://developer.icedove.net/|https://gitlab.trisquel.org/trisquel|' -i comm/mailnews/base/content/msgAccountCentral.xhtml replace Daily Trisquel comm/mail/branding/ sed '/.* 80) sed -i 's|Abrowser is not running. It|Abrowser is not running. It|' toolkit/mozapps/update/pings.yaml @@ -193,19 +203,19 @@ sed -i \ third_party/dump_syms/vendor/regex/.cargo-checksum.json sed -i \ -'s|af4ff013841da9bf00cf88ad3ae468f30c122b730ed37327d965d11b8e367459|a68c2df0024ff65f43efd5f5a48fe39a35d859ac459cce8695e4b09120cc1f35|' \ +'s|bcb4b59cfc5f48fbaba954b8ae4daa9eaecf9044afc89208a78a7e995c321b81|5f33885b0cc238abc78622e32bd56e6c550d90f1de419d5d7768c8da7f53f039|' \ third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json sed -i \ -'s|eb9f00340e0f6ba3d01f4770356062ab2142e1646c7c2556c9b35348f90980f0|af2b7e2811c649615d4726c7dc4fd9b2e8aa35c229e8225c930e8e7d8e003fa2|' \ +'s|a64116a6d46ab30ce91deabdb4c5388f03be632326e8a00110bfb0c598474a0a|5cd020aae75fdcd21aca4799d302f1720075c9dd6fb12ba19e6403a8012970b2|' \ third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json sed -i \ -'s|04fc9b146177e7bf615156b8570fa0f97b89f68a2c02b946778711728b81e81f|16221c6c37245cd078ffdb1bd314e45334ddf60098742fc38b821e733fc4c5ca|' \ +'s|fe4881780e8cd0181748a891102b2dd54c2060546d7648ec1b6435529bd0dcc2|40588888ea0d4b7e86bc1e184be9e667bd1b0480fe00406ebb828821f5080a07|' \ third_party/dump_syms/vendor/h2/.cargo-checksum.json sed -i \ -'s|caabd31cbcb00172bb7f31a1398dbed27a3bf36b01d69729c3d6fbd9a4008e05|080cba5e2b65e6542f364aa4703a179c58b20e41489573d941ef68b9619a2734|' \ +'s|6f3be57dae549574569b812acab6213f4136ba9c4ad60a21848043d26e6aaece|07f28083516d3660082d9c46fe2349a1099720b4f30cc7431f1cc267690d6505|' \ third_party/dump_syms/vendor/httparse/.cargo-checksum.json sed -i \ @@ -215,8 +225,27 @@ third_party/dump_syms/vendor/openssl/.cargo-checksum.json sed -i \ 's|82c82f8ef547f67f3f449a0b240e2df4ed538d976a379b07e53d5ce7cde2438c|01baa5e11aa7ec74360151d379ba8b5607abcd34132e69568c816c0116958a26|' \ third_party/dump_syms/vendor/symbolic-minidump/.cargo-checksum.json + +sed -i \ +'s|6018b016930c86610953a88ca35e8cebffd2dbbd92f11502c2464ab4281e7bbc|04c8d6c8a498abac61ffb2725484c2732328270e25a7e3ed452657962ce76f4e|' \ +third_party/dump_syms/vendor/bitvec/.cargo-checksum.json #EO Manual fixing. +# about: page mods, like rights. +## Hide extra links in about box +find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i + +for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing +do + find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /" +done +##Remove invalid policy for trisquel. +find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-5/,$d' +find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/d" +find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d" +find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/d" +#EO about: mods. + #Debbuging tools sed -i 's|this-firefox|this-abrowser|g' devtools/client/framework/test/browser_about-devtools-toolbox_reload.js #Rebrand debug tools @@ -225,8 +254,7 @@ devtools/client/themes/images/aboutdebugging-fenix-nightly.svg \ devtools/client/themes/images/aboutdebugging-firefox-aurora.svg \ devtools/client/themes/images/aboutdebugging-firefox-beta.svg \ devtools/client/themes/images/aboutdebugging-firefox-nightly.svg \ -devtools/client/themes/images/aboutdebugging-firefox-release.svg \ -devtools/startup/aboutdevtools/images/dev-edition-logo.svg" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg +devtools/client/themes/images/aboutdebugging-firefox-release.svg" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg cp $DATA/debug_brand/debuglogo_gray.svg devtools/client/themes/images/aboutdebugging-firefox-logo.svg cp $DATA/debug_brand/about-logo.svg comm/mail/branding/icedove/TB-symbolic.svg cp $DATA/debug_brand/about-logo.svg comm/mail/themes/shared/mail/icons/aboutdebugging-logo.svg