From 7aa7af6fd62082e0b8602a90222f81ac9542c25f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Wed, 16 Feb 2022 16:14:12 +0000
Subject: [PATCH] Update rebrand icedove 10.0
---
.../{ => debug_brand}/about-logo.svg | 0
.../{ => debug_brand}/debuglogo.svg | 0
.../{ => debug_brand}/debuglogo_gray.svg | 0
helpers/DATA/thunderbird/debug_brand/icon.png | Bin 0 -> 1236 bytes
.../DATA/thunderbird/debug_brand/icon64.png | Bin 0 -> 2718 bytes
.../DATA/thunderbird/process-json-files.py | 238 ++++++++++++++++++
helpers/make-thunderbird | 39 ++-
7 files changed, 273 insertions(+), 4 deletions(-)
rename helpers/DATA/thunderbird/{ => debug_brand}/about-logo.svg (100%)
rename helpers/DATA/thunderbird/{ => debug_brand}/debuglogo.svg (100%)
rename helpers/DATA/thunderbird/{ => debug_brand}/debuglogo_gray.svg (100%)
create mode 100644 helpers/DATA/thunderbird/debug_brand/icon.png
create mode 100644 helpers/DATA/thunderbird/debug_brand/icon64.png
create mode 100644 helpers/DATA/thunderbird/process-json-files.py
diff --git a/helpers/DATA/thunderbird/about-logo.svg b/helpers/DATA/thunderbird/debug_brand/about-logo.svg
similarity index 100%
rename from helpers/DATA/thunderbird/about-logo.svg
rename to helpers/DATA/thunderbird/debug_brand/about-logo.svg
diff --git a/helpers/DATA/thunderbird/debuglogo.svg b/helpers/DATA/thunderbird/debug_brand/debuglogo.svg
similarity index 100%
rename from helpers/DATA/thunderbird/debuglogo.svg
rename to helpers/DATA/thunderbird/debug_brand/debuglogo.svg
diff --git a/helpers/DATA/thunderbird/debuglogo_gray.svg b/helpers/DATA/thunderbird/debug_brand/debuglogo_gray.svg
similarity index 100%
rename from helpers/DATA/thunderbird/debuglogo_gray.svg
rename to helpers/DATA/thunderbird/debug_brand/debuglogo_gray.svg
diff --git a/helpers/DATA/thunderbird/debug_brand/icon.png b/helpers/DATA/thunderbird/debug_brand/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6a2855fb9dd90ab7c7964105c0767c42dc081dc
GIT binary patch
literal 1236
zcmV;_1S|WAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11W`#uK~z|U%~wrmTvZhQ&bhD2q-GMd2BA<a)+!28X%Wmqtx&p9
z7os9v){TfXAXu`QPUg-_(?l1|N)!~)mC|fl7e%xvF(Bd(NEZgBXcxsrjR^%con-F$
zT+Dmp>&u%Y>JUAfx%bY!=ljm@y$|@0MY^eMe0=<400)+rmtQz_>eQLdoY8I)05DJT
z=DxnZ_a-MNpZDGmY$<^d!YF_hlDfLO`kII=dG9CIJJZz=06-kap92^c5da{7=HlYw
z;PmwLa?$>7hX7{wA^;-^077!xjvYHboSK>%+!6xb`)^gX0RRaJkbJn&XcUH`>jV<O
zYq>d`bBDH!fQVep697<Jmw@+v`^d;hZ<jdyks|~%+ja8f$zz2Cy!ZXixhq3ML#Mle
zE+V&O=OiH_O7dtS0RR<}gCer;-+~`Me*7kqJ9C6m5^t{|P^naQMN#x@GT)is@OPzL
zF3*}-Q79YDW^+w@j(U50XGrb_0FrBJ)qAfYgd@(m2b^=~s@3W&S`B86)a&(+RCRw^
zeyJo)DRR#J5XbQnfUn2K#*P4>#BuyRfW3**hMC>zz5f|#xwBj@e<>n&0dN3<i2M{n
zxZiu<PBicRc2&J7B6pCK6f{pnRT)B{h^(5~z25sDRYXFDX>SxoaXKFu7&xb@_lSrl
z1eN5TD2m=s_nbI!Vy|=Vs)+0%DT%d(;3Q2%psMPeyI8N+&qgA$8?DwUNuoUCy??1x
zD!FE}`5;M{nTQBeB4#!W0M%-BUr$fZS7x?NMAlfH=tFXbl8Bi(0DY=@Kt<#eWcon}
zq3oQSYc`vYku0%g7D<Y=gd!4+j*gb2DEfkA8$2(GwPeC7=anYOvub7|02;Z3xi5t9
z7D)vFGXnr-fY{&P|E{W*GH23#H%JIUvgA@SBH{o%rzCFy(39Pj#Il6eb*;`hQB_Iz
zBvwC?xoooJ^C2j#7?LXhVgZ0Sjz0r1j7%uf?p1Uc09DnJSQbhOoP;d9z6{`U2;oWZ
z{iXIl6B85XLkNeFd89}y_=S&_Bro!75D}VLHUXikt0d<DTnHh&>Ahb}&qV3K%=RPq
zLdpZ={u2O}TPq9)$wswWJ&b||)^_pA%F5%adI`Xii2Rzkurq_i=yeEY#|xcwwLLIC
zKK>1WyOZ$~0L}uf24ZHNfNoHlxpX8M6Rl_2JDrFYCRqsK0?AnbzmWVLtrBdzJI(IY
z<(Ue~cR~g5+rq-atDOjJ_$sbcDz}$PrSAarW!JN@&g6sUx?wQ0W8V8WI_d9NMybrr
z&0RZq@Ze4nIe^w(Ao$DD_HSxT>Vc$npRd(wFR!P6v)=_$uh&0S)rT@*OiMIdatU}a
zvkz*u+SAw|kvID&Wvy0w)XZKdd7UkhjJ0XwF_KFpkJf6nr#1oy{=t`#_x@G@uZYMY
yRUIH1iO6*`yBtC|JwHExW@ct4Y^dn}B7XujolpvP>T8|=0000<MNUMnLSTXcUNQ>+
literal 0
HcmV?d00001
diff --git a/helpers/DATA/thunderbird/debug_brand/icon64.png b/helpers/DATA/thunderbird/debug_brand/icon64.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbd4240e5f955f33cb5ddbfbfcde0c5b3a443fb9
GIT binary patch
literal 2718
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
Y1FcNJ+FS=gHvj+t07*qoM6N<$f*ZCY4FCWD
literal 0
HcmV?d00001
diff --git a/helpers/DATA/thunderbird/process-json-files.py b/helpers/DATA/thunderbird/process-json-files.py
new file mode 100644
index 00000000..5eb07f6d
--- /dev/null
+++ b/helpers/DATA/thunderbird/process-json-files.py
@@ -0,0 +1,238 @@
+#! /usr/bin/python3
+
+# Copyright (C) 2020, 2021 grizzlyuser <grizzlyuser@protonmail.com>
+# Copyright (C) 2020, 2021 Ruben Rodriguez <ruben@trisquel.info>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+import json
+import sys
+import time
+import copy
+import argparse
+import pathlib
+from collections import namedtuple
+from jsonschema import validate
+
+parser = argparse.ArgumentParser()
+parser.add_argument(
+ 'MAIN_PATH',
+ type=pathlib.Path,
+ help='path to main application source code directory')
+parser.add_argument(
+ 'BRANDING_PATH',
+ type=pathlib.Path,
+ help='path to branding source code directory')
+parser.add_argument(
+ '-i',
+ '--indent',
+ type=int,
+ default=2,
+ help='indent for pretty printing of output files')
+arguments = parser.parse_args()
+
+File = namedtuple('File', ['path', 'content'])
+
+
+class RemoteSettings:
+ DUMPS_PATH_RELATIVE = 'services/settings/dumps'
+ DUMPS_PATH_ABSOLUTE = arguments.MAIN_PATH / DUMPS_PATH_RELATIVE
+
+ _WRAPPER_NAME = 'data'
+
+ @classmethod
+ def wrap(cls, processed):
+ return File(processed.path, {cls._WRAPPER_NAME: processed.content})
+
+ @classmethod
+ def unwrap(cls, parsed_jsons):
+ return [File(json.path, json.content[cls._WRAPPER_NAME])
+ for json in parsed_jsons]
+
+ @classmethod
+ def should_modify_collection(cls, collection):
+ return True
+
+ @classmethod
+ def now(cls):
+ return int(round(time.time() / 10 ** 6))
+
+ @classmethod
+ def process_raw(cls, unwrapped_jsons, parsed_schema):
+ timestamps, result = [], []
+ for collection in unwrapped_jsons:
+ should_modify_collection = cls.should_modify_collection(collection)
+ for record in collection.content:
+ if should_modify_collection:
+ if cls.should_drop_record(record):
+ continue
+
+ clone = copy.deepcopy(record)
+
+ record = cls.process_record(record)
+
+ if clone != record:
+ timestamp = cls.now()
+ while timestamp in timestamps:
+ timestamp += 1
+ timestamps.append(timestamp)
+ record['last_modified'] = timestamp
+
+ if parsed_schema is not None:
+ validate(record, schema=parsed_schema)
+
+ result.append(record)
+
+ cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)
+
+ return File(cls.OUTPUT_PATH, result)
+
+ @classmethod
+ def process(cls, parsed_jsons, parsed_schema):
+ return cls.wrap(
+ cls.process_raw(
+ cls.unwrap(parsed_jsons),
+ parsed_schema))
+
+
+class Changes(RemoteSettings):
+ JSON_PATHS = tuple(RemoteSettings.DUMPS_PATH_ABSOLUTE.glob('*/*.json'))
+ OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes.json'
+
+ @classmethod
+ def wrap(cls, processed):
+ return File(
+ processed.path, {
+ 'changes': processed.content, 'timestamp': cls.now()})
+
+ @classmethod
+ def process_raw(cls, unwrapped_jsons, parsed_schema):
+ changes = []
+
+ 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['bucket'] = collection.path.parent.name
+ latest_change['collection'] = collection.path.stem
+ changes.append(latest_change)
+
+ cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)
+
+ return File(cls.OUTPUT_PATH, changes)
+
+
+class SearchConfig(RemoteSettings):
+ JSON_PATHS = (
+ RemoteSettings.DUMPS_PATH_ABSOLUTE /
+ 'main/search-config.json',
+ )
+ SCHEMA_PATH = arguments.MAIN_PATH / \
+ 'toolkit/components/search/schema/search-engine-config-schema.json'
+ OUTPUT_PATH = JSON_PATHS[0]
+
+ _DUCKDUCKGO_SEARCH_ENGINE_ID = 'ddg@search.mozilla.org'
+
+ @classmethod
+ def should_drop_record(cls, search_engine):
+ return search_engine['webExtension']['id'] not in (
+ cls._DUCKDUCKGO_SEARCH_ENGINE_ID, 'wikipedia@search.mozilla.org')
+
+ @classmethod
+ def process_record(cls, search_engine):
+ [search_engine.pop(key, None)
+ for key in ['extraParams', 'telemetryId']]
+
+ general_specifier = {}
+ for specifier in search_engine['appliesTo'].copy():
+ if 'application' in specifier:
+ if 'distributions' in specifier['application']:
+ search_engine['appliesTo'].remove(specifier)
+ continue
+ specifier['application'].pop('extraParams', None)
+
+ if 'included' in specifier and 'everywhere' in specifier[
+ 'included'] and specifier['included']['everywhere']:
+ general_specifier = specifier
+
+ if not general_specifier:
+ general_specifier = {'included': {'everywhere': True}}
+ search_engine['appliesTo'].insert(0, general_specifier)
+ if search_engine['webExtension']['id'] == cls._DUCKDUCKGO_SEARCH_ENGINE_ID:
+ general_specifier['default'] = 'yes'
+
+ return search_engine
+
+
+class TippyTopSites:
+ JSON_PATHS = (
+ arguments.MAIN_PATH /
+ 'browser/components/newtab/data/content/tippytop/top_sites.json',
+ arguments.BRANDING_PATH /
+ 'tippytop/top_sites.json')
+
+ @classmethod
+ def process(cls, parsed_jsons, parsed_schema):
+ tippy_top_sites_main = parsed_jsons[0]
+ tippy_top_sites_branding = parsed_jsons[1]
+ result = tippy_top_sites_branding.content + \
+ [site for site in tippy_top_sites_main.content if 'wikipedia.org' in site['domains']]
+ return File(tippy_top_sites_main.path, result)
+
+
+class TopSites(RemoteSettings):
+ _TOP_SITES_JSON_PATH = 'main/top-sites.json'
+ _TOP_SITES_PATH_MAIN = RemoteSettings.DUMPS_PATH_ABSOLUTE / _TOP_SITES_JSON_PATH
+
+ JSON_PATHS = (
+ arguments.BRANDING_PATH /
+ RemoteSettings.DUMPS_PATH_RELATIVE /
+ _TOP_SITES_JSON_PATH,
+ _TOP_SITES_PATH_MAIN)
+ OUTPUT_PATH = _TOP_SITES_PATH_MAIN
+
+ @classmethod
+ def should_modify_collection(cls, collection):
+ return cls._TOP_SITES_PATH_MAIN == collection.path
+
+ @classmethod
+ def should_drop_record(cls, site):
+ return site['url'] != 'https://www.wikipedia.org/'
+
+ @classmethod
+ def process_record(cls, site):
+ site.pop('exclude_regions', None)
+ return site
+
+
+# To reflect the latest timestamps, Changes class should always come after
+# all other RemoteSettings subclasses
+processors = (SearchConfig, Changes)
+
+for processor in processors:
+ parsed_jsons = []
+ for json_path in processor.JSON_PATHS:
+ with json_path.open(encoding='utf-8') as file:
+ parsed_jsons.append(File(json_path, json.load(file)))
+
+ parsed_schema = None
+ if hasattr(processor, "SCHEMA_PATH"):
+ with processor.SCHEMA_PATH.open() as file:
+ parsed_schema = json.load(file)
+
+ processed = processor.process(parsed_jsons, parsed_schema)
+ with processed.path.open('w') as file:
+ json.dump(processed.content, file, indent=arguments.indent)
diff --git a/helpers/make-thunderbird b/helpers/make-thunderbird
index e5f31d90..f792a501 100644
--- a/helpers/make-thunderbird
+++ b/helpers/make-thunderbird
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=11
+VERSION=12
. ./config
@@ -221,9 +221,33 @@ 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/debuglogo.svg
-cp $DATA/debuglogo_gray.svg devtools/client/themes/images/aboutdebugging-firefox-logo.svg
-cp $DATA/about-logo.svg comm/mail/branding/icedove/TB-symbolic.svg
+devtools/startup/aboutdevtools/images/dev-edition-logo.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
+cp $DATA/debug_brand/icon.png comm/mail/themes/icon.png
+cp $DATA/debug_brand/icon64.png comm/mail/themes/icon64.png
+
+#Requirements for Icedove
+THNDR_SYS_URL="https://www.icedove.net/icedove/system-requirements/"
+ICEDV_SYS_URL="https://trisquel.info/wiki/icedove-requirements/"
+sed -i "s|$THNDR_SYS_URL|$ICEDV_SYS_URL|" comm/mail/branding/icedove/branding.nsi
+
+#Remove search engines inherited from firefox (remove all?).
+for r in amazon amazondotcn amazondotcom bing google mercadolibre mercadolivre yahoo-jp yahoo-jp-auctions
+do
+ rm -r comm/mail/components/search/extensions/$r
+done
+
+for r2 in amazon bing google yahoo
+do
+ find comm/suite -name $r2* -delete
+done
+
+# Reprocess search preconfiguration dump
+python3 $DATA/process-json-files.py . browser/components/extensions/schemas/
+
+#EO Debbuging tools
cat << EOF > comm/mail/branding/nightly/locales/en-US/brand.properties
brandShortName=Icedove
@@ -232,6 +256,13 @@ brandFullName=Icedove Mail
vendorShortName=Icedove
EOF
+BRAND_FTL_NTLY=comm/mail/branding/nightly/locales/en-US/brand.ftl
+BRAND_FTL_STD=comm/mail/branding/icedove/locales/en-US/brand.ftl
+sed -i '/shorter-name/s|Trisquel|Icedove|' $BRAND_FTL_NTLY
+sed -i '/short-name/s|Trisquel|Icedove|' $BRAND_FTL_NTLY
+sed -i '/full-name/s|Icedove Trisquel|Icedove Mail|' $BRAND_FTL_NTLY
+sed -i '/full-name/s|Icedove|Icedove Mail|' $BRAND_FTL_STD
+
cat << EOF > comm/mail/branding/nightly/locales/en-US/brand.dtd
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
--
GitLab