tor-commits
Threads by month
- ----- 2025 -----
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
September 2023
- 1 participants
- 178 discussions

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.0-1-build3
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed new tag firefox-android-115.2.1-13.0-1-build3 at The Tor Project / Applications / firefox-android
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.3.0esr-13.0-1-build2
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed new tag tor-browser-115.3.0esr-13.0-1-build2 at The Tor Project / Applications / Tor Browser
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][maint-12.5] Use foursquare as domain front for snowflake
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build
Commits:
c490a775 by meskio at 2023-09-21T20:13:45+00:00
Use foursquare as domain front for snowflake
- - - - -
2 changed files:
- projects/common/bridges_list.snowflake.txt
- projects/tor-expert-bundle/pt_config.json
Changes:
=====================================
projects/common/bridges_list.snowflake.txt
=====================================
@@ -1,2 +1,2 @@
-snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
-snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
+snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
+snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
=====================================
projects/tor-expert-bundle/pt_config.json
=====================================
@@ -22,8 +22,8 @@
"obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0"
],
"snowflake" : [
- "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn",
- "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"
+ "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn",
+ "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"
]
}
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] Bug 41327: Disable UrlbarProviderInterventions
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
baa05b03 by Richard Pospesel at 2023-09-21T20:10:02+00:00
Bug 41327: Disable UrlbarProviderInterventions
- - - - -
3 changed files:
- browser/components/urlbar/UrlbarProvidersManager.sys.mjs
- browser/components/urlbar/UrlbarUtils.sys.mjs
- browser/components/urlbar/moz.build
Changes:
=====================================
browser/components/urlbar/UrlbarProvidersManager.sys.mjs
=====================================
@@ -51,8 +51,9 @@ var localProviderModules = {
"resource:///modules/UrlbarProviderHistoryUrlHeuristic.sys.mjs",
UrlbarProviderInputHistory:
"resource:///modules/UrlbarProviderInputHistory.sys.mjs",
- UrlbarProviderInterventions:
- "resource:///modules/UrlbarProviderInterventions.sys.mjs",
+ // disable as part of tor-browser#41327
+ // UrlbarProviderInterventions:
+ // "resource:///modules/UrlbarProviderInterventions.sys.mjs",
UrlbarProviderOmnibox: "resource:///modules/UrlbarProviderOmnibox.sys.mjs",
UrlbarProviderPlaces: "resource:///modules/UrlbarProviderPlaces.sys.mjs",
UrlbarProviderPreloadedSites:
=====================================
browser/components/urlbar/UrlbarUtils.sys.mjs
=====================================
@@ -21,8 +21,9 @@ ChromeUtils.defineESModuleGetters(lazy, {
SearchSuggestionController:
"resource://gre/modules/SearchSuggestionController.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
- UrlbarProviderInterventions:
- "resource:///modules/UrlbarProviderInterventions.sys.mjs",
+ // disable as part of tor-browser#41327
+ // UrlbarProviderInterventions:
+ // "resource:///modules/UrlbarProviderInterventions.sys.mjs",
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
UrlbarProviderSearchTips:
"resource:///modules/UrlbarProviderSearchTips.sys.mjs",
@@ -1387,20 +1388,22 @@ export var UrlbarUtils = {
return "tab";
case UrlbarUtils.RESULT_TYPE.TIP:
if (result.providerName === "UrlbarProviderInterventions") {
- switch (result.payload.type) {
- case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
- return "intervention_clear";
- case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
- return "intervention_refresh";
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
- return "intervention_update";
- default:
- return "intervention_unknown";
- }
+ return "intervention_unknown";
+ // disable as part of tor-browser#41327
+ // switch (result.payload.type) {
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
+ // return "intervention_clear";
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
+ // return "intervention_refresh";
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
+ // return "intervention_update";
+ // default:
+ // return "intervention_unknown";
+ // }
}
switch (result.payload.type) {
=====================================
browser/components/urlbar/moz.build
=====================================
@@ -30,7 +30,8 @@ EXTRA_JS_MODULES += [
"UrlbarProviderHeuristicFallback.sys.mjs",
"UrlbarProviderHistoryUrlHeuristic.sys.mjs",
"UrlbarProviderInputHistory.sys.mjs",
- "UrlbarProviderInterventions.sys.mjs",
+ # disable as part of tor-browser#41327
+ # "UrlbarProviderInterventions.sys.mjs",
"UrlbarProviderOmnibox.sys.mjs",
"UrlbarProviderOpenTabs.sys.mjs",
"UrlbarProviderPlaces.sys.mjs",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/baa05b0…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/baa05b0…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][base-browser-115.3.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
ffe81f9d by Pier Angelo Vendrame at 2023-09-21T19:52:47+00:00
fixup! Firefox preference overrides.
Switch to STIX Two Math.
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -585,7 +585,7 @@ pref("toolkit.winRegisterApplicationRestart", false);
pref("gfx.bundled-fonts.activate", 1);
#ifdef XP_MACOSX
-pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
+pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
// Armenian
pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman");
@@ -647,6 +647,10 @@ pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer, Menlo, Courier New");
pref("font.name-list.serif.x-mlym", "Noto Serif Malayalam, Times, Times New Roman");
pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam, Helvetica, Arial");
pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam, Menlo, Courier New");
+// Mathematics
+pref("font.name-list.serif.x-math", "STIX Two Math, Times, Times New Roman");
+pref("font.name-list.sans-serif.x-math", "STIX Two Math, Helvetica, Arial");
+pref("font.name-list.monospace.x-math", "STIX Two Math, Menlo, Courier New");
// Oriya
pref("font.name-list.serif.x-orya", "Noto Sans Oriya, Times, Times New Roman");
pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya, Helvetica, Arial");
@@ -675,7 +679,7 @@ pref("font.name-list.monospace.x-unicode", "Menlo, Courier New, Noto Sans Baline
#endif
#ifdef XP_WIN
-pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, MS ゴシック, MS PGothic, MS Pゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi, Noto Naskh Arabic, Noto Sans, Noto Serif");
+pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, MS ゴシック, MS PGothic, MS Pゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi, Noto Naskh Arabic, Noto Sans, Noto Serif");
// Arabic
pref("font.name-list.serif.ar", "Times New Roman, Noto Naskh Arabic");
@@ -752,7 +756,7 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S
#endif
#ifdef XP_LINUX
-pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Math, Tinos, Twemoji Mozilla");
+pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols 2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Two Math, Tinos, Twemoji Mozilla");
// Arabic
pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos");
@@ -835,9 +839,9 @@ pref("font.name-list.serif.x-mlym", "Noto Serif Malayalam, Tinos");
pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam, Arimo");
pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam, Cousine");
// Mathematics
-pref("font.name-list.serif.x-math", "STIX Math Regular, Tinos");
-pref("font.name-list.sans-serif.x-math", "STIX Math Regular, Arimo");
-pref("font.name-list.monospace.x-math", "STIX Math Regular, Cousine");
+pref("font.name-list.serif.x-math", "STIX Two Math, Tinos");
+pref("font.name-list.sans-serif.x-math", "STIX Two Math, Arimo");
+pref("font.name-list.monospace.x-math", "STIX Two Math, Cousine");
// Oriya
pref("font.name-list.serif.x-orya", "Noto Sans Oriya, Tinos");
pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya, Arimo");
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ffe81f9…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ffe81f9…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
47690e68 by Pier Angelo Vendrame at 2023-09-21T19:51:24+00:00
fixup! Firefox preference overrides.
Switch to STIX Two Math.
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -585,7 +585,7 @@ pref("toolkit.winRegisterApplicationRestart", false);
pref("gfx.bundled-fonts.activate", 1);
#ifdef XP_MACOSX
-pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
+pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Courier New, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Kailasa, Lucida Grande, Menlo, Monaco, PingFang HK, PingFang SC, PingFang TC, Songti SC, Songti TC, Tahoma, Thonburi, Times, Times New Roman, Verdana, STIX Two Math, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi");
// Armenian
pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Times, Times New Roman");
@@ -647,6 +647,10 @@ pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer, Menlo, Courier New");
pref("font.name-list.serif.x-mlym", "Noto Serif Malayalam, Times, Times New Roman");
pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam, Helvetica, Arial");
pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam, Menlo, Courier New");
+// Mathematics
+pref("font.name-list.serif.x-math", "STIX Two Math, Times, Times New Roman");
+pref("font.name-list.sans-serif.x-math", "STIX Two Math, Helvetica, Arial");
+pref("font.name-list.monospace.x-math", "STIX Two Math, Menlo, Courier New");
// Oriya
pref("font.name-list.serif.x-orya", "Noto Sans Oriya, Times, Times New Roman");
pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya, Helvetica, Arial");
@@ -675,7 +679,7 @@ pref("font.name-list.monospace.x-unicode", "Menlo, Courier New, Noto Sans Baline
#endif
#ifdef XP_WIN
-pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, MS ゴシック, MS PGothic, MS Pゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi, Noto Naskh Arabic, Noto Sans, Noto Serif");
+pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, MS ゴシック, MS PGothic, MS Pゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Javanese, Noto Sans Kayah Li, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Myanmar, Noto Sans Multani, Noto Sans Newa, Noto Sans New Tai Lue, Noto Sans NKo, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols 2, Noto Sans Symbols, Noto Sans Syriac, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh APT, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Tibetan, Noto Serif Yezidi, Noto Naskh Arabic, Noto Sans, Noto Serif");
// Arabic
pref("font.name-list.serif.ar", "Times New Roman, Noto Naskh Arabic");
@@ -752,7 +756,7 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S
#endif
#ifdef XP_LINUX
-pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Math, Tinos, Twemoji Mozilla");
+pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols 2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif NP Hmong, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Two Math, Tinos, Twemoji Mozilla");
// Arabic
pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos");
@@ -835,9 +839,9 @@ pref("font.name-list.serif.x-mlym", "Noto Serif Malayalam, Tinos");
pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam, Arimo");
pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam, Cousine");
// Mathematics
-pref("font.name-list.serif.x-math", "STIX Math Regular, Tinos");
-pref("font.name-list.sans-serif.x-math", "STIX Math Regular, Arimo");
-pref("font.name-list.monospace.x-math", "STIX Math Regular, Cousine");
+pref("font.name-list.serif.x-math", "STIX Two Math, Tinos");
+pref("font.name-list.sans-serif.x-math", "STIX Two Math, Arimo");
+pref("font.name-list.monospace.x-math", "STIX Two Math, Cousine");
// Oriya
pref("font.name-list.serif.x-orya", "Noto Sans Oriya, Tinos");
pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya, Arimo");
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47690e6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47690e6…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Bug 40893: Update fonts for Tor Browser 13.0.
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
16528f1c by Pier Angelo Vendrame at 2023-09-21T19:50:32+00:00
Bug 40893: Update fonts for Tor Browser 13.0.
- - - - -
4 changed files:
- projects/fonts/build
- projects/fonts/config
- projects/fonts/fetch-noto-fonts
- rbm.conf
Changes:
=====================================
projects/fonts/build
=====================================
@@ -1,40 +1,42 @@
#!/bin/bash
[% c("var/set_default_env") -%]
-distdir=/var/tmp/dist/fonts
+# This script runs outside containers
+distdir=/var/tmp/$(whoami)/dist/fonts
mkdir -p $distdir
mv noto-fonts-* noto-fonts
-[% FOREACH fontfile = c("var/noto_fonts_common");
- GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
+[% FOREACH family = c("var/noto_fonts_common");
+ GET 'cp noto-fonts/' _ family _ '/*.ttf $distdir/' _ "\n";
END; %]
-[% IF c("var/linux") %]
- [% FOREACH fontfile = c("var/noto_fonts_linux");
- GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
- END; %]
-[% END %]
-[% IF c("var/macos") %]
- [% FOREACH fontfile = c("var/noto_fonts_mac");
- GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
- END; %]
-[% END %]
-[% IF c("var/windows") %]
- [% FOREACH fontfile = c("var/noto_fonts_windows");
- GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
- END; %]
-[% END %]
+[% IF c("var/linux");
+ SET font_list = c("var/noto_fonts_linux");
+ ELSIF c("var/macos");
+ SET font_list = c("var/noto_fonts_mac");
+ ELSIF c("var/windows");
+ SET font_list = c("var/noto_fonts_windows");
+ END;
+ FOREACH family = font_list;
+ GET 'cp noto-fonts/' _ family _ '/* $distdir/' _ "\n";
+ END;
+%]
-[% IF c("var/linux") || c("var/macos") %]
- unzip -o 2.0.0.zip -d STIX
- cp "STIX/stixfonts-2.0.0/archive/STIXv1.1.1/Fonts/STIX-Word/STIXMath-Regular.otf" $distdir/
+[% IF c("var/have_stix") %]
+ cp "$rootdir/[% c('input_files_by_name/stix') %]" $distdir/
[% END %]
+
[% IF c("var/linux") %]
- cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/
+ unzip "$rootdir/[% c('input_files_by_name/arimo') %]"
+ cp Arimo-*/fonts/ttf/*.ttf Cousine-* Tinos-* NotoSans{JP,KR,SC,TC}-Regular.otf $distdir/
[% END %]
+
cp README.txt "$distdir/000_README.txt"
-cd /var/tmp/dist
+cd $distdir/..
[% c('tar', {
tar_src => [ 'fonts' ],
tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
}) %]
+
+# Additional cleanup since we are outside containers
+rm -rf /var/tmp/$(whoami)
=====================================
projects/fonts/config
=====================================
@@ -1,170 +1,181 @@
# vim: filetype=yaml sw=2
-version: '2'
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]"
+version: '3'
+filename: "[% project %]-[% c('version') %]-[% c('var/platform') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]"
container:
- use_container: 1
+ # We just copy files around, no need to use a container.
+ use_container: 0
var:
- noto_git_hash: 20bc5918912503bc1537a407a694738c33c048aa
+ # noto-monthly-release-23.9.1
+ noto_git_hash: c890f6fec6fa37740f23fffdd2a28e156f3837a3
# Use this way so that the script that downloads the fonts can access the
# lists of all the targets.
noto_fonts_common:
- - NotoSansAdlam-Regular.ttf
- - NotoSansBalinese-Regular.ttf
- - NotoSansBamum-Regular.ttf
- - NotoSansBassaVah-Regular.ttf
- - NotoSansBatak-Regular.ttf
- - NotoSansBengali-Regular.ttf
- - NotoSansBuginese-Regular.ttf
- - NotoSansBuhid-Regular.ttf
- - NotoSansCanadianAboriginal-Regular.ttf
- - NotoSansChakma-Regular.ttf
- - NotoSansCham-Regular.ttf
- - NotoSansCherokee-Regular.ttf
- - NotoSansCoptic-Regular.ttf
- - NotoSansDeseret-Regular.ttf
- - NotoSansDevanagari-Regular.ttf
- - NotoSansElbasan-Regular.ttf
- - NotoSansEthiopic-Regular.ttf
- - NotoSansGeorgian-Regular.ttf
- - NotoSansGrantha-Regular.ttf
- - NotoSansGujarati-Regular.ttf
- - NotoSansGunjalaGondi-Regular.ttf
- - NotoSansGurmukhi-Regular.ttf
- - NotoSansHanifiRohingya-Regular.ttf
- - NotoSansHanunoo-Regular.ttf
- - NotoSansKannada-Regular.ttf
- - NotoSansKhmer-Regular.ttf
- - NotoSansJavanese-Regular.ttf
- - NotoSansKayahLi-Regular.ttf
- - NotoSansKhojki-Regular.ttf
- - NotoSansKhudawadi-Regular.ttf
- - NotoSansLao-Regular.ttf
- - NotoSansLepcha-Regular.ttf
- - NotoSansLimbu-Regular.ttf
- - NotoSansLisu-Regular.ttf
- - NotoSansMahajani-Regular.ttf
- - NotoSansMalayalam-Regular.ttf
- - NotoSansMandaic-Regular.ttf
- - NotoSansMasaramGondi-Regular.ttf
- - NotoSansMedefaidrin-Regular.ttf
- - NotoSansMeeteiMayek-Regular.ttf
- - NotoSansMendeKikakui-Regular.ttf
- - NotoSansMiao-Regular.ttf
- - NotoSansModi-Regular.ttf
- - NotoSansMongolian-Regular.ttf
- - NotoSansMro-Regular.ttf
- - NotoSansMyanmar-Regular.ttf
- - NotoSansMultani-Regular.ttf
- - NotoSansNewa-Regular.ttf
- - NotoSansNewTaiLue-Regular.ttf
- - NotoSansNKo-Regular.ttf
- - NotoSansOlChiki-Regular.ttf
- - NotoSansOriya-Regular.ttf
- - NotoSansOsage-Regular.ttf
- - NotoSansOsmanya-Regular.ttf
- - NotoSansPahawhHmong-Regular.ttf
- - NotoSansPauCinHau-Regular.ttf
- - NotoSansRejang-Regular.ttf
- - NotoSansRunic-Regular.ttf
- - NotoSansSamaritan-Regular.ttf
- - NotoSansSaurashtra-Regular.ttf
- - NotoSansSharada-Regular.ttf
- - NotoSansShavian-Regular.ttf
- - NotoSansSinhala-Regular.ttf
- - NotoSansSoraSompeng-Regular.ttf
- - NotoSansSoyombo-Regular.ttf
- - NotoSansSundanese-Regular.ttf
- - NotoSansSylotiNagri-Regular.ttf
- - NotoSansSymbols2-Regular.ttf
- - NotoSansSymbols-Regular.ttf
- - NotoSansSyriac-Regular.ttf
- - NotoSansTagalog-Regular.ttf
- - NotoSansTagbanwa-Regular.ttf
- - NotoSansTaiLe-Regular.ttf
- - NotoSansTaiTham-Regular.ttf
- - NotoSansTaiViet-Regular.ttf
- - NotoSansTakri-Regular.ttf
- - NotoSansTamil-Regular.ttf
- - NotoSansTelugu-Regular.ttf
- - NotoSansThaana-Regular.ttf
- - NotoSansTifinaghAdrar-Regular.ttf
- - NotoSansTifinaghAgrawImazighen-Regular.ttf
- - NotoSansTifinaghAhaggar-Regular.ttf
- - NotoSansTifinaghAir-Regular.ttf
- - NotoSansTifinaghAPT-Regular.ttf
- - NotoSansTifinaghAzawagh-Regular.ttf
- - NotoSansTifinaghGhat-Regular.ttf
- - NotoSansTifinaghHawad-Regular.ttf
- - NotoSansTifinagh-Regular.ttf
- - NotoSansTifinaghRhissaIxa-Regular.ttf
- - NotoSansTifinaghSIL-Regular.ttf
- - NotoSansTifinaghTawellemmet-Regular.ttf
- - NotoSansTirhuta-Regular.ttf
- - NotoSansVai-Regular.ttf
- - NotoSansWancho-Regular.ttf
- - NotoSansWarangCiti-Regular.ttf
- - NotoSansYi-Regular.ttf
- - NotoSansZanabazarSquare-Regular.ttf
- - NotoSerifBalinese-Regular.ttf
- - NotoSerifBengali-Regular.ttf
- - NotoSerifDevanagari-Regular.ttf
- - NotoSerifDogra-Regular.ttf
- - NotoSerifEthiopic-Regular.ttf
- - NotoSerifGeorgian-Regular.ttf
- - NotoSerifGrantha-Regular.ttf
- - NotoSerifGujarati-Regular.ttf
- - NotoSerifGurmukhi-Regular.ttf
- - NotoSerifKannada-Regular.ttf
- - NotoSerifKhmer-Regular.ttf
- - NotoSerifKhojki-Regular.ttf
- - NotoSerifLao-Regular.ttf
- - NotoSerifMalayalam-Regular.ttf
- - NotoSerifMyanmar-Regular.ttf
- - NotoSerifNyiakengPuachueHmong-Regular.ttf
- - NotoSerifSinhala-Regular.ttf
- - NotoSerifTamil-Regular.ttf
- - NotoSerifTelugu-Regular.ttf
- - NotoSerifTibetan-Regular.ttf
- - NotoSerifYezidi-Regular.ttf
+ - NotoSansAdlam
+ - NotoSansBalinese
+ - NotoSansBamum
+ - NotoSansBassaVah
+ - NotoSansBatak
+ - NotoSansBengali
+ - NotoSansBuginese
+ - NotoSansBuhid
+ - NotoSansCanadianAboriginal
+ - NotoSansChakma
+ - NotoSansCham
+ - NotoSansCherokee
+ - NotoSansCoptic
+ - NotoSansDeseret
+ - NotoSansDevanagari
+ - NotoSansElbasan
+ - NotoSansEthiopic
+ - NotoSansGeorgian
+ - NotoSansGrantha
+ - NotoSansGujarati
+ - NotoSansGunjalaGondi
+ - NotoSansGurmukhi
+ - NotoSansHanifiRohingya
+ - NotoSansHanunoo
+ - NotoSansKannada
+ - NotoSansKhmer
+ - NotoSansJavanese
+ - NotoSansKayahLi
+ - NotoSansKhojki
+ - NotoSansKhudawadi
+ - NotoSansLao
+ - NotoSansLepcha
+ - NotoSansLimbu
+ - NotoSansLisu
+ - NotoSansMahajani
+ - NotoSansMalayalam
+ - NotoSansMandaic
+ - NotoSansMasaramGondi
+ - NotoSansMedefaidrin
+ - NotoSansMeeteiMayek
+ - NotoSansMendeKikakui
+ - NotoSansMiao
+ - NotoSansModi
+ - NotoSansMongolian
+ - NotoSansMro
+ - NotoSansMyanmar
+ - NotoSansMultani
+ - NotoSansNewa
+ - NotoSansNewTaiLue
+ - NotoSansNKo
+ - NotoSansOlChiki
+ - NotoSansOriya
+ - NotoSansOsage
+ - NotoSansOsmanya
+ - NotoSansPahawhHmong
+ - NotoSansPauCinHau
+ - NotoSansRejang
+ - NotoSansRunic
+ - NotoSansSamaritan
+ - NotoSansSaurashtra
+ - NotoSansSharada
+ - NotoSansShavian
+ - NotoSansSinhala
+ - NotoSansSoraSompeng
+ - NotoSansSoyombo
+ - NotoSansSundanese
+ - NotoSansSylotiNagri
+ - NotoSansSymbols2
+ - NotoSansSymbols
+ - NotoSansSyriac
+ - NotoSansTagalog
+ - NotoSansTagbanwa
+ - NotoSansTaiLe
+ - NotoSansTaiTham
+ - NotoSansTaiViet
+ - NotoSansTakri
+ - NotoSansTamil
+ - NotoSansTelugu
+ - NotoSansThaana
+ - NotoSansTifinagh
+ - NotoSansTirhuta
+ - NotoSansVai
+ - NotoSansWancho
+ - NotoSansWarangCiti
+ - NotoSansYi
+ - NotoSansZanabazarSquare
+ - NotoSerifBalinese
+ - NotoSerifBengali
+ - NotoSerifDevanagari
+ - NotoSerifDogra
+ - NotoSerifEthiopic
+ - NotoSerifGeorgian
+ - NotoSerifGrantha
+ - NotoSerifGujarati
+ - NotoSerifGurmukhi
+ - NotoSerifKannada
+ - NotoSerifKhmer
+ - NotoSerifKhojki
+ - NotoSerifLao
+ - NotoSerifMalayalam
+ - NotoSerifMyanmar
+ - NotoSerifNPHmong
+ - NotoSerifSinhala
+ - NotoSerifTamil
+ - NotoSerifTelugu
+ - NotoSerifTibetan
+ - NotoSerifYezidi
noto_fonts_linux:
- - Arimo-Regular.ttf
- - Arimo-Bold.ttf
- - Arimo-Italic.ttf
- - Arimo-BoldItalic.ttf
- - Cousine-Regular.ttf
- - Tinos-Regular.ttf
- - Tinos-Bold.ttf
- - Tinos-Italic.ttf
- - Tinos-BoldItalic.ttf
- - NotoNaskhArabic-Regular.ttf
- - NotoSansArmenian-Regular.ttf
- - NotoSansHebrew-Regular.ttf
- - NotoSansSymbols-Regular.ttf
- - NotoSansSymbols2-Regular.ttf
- - NotoSansThaana-Regular.ttf
- - NotoSansThai-Regular.ttf
- - NotoSerifArmenian-Regular.ttf
- - NotoSerifHebrew-Regular.ttf
- - NotoSerifThai-Regular.ttf
+ - NotoNaskhArabic
+ - NotoSansArmenian
+ - NotoSansHebrew
+ - NotoSansSymbols
+ - NotoSansSymbols2
+ - NotoSansThaana
+ - NotoSansThai
+ - NotoSerifArmenian
+ - NotoSerifHebrew
+ - NotoSerifThai
noto_fonts_mac:
- - NotoSansArmenian-Regular.ttf
- - NotoSansHebrew-Regular.ttf
- - NotoSansThaana-Regular.ttf
- - NotoSerifArmenian-Regular.ttf
- - NotoSerifHebrew-Regular.ttf
+ - NotoSansArmenian
+ - NotoSansHebrew
+ - NotoSansThaana
+ - NotoSerifArmenian
+ - NotoSerifHebrew
noto_fonts_windows:
- - NotoNaskhArabic-Regular.ttf
- - NotoSans-Regular.ttf
- - NotoSerif-Regular.ttf
+ - NotoNaskhArabic
+ - NotoSans
+ - NotoSerif
+
+ have_stix: '[% c("var/linux") || c("var/macos") %]'
input_files:
- - project: container-image
- filename: README.txt
- filename: 'noto-fonts-[% c("var/noto_git_hash") %]-[% c("version") %]'
name: noto-fonts
exec: '[% INCLUDE "fetch-noto-fonts" %]'
+ - URL: https://github.com/googlefonts/Arimo/archive/302dc85954f887248b4ad442b0966e…
+ sha256sum: 1d06a61c69ab8a7edd6e2b79e38dcb3c5b572033f12de5cde5c3ea7caded2717
+ name: arimo
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 1f224341677c5ceaa717417d1cb94efbdb276801b3ab1ccea697eb3a8057b6ac
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 82755a6d4b12067daabf89eb5bf48d52b9fea4073a59792d331651510a901728
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 64e8ed603232b28eceebe0d18838a5e62297605203b33720d775ed628cdc222b
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 829e776e4929eb6467838b92c7b700085fac2073801e6b54b224661affb34688
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 971d6af5fcb3a0c05535a92a635fb63a86ea5eb935639c9b864be33f3bfaba80
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 0cd67b90617a03a69a815e758d0649d00f2be48a0cb570615e94e8e5a13aae2e
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: 0f949a3fa0e23cd0ca94a0c4784bd8f9efb99c20070b9f73b5fd592b49c092ad
+ enable: '[% c("var/linux") %]'
+ - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e…
+ sha256sum: cf264a22292950ca1679b2ade07e9e6ecb26c649ab70975d0e113f979efa827a
+ enable: '[% c("var/linux") %]'
# Noto Sans CJK Version 2.004
- URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f…
sha256sum: dff723ba59d57d136764a04b9b2d03205544f7cd785a711442d6d2d085ac5073
@@ -178,6 +189,7 @@ input_files:
- URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f…
sha256sum: 5bab0cb3c1cf89dde07c4a95a4054b195afbcfe784d69d75c340780712237537
enable: '[% c("var/linux") %]'
- - URL: https://github.com/stipub/stixfonts/archive/2.0.0.zip
- sha256sum: 4327a16797dabebedce28a9075671730e22c7f74831b24b1fb91e27faec5a235
- enable: '[% c("var/linux") || c("var/macos") %]'
+ - URL: https://github.com/stipub/stixfonts/raw/v2.13b171/fonts/static_otf/STIXTwoM…
+ sha256sum: 3a5f3f26f40d5698b3c62dd085d48d6663696a3f80825aab8b553d5097518e8c
+ name: stix
+ enable: '[% c("var/have_stix") %]'
=====================================
projects/fonts/fetch-noto-fonts
=====================================
@@ -6,7 +6,7 @@ OUT_DIR="[% dest_dir %]/noto-fonts-[% c("var/noto_git_hash") %]-[% c("version")
pushd "$REPO_DIR"
git init
-git remote add origin https://github.com/googlefonts/noto-fonts.git
+git remote add origin https://github.com/notofonts/notofonts.github.io.git
git fetch --depth 1 origin "[% c('var/noto_git_hash') %]"
git checkout "[% c('var/noto_git_hash') %]"
@@ -15,11 +15,16 @@ mkdir "$OUT_DIR"
[%
platforms = [c("var/noto_fonts_common"), c("var/noto_fonts_linux"), c("var/noto_fonts_mac"), c("var/noto_fonts_windows")];
FOREACH platform = platforms;
- FOREACH fontfile = platform;
- GET 'font=$(find hinted -name ' _ fontfile _ ' -print | head -1)' _ "\n";
- # Do not use find -exec, because if the file does not exist, we have an
- # error only in the following phases. In this way, we try to fail earlier.
- GET 'cp -u $font "$OUT_DIR/"' _ "\n";
+ FOREACH family = platform;
+%]
+ font_src="fonts/[% family %]/hinted/ttf"
+ font_dst="$OUT_DIR/[% family %]"
+ mkdir -p $font_dst
+ # Use the wildcard for cases such as NotoSansTifinagh.
+ # But then to avoid NotoSans* matching everything on Windows, we create a
+ # directory for each family.
+ find $font_src -name '*-Regular.ttf' -and -not -name '*UI-Regular.ttf' -exec cp {} $font_dst/ \;
+[%
END;
END; %]
=====================================
rbm.conf
=====================================
@@ -396,6 +396,7 @@ targets:
merge_aars: 1
var:
android: 1
+ platform: android
compiler: android-toolchain
android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]'
CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang'
@@ -503,6 +504,7 @@ targets:
compress_tar: gz
var:
linux: 1
+ platform: linux
compiler: gcc
configure_opt: '[% c("var/configure_opt_project") %]'
# Only build Namecoin for linux on nightly
@@ -574,6 +576,7 @@ targets:
windows:
var:
windows: 1
+ platform: windows
container:
suite: bullseye
arch: amd64
@@ -655,6 +658,7 @@ targets:
macos:
var:
macos: 1
+ platform: macos
osname: macos
container:
suite: bullseye
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser-build][main] Use foursquare as domain front for snowflake
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
cb513eec by meskio at 2023-09-21T19:08:08+00:00
Use foursquare as domain front for snowflake
- - - - -
2 changed files:
- projects/common/bridges_list.snowflake.txt
- projects/tor-expert-bundle/pt_config.json
Changes:
=====================================
projects/common/bridges_list.snowflake.txt
=====================================
@@ -1,2 +1,2 @@
-snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
-snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
+snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
+snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
=====================================
projects/tor-expert-bundle/pt_config.json
=====================================
@@ -24,8 +24,8 @@
"obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0"
],
"snowflake" : [
- "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn",
- "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"
+ "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn",
+ "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"
]
}
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/tor-browser][tor-browser-115.3.0esr-13.0-1] Bug 41327: Disable UrlbarProviderInterventions
by richard (@richard) 21 Sep '23
by richard (@richard) 21 Sep '23
21 Sep '23
richard pushed to branch tor-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
82d6eaf6 by Richard Pospesel at 2023-09-21T18:42:31+00:00
Bug 41327: Disable UrlbarProviderInterventions
- - - - -
3 changed files:
- browser/components/urlbar/UrlbarProvidersManager.sys.mjs
- browser/components/urlbar/UrlbarUtils.sys.mjs
- browser/components/urlbar/moz.build
Changes:
=====================================
browser/components/urlbar/UrlbarProvidersManager.sys.mjs
=====================================
@@ -51,8 +51,9 @@ var localProviderModules = {
"resource:///modules/UrlbarProviderHistoryUrlHeuristic.sys.mjs",
UrlbarProviderInputHistory:
"resource:///modules/UrlbarProviderInputHistory.sys.mjs",
- UrlbarProviderInterventions:
- "resource:///modules/UrlbarProviderInterventions.sys.mjs",
+ // disable as part of tor-browser#41327
+ // UrlbarProviderInterventions:
+ // "resource:///modules/UrlbarProviderInterventions.sys.mjs",
UrlbarProviderOmnibox: "resource:///modules/UrlbarProviderOmnibox.sys.mjs",
UrlbarProviderPlaces: "resource:///modules/UrlbarProviderPlaces.sys.mjs",
UrlbarProviderPreloadedSites:
=====================================
browser/components/urlbar/UrlbarUtils.sys.mjs
=====================================
@@ -21,8 +21,9 @@ ChromeUtils.defineESModuleGetters(lazy, {
SearchSuggestionController:
"resource://gre/modules/SearchSuggestionController.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
- UrlbarProviderInterventions:
- "resource:///modules/UrlbarProviderInterventions.sys.mjs",
+ // disable as part of tor-browser#41327
+ // UrlbarProviderInterventions:
+ // "resource:///modules/UrlbarProviderInterventions.sys.mjs",
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
UrlbarProviderSearchTips:
"resource:///modules/UrlbarProviderSearchTips.sys.mjs",
@@ -1387,20 +1388,22 @@ export var UrlbarUtils = {
return "tab";
case UrlbarUtils.RESULT_TYPE.TIP:
if (result.providerName === "UrlbarProviderInterventions") {
- switch (result.payload.type) {
- case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
- return "intervention_clear";
- case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
- return "intervention_refresh";
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
- case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
- return "intervention_update";
- default:
- return "intervention_unknown";
- }
+ return "intervention_unknown";
+ // disable as part of tor-browser#41327
+ // switch (result.payload.type) {
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
+ // return "intervention_clear";
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
+ // return "intervention_refresh";
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:
+ // case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:
+ // return "intervention_update";
+ // default:
+ // return "intervention_unknown";
+ // }
}
switch (result.payload.type) {
=====================================
browser/components/urlbar/moz.build
=====================================
@@ -30,7 +30,8 @@ EXTRA_JS_MODULES += [
"UrlbarProviderHeuristicFallback.sys.mjs",
"UrlbarProviderHistoryUrlHeuristic.sys.mjs",
"UrlbarProviderInputHistory.sys.mjs",
- "UrlbarProviderInterventions.sys.mjs",
+ # disable as part of tor-browser#41327
+ # "UrlbarProviderInterventions.sys.mjs",
"UrlbarProviderOmnibox.sys.mjs",
"UrlbarProviderOpenTabs.sys.mjs",
"UrlbarProviderPlaces.sys.mjs",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/82d6eaf…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/82d6eaf…
You're receiving this email because of your account on gitlab.torproject.org.
1
0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] Bug 42089: Remove ability to submit site support requests
by Dan Ballard (@dan) 21 Sep '23
by Dan Ballard (@dan) 21 Sep '23
21 Sep '23
Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android
Commits:
8456bbb8 by clairehurst at 2023-09-21T16:13:32+00:00
Bug 42089: Remove ability to submit site support requests
- - - - -
13 changed files:
- android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorage.kt
- android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepository.kt
- android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/cookiehandling/CookieBannersStorage.kt
- fenix/app/metrics.yaml
- fenix/app/pings.yaml
- fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsController.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsInteractor.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt
- fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannersStorageExt.kt
- fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt
- fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml
Changes:
=====================================
android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorage.kt
=====================================
@@ -21,7 +21,7 @@ import org.mozilla.geckoview.StorageController
*/
class GeckoCookieBannersStorage(
runtime: GeckoRuntime,
- private val reportSiteDomainsRepository: ReportSiteDomainsRepository,
+// private val reportSiteDomainsRepository: ReportSiteDomainsRepository,
) : CookieBannersStorage {
private val geckoStorage: StorageController = runtime.storageController
@@ -34,13 +34,13 @@ class GeckoCookieBannersStorage(
setGeckoException(uri, DISABLED, privateBrowsing)
}
- override suspend fun isSiteDomainReported(siteDomain: String): Boolean {
- return reportSiteDomainsRepository.isSiteDomainReported(siteDomain)
- }
-
- override suspend fun saveSiteDomain(siteDomain: String) {
- reportSiteDomainsRepository.saveSiteDomain(siteDomain)
- }
+// override suspend fun isSiteDomainReported(siteDomain: String): Boolean {
+// return reportSiteDomainsRepository.isSiteDomainReported(siteDomain)
+// }
+//
+// override suspend fun saveSiteDomain(siteDomain: String) {
+// reportSiteDomainsRepository.saveSiteDomain(siteDomain)
+// }
override suspend fun addPersistentExceptionInPrivateMode(uri: String) {
setPersistentPrivateGeckoException(uri, DISABLED)
=====================================
android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepository.kt
=====================================
@@ -12,64 +12,64 @@ import androidx.datastore.preferences.core.stringPreferencesKey
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
-import mozilla.components.browser.engine.gecko.cookiebanners.ReportSiteDomainsRepository.PreferencesKeys.REPORT_SITE_DOMAINS
+//import mozilla.components.browser.engine.gecko.cookiebanners.ReportSiteDomainsRepository.PreferencesKeys.REPORT_SITE_DOMAINS
import mozilla.components.support.base.log.logger.Logger
import java.io.IOException
/**
* A repository to save reported site domains with the datastore API.
*/
-class ReportSiteDomainsRepository(
- private val dataStore: DataStore<Preferences>,
-) {
-
- companion object {
- const val SEPARATOR = "@<;>@"
- const val REPORT_SITE_DOMAINS_REPOSITORY_NAME = "report_site_domains_preferences"
- const val PREFERENCE_KEY_NAME = "report_site_domains"
- }
-
- private object PreferencesKeys {
- val REPORT_SITE_DOMAINS = stringPreferencesKey(PREFERENCE_KEY_NAME)
- }
-
- /**
- * Check if the given site's domain url is saved locally.
- * @param siteDomain the [siteDomain] that will be checked.
- */
- suspend fun isSiteDomainReported(siteDomain: String): Boolean {
- return dataStore.data
- .catch { exception ->
- if (exception is IOException) {
- Logger.error("Error reading preferences.", exception)
- emit(emptyPreferences())
- } else {
- throw exception
- }
- }.map { preferences ->
- val reportSiteDomainsString = preferences[REPORT_SITE_DOMAINS] ?: ""
- val reportSiteDomainsList =
- reportSiteDomainsString.split(SEPARATOR).filter { it.isNotEmpty() }
- reportSiteDomainsList.contains(siteDomain)
- }.first()
- }
-
- /**
- * Save the given site's domain url in datastore to keep it persistent locally.
- * This method gets called after the site domain was reported with Nimbus.
- * @param siteDomain the [siteDomain] that will be saved.
- */
- suspend fun saveSiteDomain(siteDomain: String) {
- dataStore.edit { preferences ->
- val siteDomainsPreferences = preferences[REPORT_SITE_DOMAINS] ?: ""
- val siteDomainsList = siteDomainsPreferences.split(SEPARATOR).filter { it.isNotEmpty() }
- if (siteDomainsList.contains(siteDomain)) {
- return@edit
- }
- val domains = mutableListOf<String>()
- domains.addAll(siteDomainsList)
- domains.add(siteDomain)
- preferences[REPORT_SITE_DOMAINS] = domains.joinToString(SEPARATOR)
- }
- }
-}
+//class ReportSiteDomainsRepository(
+// private val dataStore: DataStore<Preferences>,
+//) {
+//
+// companion object {
+// const val SEPARATOR = "@<;>@"
+// const val REPORT_SITE_DOMAINS_REPOSITORY_NAME = "report_site_domains_preferences"
+// const val PREFERENCE_KEY_NAME = "report_site_domains"
+// }
+//
+// private object PreferencesKeys {
+// val REPORT_SITE_DOMAINS = stringPreferencesKey(PREFERENCE_KEY_NAME)
+// }
+//
+// /**
+// * Check if the given site's domain url is saved locally.
+// * @param siteDomain the [siteDomain] that will be checked.
+// */
+// suspend fun isSiteDomainReported(siteDomain: String): Boolean {
+// return dataStore.data
+// .catch { exception ->
+// if (exception is IOException) {
+// Logger.error("Error reading preferences.", exception)
+// emit(emptyPreferences())
+// } else {
+// throw exception
+// }
+// }.map { preferences ->
+// val reportSiteDomainsString = preferences[REPORT_SITE_DOMAINS] ?: ""
+// val reportSiteDomainsList =
+// reportSiteDomainsString.split(SEPARATOR).filter { it.isNotEmpty() }
+// reportSiteDomainsList.contains(siteDomain)
+// }.first()
+// }
+//
+// /**
+// * Save the given site's domain url in datastore to keep it persistent locally.
+// * This method gets called after the site domain was reported with Nimbus.
+// * @param siteDomain the [siteDomain] that will be saved.
+// */
+// suspend fun saveSiteDomain(siteDomain: String) {
+// dataStore.edit { preferences ->
+// val siteDomainsPreferences = preferences[REPORT_SITE_DOMAINS] ?: ""
+// val siteDomainsList = siteDomainsPreferences.split(SEPARATOR).filter { it.isNotEmpty() }
+// if (siteDomainsList.contains(siteDomain)) {
+// return@edit
+// }
+// val domains = mutableListOf<String>()
+// domains.addAll(siteDomainsList)
+// domains.add(siteDomain)
+// preferences[REPORT_SITE_DOMAINS] = domains.joinToString(SEPARATOR)
+// }
+// }
+//}
=====================================
android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/cookiehandling/CookieBannersStorage.kt
=====================================
@@ -24,14 +24,14 @@ interface CookieBannersStorage {
* Check if the given site's domain url is saved locally.
* @param siteDomain the [siteDomain] that will be checked.
*/
- suspend fun isSiteDomainReported(siteDomain: String): Boolean
+// suspend fun isSiteDomainReported(siteDomain: String): Boolean
/**
* Save the given site's domain url in datastore to keep it persistent locally.
* This method gets called after the site domain was reported with Nimbus.
* @param siteDomain the [siteDomain] that will be saved.
*/
- suspend fun saveSiteDomain(siteDomain: String)
+// suspend fun saveSiteDomain(siteDomain: String)
/**
* Set persistently the [CookieBannerHandlingMode.DISABLED] mode for the given [uri] in
=====================================
fenix/app/metrics.yaml
=====================================
@@ -7738,62 +7738,62 @@ cookie_banners:
metadata:
tags:
- Privacy&Security
- report_site_domain:
- type: url
- description: |
- A user can report a site domain(Ex. for https://edition.cnn.com/
- site domain will be cnn.com) when the cookie banner reducer is not
- working from the cookie banner details panel.
- lifetime: ping
- send_in_pings:
- - cookie-banner-report-site
- bugs:
- - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
- data_reviews:
- - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
- data_sensitivity:
- - technical
- - interaction
- notification_emails:
- - android-probes(a)mozilla.com
- expires: 119
- metadata:
- tags:
- - Privacy&Security
- report_site_cancel_button:
- type: event
- description: |
- The user has pressed the report site domain cancel button
- from the cookie banner reducer details panel.
- bugs:
- - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
- data_reviews:
- - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
- data_sensitivity:
- - interaction
- notification_emails:
- - android-probes(a)mozilla.com
- expires: 119
- metadata:
- tags:
- - Privacy&Security
- report_domain_site_button:
- type: event
- description: |
- The user has pressed the report site domain button
- from the cookie banner reducer details panel.
- bugs:
- - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
- data_reviews:
- - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
- data_sensitivity:
- - interaction
- notification_emails:
- - android-probes(a)mozilla.com
- expires: 119
- metadata:
- tags:
- - Privacy&Security
+# report_site_domain:
+# type: url
+# description: |
+# A user can report a site domain(Ex. for https://edition.cnn.com/
+# site domain will be cnn.com) when the cookie banner reducer is not
+# working from the cookie banner details panel.
+# lifetime: ping
+# send_in_pings:
+# - cookie-banner-report-site
+# bugs:
+# - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
+# data_reviews:
+# - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
+# data_sensitivity:
+# - technical
+# - interaction
+# notification_emails:
+# - android-probes(a)mozilla.com
+# expires: 119
+# metadata:
+# tags:
+# - Privacy&Security
+# report_site_cancel_button:
+# type: event
+# description: |
+# The user has pressed the report site domain cancel button
+# from the cookie banner reducer details panel.
+# bugs:
+# - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
+# data_reviews:
+# - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
+# data_sensitivity:
+# - interaction
+# notification_emails:
+# - android-probes(a)mozilla.com
+# expires: 119
+# metadata:
+# tags:
+# - Privacy&Security
+# report_domain_site_button:
+# type: event
+# description: |
+# The user has pressed the report site domain button
+# from the cookie banner reducer details panel.
+# bugs:
+# - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
+# data_reviews:
+# - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
+# data_sensitivity:
+# - interaction
+# notification_emails:
+# - android-probes(a)mozilla.com
+# expires: 119
+# metadata:
+# tags:
+# - Privacy&Security
site_permissions:
prompt_shown:
=====================================
fenix/app/pings.yaml
=====================================
@@ -65,15 +65,15 @@ spoc:
notification_emails:
- android-probes(a)mozilla.com
-cookie-banner-report-site:
- description: |
- This ping is needed when the cookie banner reducer doesn't work on
- a website, and the user wants to report the site.
- This ping doesn't include a client id.
- include_client_id: false
- bugs:
- - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
- data_reviews:
- - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
- notification_emails:
- - android-probes(a)mozilla.com
+#cookie-banner-report-site:
+# description: |
+# This ping is needed when the cookie banner reducer doesn't work on
+# a website, and the user wants to report the site.
+# This ping doesn't include a client id.
+# include_client_id: false
+# bugs:
+# - https://bugzilla.mozilla.org/show_bug.cgi?id=1805450
+# data_reviews:
+# - https://github.com/mozilla-mobile/firefox-android/pull/1298#pullrequestrevi…
+# notification_emails:
+# - android-probes(a)mozilla.com
=====================================
fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
=====================================
@@ -16,7 +16,7 @@ import mozilla.components.browser.domains.autocomplete.BaseDomainAutocompletePro
import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
import mozilla.components.browser.engine.gecko.GeckoEngine
import mozilla.components.browser.engine.gecko.cookiebanners.GeckoCookieBannersStorage
-import mozilla.components.browser.engine.gecko.cookiebanners.ReportSiteDomainsRepository
+//import mozilla.components.browser.engine.gecko.cookiebanners.ReportSiteDomainsRepository
import mozilla.components.browser.engine.gecko.fetch.GeckoViewFetchClient
import mozilla.components.browser.engine.gecko.permission.GeckoSitePermissionsStorage
import mozilla.components.browser.icons.BrowserIcons
@@ -197,14 +197,14 @@ class Core(
)
}
- private val Context.dataStore by preferencesDataStore(
- name = ReportSiteDomainsRepository.REPORT_SITE_DOMAINS_REPOSITORY_NAME,
- )
+// private val Context.dataStore by preferencesDataStore(
+// name = ReportSiteDomainsRepository.REPORT_SITE_DOMAINS_REPOSITORY_NAME,
+// )
val cookieBannersStorage by lazyMonitored {
GeckoCookieBannersStorage(
geckoRuntime,
- ReportSiteDomainsRepository(context.dataStore),
+// ReportSiteDomainsRepository(context.dataStore),
)
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt
=====================================
@@ -94,7 +94,7 @@ class ProtectionsView(
binding.cookieBannerItem.apply {
setContent {
FirefoxTheme {
- if (cookieBannerMode == CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED) {
+ if (cookieBannerMode == CookieBannerUIMode.SITE_NOT_SUPPORTED) {
CookieBannerItem(
label = label,
cookieBannerUIMode = cookieBannerMode,
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsController.kt
=====================================
@@ -55,7 +55,7 @@ interface CookieBannerDetailsController {
/**
* @see [CookieBannerDetailsInteractor.handleRequestSiteSupportPressed]
*/
- fun handleRequestSiteSupportPressed()
+// fun handleRequestSiteSupportPressed()
}
/**
@@ -144,37 +144,37 @@ class DefaultCookieBannerDetailsController(
}
}
- override fun handleRequestSiteSupportPressed() {
- val tab = requireNotNull(browserStore.state.findTabOrCustomTab(sessionId)) {
- "A session is required to report site domain"
- }
- CookieBanners.reportDomainSiteButton.record(NoExtras())
- ioScope.launch {
- val siteDomain = getTabDomain(tab)
- siteDomain?.let { domain ->
- withContext(Dispatchers.Main) {
- protectionsStore.dispatch(ProtectionsAction.RequestReportSiteDomain(domain))
- CookieBanners.reportSiteDomain.set(domain)
- Pings.cookieBannerReportSite.submit()
- protectionsStore.dispatch(
- ProtectionsAction.UpdateCookieBannerMode(
- cookieBannerUIMode = CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED,
- ),
- )
- fragment.activity?.getRootView()?.let { view ->
- showSnackBar(
- view,
- context.getString(R.string.cookie_banner_handling_report_site_snack_bar_text_2),
- FenixSnackbar.LENGTH_LONG,
- )
- }
- withContext(Dispatchers.IO) {
- cookieBannersStorage.saveSiteDomain(domain)
- }
- }
- }
- }
- }
+// override fun handleRequestSiteSupportPressed() {
+// val tab = requireNotNull(browserStore.state.findTabOrCustomTab(sessionId)) {
+// "A session is required to report site domain"
+// }
+// CookieBanners.reportDomainSiteButton.record(NoExtras())
+// ioScope.launch {
+// val siteDomain = getTabDomain(tab)
+// siteDomain?.let { domain ->
+// withContext(Dispatchers.Main) {
+// protectionsStore.dispatch(ProtectionsAction.RequestReportSiteDomain(domain))
+// CookieBanners.reportSiteDomain.set(domain)
+// Pings.cookieBannerReportSite.submit()
+// protectionsStore.dispatch(
+// ProtectionsAction.UpdateCookieBannerMode(
+// cookieBannerUIMode = CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED,
+// ),
+// )
+// fragment.activity?.getRootView()?.let { view ->
+// showSnackBar(
+// view,
+// context.getString(R.string.cookie_banner_handling_report_site_snack_bar_text_2),
+// FenixSnackbar.LENGTH_LONG,
+// )
+// }
+// withContext(Dispatchers.IO) {
+// cookieBannersStorage.saveSiteDomain(domain)
+// }
+// }
+// }
+// }
+// }
@VisibleForTesting
internal suspend fun clearSiteData(tab: SessionState) {
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsInteractor.kt
=====================================
@@ -21,7 +21,7 @@ interface CookieBannerDetailsInteractor {
/**
* Called whenever the user press request support site domain.
*/
- fun handleRequestSiteSupportPressed()
+// fun handleRequestSiteSupportPressed()
}
/**
@@ -45,7 +45,7 @@ class DefaultCookieBannerDetailsInteractor(
controller.handleTogglePressed(vale)
}
- override fun handleRequestSiteSupportPressed() {
- controller.handleRequestSiteSupportPressed()
- }
+// override fun handleRequestSiteSupportPressed() {
+// controller.handleRequestSiteSupportPressed()
+// }
}
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt
=====================================
@@ -57,7 +57,7 @@ class CookieBannerHandlingDetailsView(
when (state.cookieBannerUIMode) {
CookieBannerUIMode.ENABLE -> setUiForExceptionMode(state)
CookieBannerUIMode.DISABLE -> setUiForExceptionMode(state)
- CookieBannerUIMode.SITE_NOT_SUPPORTED -> setUiForReportSiteMode()
+// CookieBannerUIMode.SITE_NOT_SUPPORTED -> setUiForReportSiteMode()
else -> {}
}
}
@@ -67,19 +67,19 @@ class CookieBannerHandlingDetailsView(
bindSwitch(state.cookieBannerUIMode)
}
- private fun setUiForReportSiteMode() {
- binding.cancelButton.visibility = View.VISIBLE
- binding.requestSupport.visibility = View.VISIBLE
- binding.cookieBannerSwitch.visibility = View.GONE
- binding.requestSupport.setOnClickListener {
- interactor.handleRequestSiteSupportPressed()
- onDismiss.invoke()
- }
- binding.cancelButton.setOnClickListener {
- CookieBanners.reportSiteCancelButton.record(NoExtras())
- interactor.onBackPressed()
- }
- }
+// private fun setUiForReportSiteMode() {
+// binding.cancelButton.visibility = View.VISIBLE
+// binding.requestSupport.visibility = View.VISIBLE
+// binding.cookieBannerSwitch.visibility = View.GONE
+// binding.requestSupport.setOnClickListener {
+// interactor.handleRequestSiteSupportPressed()
+// onDismiss.invoke()
+// }
+// binding.cancelButton.setOnClickListener {
+// CookieBanners.reportSiteCancelButton.record(NoExtras())
+// interactor.onBackPressed()
+// }
+// }
@VisibleForTesting
internal fun bindTitle(url: String, state: CookieBannerUIMode) {
=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannersStorageExt.kt
=====================================
@@ -24,15 +24,15 @@ suspend fun CookieBannersStorage.getCookieBannerUIMode(
tab: SessionState,
): CookieBannerUIMode {
return if (context.settings().shouldUseCookieBanner) {
- val isSiteDomainReported = withContext(Dispatchers.IO) {
- val host = tab.content.url.toUri().host.orEmpty()
- val siteDomain = context.components.publicSuffixList.getPublicSuffixPlusOne(host).await()
- siteDomain?.let { isSiteDomainReported(it) }
- }
-
- if (isSiteDomainReported == true) {
- return CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED
- }
+// val isSiteDomainReported = withContext(Dispatchers.IO) {
+// val host = tab.content.url.toUri().host.orEmpty()
+// val siteDomain = context.components.publicSuffixList.getPublicSuffixPlusOne(host).await()
+// siteDomain?.let { isSiteDomainReported(it) }
+// }
+//
+// if (isSiteDomainReported == true) {
+// return CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED
+// }
val hasException = withContext(Dispatchers.IO) {
hasException(tab.content.url, tab.content.private)
=====================================
fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt
=====================================
@@ -52,9 +52,9 @@ sealed class ProtectionsAction : Action {
*
* @param url to report.
*/
- data class RequestReportSiteDomain(
- val url: String,
- ) : ProtectionsAction()
+// data class RequestReportSiteDomain(
+// val url: String,
+// ) : ProtectionsAction()
/**
* Indicates that cookie banner handling mode has been updated.
@@ -167,10 +167,10 @@ enum class CookieBannerUIMode(
* REQUEST_UNSUPPORTED_SITE_SUBMITTED - The user submitted a request
* for adding support for cookie banner handling for the domain.
*/
- REQUEST_UNSUPPORTED_SITE_SUBMITTED(
- R.string.reduce_cookie_banner_unsupported_site_request_submitted_2,
- R.drawable.ic_cookies_disabled,
- ),
+// REQUEST_UNSUPPORTED_SITE_SUBMITTED(
+// R.string.reduce_cookie_banner_unsupported_site_request_submitted_2,
+// R.drawable.ic_cookies_disabled,
+// ),
/**
HIDE - All the cookie banner handling in the tracking panel is hidden.
@@ -243,9 +243,9 @@ fun protectionsStateReducer(
is ProtectionsAction.ToggleCookieBannerHandlingProtectionEnabled -> state.copy(
cookieBannerUIMode = action.cookieBannerUIMode,
)
- is ProtectionsAction.RequestReportSiteDomain -> state.copy(
- url = action.url,
- )
+// is ProtectionsAction.RequestReportSiteDomain -> state.copy(
+// url = action.url,
+// )
is ProtectionsAction.UpdateCookieBannerMode -> state.copy(
cookieBannerUIMode = action.cookieBannerUIMode,
)
=====================================
fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml
=====================================
@@ -64,40 +64,40 @@
app:switchShowIcon="false"
app:switchTitle="@string/preferences_cookie_banner_reduction" />
- <androidx.appcompat.widget.AppCompatButton
- android:id="@+id/cancel_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:layout_marginTop="16dp"
- android:background="@android:color/transparent"
- android:gravity="center"
- android:minHeight="48dp"
- android:text="@string/cookie_banner_handling_details_site_is_not_supported_cancel_button"
- android:layout_marginEnd="16dp"
- android:textAllCaps="true"
- android:textColor="@color/fx_mobile_text_color_accent"
- android:textSize="14sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/details" />
+<!-- <androidx.appcompat.widget.AppCompatButton-->
+<!-- android:id="@+id/cancel_button"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:visibility="gone"-->
+<!-- android:layout_marginTop="16dp"-->
+<!-- android:background="@android:color/transparent"-->
+<!-- android:gravity="center"-->
+<!-- android:minHeight="48dp"-->
+<!-- android:text="@string/cookie_banner_handling_details_site_is_not_supported_cancel_button"-->
+<!-- android:layout_marginEnd="16dp"-->
+<!-- android:textAllCaps="true"-->
+<!-- android:textColor="@color/fx_mobile_text_color_accent"-->
+<!-- android:textSize="14sp"-->
+<!-- app:layout_constraintEnd_toEndOf="parent"-->
+<!-- app:layout_constraintStart_toStartOf="parent"-->
+<!-- app:layout_constraintTop_toBottomOf="@id/details" />-->
- <androidx.appcompat.widget.AppCompatButton
- android:id="@+id/request_support"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:layout_marginTop="16dp"
- android:background="@android:color/transparent"
- android:gravity="center"
- android:minHeight="48dp"
- android:layout_marginEnd="16dp"
- android:text="@string/cookie_banner_handling_details_site_is_not_supported_request_support_button_2"
- android:textAllCaps="true"
- android:textColor="@color/fx_mobile_text_color_accent"
- android:textSize="14sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintStart_toEndOf="@+id/cancel_button"
- app:layout_constraintTop_toBottomOf="@id/details" />
+<!-- <androidx.appcompat.widget.AppCompatButton-->
+<!-- android:id="@+id/request_support"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:visibility="gone"-->
+<!-- android:layout_marginTop="16dp"-->
+<!-- android:background="@android:color/transparent"-->
+<!-- android:gravity="center"-->
+<!-- android:minHeight="48dp"-->
+<!-- android:layout_marginEnd="16dp"-->
+<!-- android:text="@string/cookie_banner_handling_details_site_is_not_supported_request_support_button_2"-->
+<!-- android:textAllCaps="true"-->
+<!-- android:textColor="@color/fx_mobile_text_color_accent"-->
+<!-- android:textSize="14sp"-->
+<!-- app:layout_constraintEnd_toEndOf="parent"-->
+<!-- app:layout_constraintLeft_toLeftOf="parent"-->
+<!-- app:layout_constraintStart_toEndOf="@+id/cancel_button"-->
+<!-- app:layout_constraintTop_toBottomOf="@id/details" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/845…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/845…
You're receiving this email because of your account on gitlab.torproject.org.
1
0