CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

thunderbird,firefox: standardize branding and about:Rights among firefox/thunderbird source

Browse source
This commit is contained in:
Luis Guzmán 2023-07-11 07:47:35 +00:00
parent fd9a2ab1d1
commit 46759b7399
6 changed files with 920 additions and 899 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
helpers/DATA/thunderbird/branding/disk.icns Normal file
View file

Binary file not shown.

BIN
helpers/DATA/thunderbird/branding/thunderbird.icns Normal file
View file

Binary file not shown.

763
helpers/DATA/thunderbird/debug_brand/debuglogo.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 43 KiB

Before After
Before After

817
helpers/DATA/thunderbird/debug_brand/debuglogo_gray.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 43 KiB

Before After
Before After

3
helpers/make-firefox
View file

@ -379,7 +379,7 @@ 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/,/<\/li>/d"
find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d"
find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/,/<\/li>/d"
find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/,/<\/li>/d"
#EO about: mods.
@ -430,6 +430,7 @@ cp -a $DATA/android/res/main/* mobile/android/geckoview/src/main/res
# Rebrand svg & debug tools & privacy logos
find devtools/client/themes/images/ -name aboutdebugging-firefox-*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
find devtools/client/themes/images/ -name aboutdebugging-fenix*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
find devtools/client/themes/images/ -name aboutdebugging-firefox-logo.svg | xargs -n1 cp $DATA/debug_brand/debuglogo_gray.svg
find browser/branding/ -name about-logo.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg

26
helpers/make-thunderbird
View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2022 Luis Guzmán <ark@switnet.org>
# Copyright (C) 2023 Luis Guzmán <ark@switnet.org>
# Copyright (C) 2020 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2019 David Trudgian <dave@trudgian.net>
#
@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=18
VERSION=19
. ./config
@ -179,6 +179,7 @@ s|www.mozilla.com/legal/privacy|trisquel.info/legal|g;
s/Trisquel Public/Mozilla Public/g;
s/Trisquel Foundation/Mozilla Foundation/g;
s/Trisquel Corporation/Mozilla Corporation/g;
s|this-firefox|this-abrowser|g;
"
echo "Running batch replace operation"
find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -iregex '.*third_party/rust.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
@ -251,25 +252,20 @@ 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"
find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-3/,$d'
find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/,/<\/li>/d"
find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/,/<\/li>/d"
find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/,/<\/li>/d"
sed -i 's/<a\ href\=\"https\:\/\/www.icedove.net\/\">Icedove\ Project<\/a>/<a\ href\=\"https\:\/\/www.trisquel.info\/\"\>Trisquel\ Project<\/a>/g' \
comm/mail/base/content/overrides/app-license.html
#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
echo "devtools/client/themes/images/aboutdebugging-fenix.svg \
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" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
cp $DATA/debug_brand/debuglogo_gray.svg devtools/client/themes/images/aboutdebugging-firefox-logo.svg
find devtools/client/themes/images/ -name aboutdebugging-firefox-*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
find devtools/client/themes/images/ -name aboutdebugging-fenix*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
find devtools/client/themes/images/ -name aboutdebugging-firefox-logo.svg | xargs -n1 cp $DATA/debug_brand/debuglogo_gray.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