September 2024 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 3 commits: fixup! Bug 7494: Create local home page for TBB.
by morgan (＠morgan) 11 Sep '24

11 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 5c745f1b by Henry Wilkes at 2024-09-11T02:30:03+00:00 fixup! Bug 7494: Create local home page for TBB. Bug 43087: Share an onion-pattern with about:torconnect. Also use the grey pattern when user prefers-contrast or forced-colors. - - - - - ad0cf4a8 by Henry Wilkes at 2024-09-11T02:30:03+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 43087: Add a dark variant for the onion-pattern. - - - - - 941338bc by Henry Wilkes at 2024-09-11T02:30:03+00:00 Bug 43087: Add onion-pattern to be used on Tor pages. - - - - - 10 changed files: - browser/components/abouttor/content/aboutTor.css - browser/components/abouttor/content/aboutTor.html - − browser/components/abouttor/content/onion-pattern.svg - browser/components/abouttor/jar.mn - toolkit/components/torconnect/content/aboutTorConnect.css - toolkit/components/torconnect/content/aboutTorConnect.html - toolkit/components/torconnect/jar.mn - toolkit/themes/shared/desktop-jar.inc.mn - + toolkit/themes/shared/onion-pattern.css - toolkit/components/torconnect/content/onion-pattern.svg → toolkit/themes/shared/onion-pattern.svg Changes: ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -1,4 +1,5 @@ @import url("chrome://global/skin/tor-colors.css"); +@import url("chrome://global/skin/onion-pattern.css"); body { margin: 0; @@ -17,16 +18,11 @@ body { * NOTE: Since the body has "auto" height, the other "1fr" flex row will * not shrink to zero, but will instead shrink to a minimum size of * 75px = (150px * 1fr / 2fr) */ - ". . ." minmax(150px, 2fr) + ". . ." minmax(var(--onion-pattern-height), 2fr) /* NOTE: "form" will be given a maximum width of --form-max-width. */ / 1fr minmax(max-content, var(--form-max-width)) 1fr; justify-items: center; padding-inline: 20px; - background: - local - url("chrome://browser/content/abouttor/onion-pattern.svg") - center bottom - repeat-x; } body:not(.initialized) { @@ -188,6 +184,8 @@ body:not(.show-tor-check) #tor-check { --focus-outline: var(--focus-outline-width) solid var(--focus-outline-color); --in-content-focus-outline-color: var(--focus-outline-color); --in-content-focus-outline: var(--focus-outline); + --onion-pattern-stroke-color: #3e0663; + --onion-pattern-fill-color: #350556; } #tor-check { ===================================== browser/components/abouttor/content/aboutTor.html ===================================== @@ -28,7 +28,7 @@ ></script> <script src="chrome://browser/content/abouttor/aboutTor.js"></script> </head> - <body> + <body class="onion-pattern-background"> <h1> <img id="tor-browser-logo" ===================================== browser/components/abouttor/content/onion-pattern.svg deleted ===================================== @@ -1,27 +0,0 @@ -<svg fill="none" height="150" viewBox="0 0 1200 150" width="1200" xmlns="http://www.w3.org/2000/svg"> - <path clip-rule="evenodd" d="m75 145c38.66 0 70-31.34 70-70 0-38.6599-31.34-70-70-70-38.6599 0-70 31.3401-70 70 0 38.66 31.3401 70 70 70zm0 5c41.421 0 75-33.579 75-75 0-41.4214-33.579-75-75-75-41.4214 0-75 33.5786-75 75 0 41.421 33.5786 75 75 75z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m75 126.25c28.305 0 51.25-22.945 51.25-51.25 0-28.3046-22.945-51.25-51.25-51.25-28.3046 0-51.25 22.9454-51.25 51.25 0 28.305 22.9454 51.25 51.25 51.25zm0 5c31.066 0 56.25-25.184 56.25-56.25s-25.184-56.25-56.25-56.25-56.25 25.184-56.25 56.25 25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m75 107.5c17.9493 0 32.5-14.5507 32.5-32.5s-14.5507-32.5-32.5-32.5-32.5 14.5507-32.5 32.5 14.5507 32.5 32.5 32.5zm0 5c20.7107 0 37.5-16.7893 37.5-37.5s-16.7893-37.5-37.5-37.5-37.5 16.7893-37.5 37.5 16.7893 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/> - - <path clip-rule="evenodd" d="m75 88.75c7.5939 0 13.75-6.1561 13.75-13.75s-6.1561-13.75-13.75-13.75-13.75 6.1561-13.75 13.75 6.1561 13.75 13.75 13.75zm0 5c10.3553 0 18.75-8.3947 18.75-18.75s-8.3947-18.75-18.75-18.75-18.75 8.3947-18.75 18.75 8.3947 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/> - <path d="m294.846 0c2.762 0 5.017 2.24554 4.836 5.001-2.573 39.0897-35.095 69.999-74.836 69.999s-72.262-30.9093-74.836-69.999c-.181-2.75546 2.075-5.001 4.836-5.001z" fill="#3e0663"/> - <path d="m294.846 75c2.762 0 5.017 2.2455 4.836 5.001-2.573 39.09-35.095 69.999-74.836 69.999s-72.262-30.909-74.836-69.999c-.181-2.7555 2.075-5.001 4.836-5.001z" fill="#350556"/> - <path clip-rule="evenodd" d="m374.692 145c38.66 0 70-31.34 70-70 0-38.6599-31.34-70-70-70s-70 31.3401-70 70c0 38.66 31.34 70 70 70zm0 5c41.422 0 75-33.579 75-75 0-41.4214-33.578-75-75-75-41.421 0-75 33.5786-75 75 0 41.421 33.579 75 75 75z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m374.692 126.25c28.305 0 51.25-22.945 51.25-51.25 0-28.3046-22.945-51.25-51.25-51.25-28.304 0-51.25 22.9454-51.25 51.25 0 28.305 22.946 51.25 51.25 51.25zm0 5c31.066 0 56.25-25.184 56.25-56.25s-25.184-56.25-56.25-56.25-56.25 25.184-56.25 56.25 25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m374.692 107.5c17.95 0 32.5-14.5507 32.5-32.5s-14.55-32.5-32.5-32.5c-17.949 0-32.5 14.5507-32.5 32.5s14.551 32.5 32.5 32.5zm0 5c20.711 0 37.5-16.7893 37.5-37.5s-16.789-37.5-37.5-37.5c-20.71 0-37.5 16.7893-37.5 37.5s16.79 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m374.692 88.75c7.594 0 13.75-6.1561 13.75-13.75s-6.156-13.75-13.75-13.75-13.75 6.1561-13.75 13.75 6.156 13.75 13.75 13.75zm0 5c10.356 0 18.75-8.3947 18.75-18.75s-8.394-18.75-18.75-18.75c-10.355 0-18.75 8.3947-18.75 18.75s8.395 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/> - <path d="m449.692 4.99998c0-2.76142 2.246-5.0173044 5.001-4.835902 39.09 2.573422 69.999 35.095022 69.999 74.835922 0 39.741-30.909 72.262-69.999 74.836-2.755.181-5.001-2.075-5.001-4.836z" fill="#3e0663"/> - <path d="m524.692 4.99998c0-2.76142 2.246-5.0173044 5.001-4.835902 39.09 2.573422 69.999 35.095022 69.999 74.835922 0 39.741-30.909 72.262-69.999 74.836-2.755.181-5.001-2.075-5.001-4.836z" fill="#350556"/> - <path clip-rule="evenodd" d="m674.692 145c38.66 0 70-31.34 70-70 0-38.6599-31.34-70-70-70s-70 31.3401-70 70c0 38.66 31.34 70 70 70zm0 5c41.422 0 75-33.579 75-75 0-41.4214-33.578-75-75-75-41.421 0-75 33.5786-75 75 0 41.421 33.579 75 75 75z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m674.692 126.25c28.305 0 51.25-22.945 51.25-51.25 0-28.3046-22.945-51.25-51.25-51.25-28.304 0-51.25 22.9454-51.25 51.25 0 28.305 22.946 51.25 51.25 51.25zm0 5c31.066 0 56.25-25.184 56.25-56.25s-25.184-56.25-56.25-56.25-56.25 25.184-56.25 56.25 25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m674.692 107.5c17.95 0 32.5-14.5507 32.5-32.5s-14.55-32.5-32.5-32.5c-17.949 0-32.5 14.5507-32.5 32.5s14.551 32.5 32.5 32.5zm0 5c20.711 0 37.5-16.7893 37.5-37.5s-16.789-37.5-37.5-37.5c-20.71 0-37.5 16.7893-37.5 37.5s16.79 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m674.692 88.75c7.594 0 13.75-6.1561 13.75-13.75s-6.156-13.75-13.75-13.75-13.75 6.1561-13.75 13.75 6.156 13.75 13.75 13.75zm0 5c10.356 0 18.75-8.3947 18.75-18.75s-8.394-18.75-18.75-18.75c-10.355 0-18.75 8.3947-18.75 18.75s8.395 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/> - <path d="m894.538 0c2.762 0 5.018 2.24554 4.836 5.001-2.573 39.0897-35.095 69.999-74.836 69.999-39.74 0-72.262-30.9093-74.836-69.999-.181-2.75546 2.075-5.001 4.836-5.001z" fill="#3e0663"/> - <path d="m894.538 75c2.762 0 5.018 2.2455 4.836 5.001-2.573 39.09-35.095 69.999-74.836 69.999-39.74 0-72.262-30.909-74.836-69.999-.181-2.7555 2.075-5.001 4.836-5.001z" fill="#350556"/> - <path clip-rule="evenodd" d="m974.385 145c38.655 0 69.995-31.34 69.995-70 0-38.6599-31.34-70-69.995-70-38.66 0-70 31.3401-70 70 0 38.66 31.34 70 70 70zm0 5c41.425 0 74.995-33.579 74.995-75 0-41.4214-33.57-75-74.995-75-41.422 0-75 33.5786-75 75 0 41.421 33.578 75 75 75z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m974.385 126.25c28.305 0 51.245-22.945 51.245-51.25 0-28.3046-22.94-51.25-51.245-51.25s-51.25 22.9454-51.25 51.25c0 28.305 22.945 51.25 51.25 51.25zm0 5c31.065 0 56.245-25.184 56.245-56.25s-25.18-56.25-56.245-56.25c-31.066 0-56.25 25.184-56.25 56.25s25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m974.385 107.5c17.949 0 32.495-14.5507 32.495-32.5s-14.546-32.5-32.495-32.5c-17.95 0-32.5 14.5507-32.5 32.5s14.55 32.5 32.5 32.5zm0 5c20.71 0 37.495-16.7893 37.495-37.5s-16.785-37.5-37.495-37.5c-20.711 0-37.5 16.7893-37.5 37.5s16.789 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/> - <path clip-rule="evenodd" d="m974.385 88.75c7.593 0 13.75-6.1561 13.75-13.75s-6.157-13.75-13.75-13.75c-7.594 0-13.75 6.1561-13.75 13.75s6.156 13.75 13.75 13.75zm0 5c10.355 0 18.75-8.3947 18.75-18.75s-8.395-18.75-18.75-18.75c-10.356 0-18.75 8.3947-18.75 18.75s8.394 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/> - <path d="m1199.38 145c0 2.761-2.24 5.017-5 4.836-39.09-2.573-70-35.095-70-74.836 0-39.7409 30.91-72.26248 70-74.835903 2.76-.1814017 5 2.074493 5 4.835913z" fill="#3e0663"/> - <path d="m1124.38 145c0 2.761-2.24 5.017-5 4.836-39.09-2.573-70-35.095-70-74.836 0-39.7409 30.91-72.26248 70-74.835903 2.76-.1814017 5 2.074493 5 4.835913z" fill="#350556"/> -</svg> ===================================== browser/components/abouttor/jar.mn ===================================== @@ -7,4 +7,3 @@ browser.jar: content/browser/abouttor/26a1-high-voltage.svg (content/26a1-high-voltage.svg) content/browser/abouttor/2728-sparkles.svg (content/2728-sparkles.svg) content/browser/abouttor/2764-red-heart.svg (content/2764-red-heart.svg) - content/browser/abouttor/onion-pattern.svg (content/onion-pattern.svg) ===================================== toolkit/components/torconnect/content/aboutTorConnect.css ===================================== @@ -3,6 +3,7 @@ @import url("chrome://global/skin/error-pages.css"); @import url("chrome://global/skin/tor-colors.css"); +@import url("chrome://global/skin/onion-pattern.css"); :root { --onion-opacity: 1; @@ -250,13 +251,8 @@ form#locationDropdown select { body.aboutTorConnect { justify-content: space-between; - background: - local - url("chrome://global/content/torconnect/onion-pattern.svg") - center bottom - repeat-x; /* Always reserve 150px for the background, plus 15px padding with content. */ - padding-block-end: 175px; + padding-block-end: calc(var(--onion-pattern-height) + 15px); } body.aboutTorConnect .title { ===================================== toolkit/components/torconnect/content/aboutTorConnect.html ===================================== @@ -19,7 +19,7 @@ src="chrome://global/content/elements/moz-toggle.mjs" ></script> </head> - <body class="aboutTorConnect"> + <body class="aboutTorConnect onion-pattern-background"> <div id="progressBar" hidden="hidden"> <div id="progressSolid"></div> <div id="progressBackground"></div> ===================================== toolkit/components/torconnect/jar.mn ===================================== @@ -9,7 +9,6 @@ toolkit.jar: content/global/torconnect/bridge.svg (content/bridge.svg) content/global/torconnect/connection-failure.svg (content/connection-failure.svg) content/global/torconnect/connection-location.svg (content/connection-location.svg) - content/global/torconnect/onion-pattern.svg (content/onion-pattern.svg) content/global/torconnect/tor-connect.svg (content/tor-connect.svg) content/global/torconnect/tor-not-connected-to-connected-animated.svg (content/tor-not-connected-to-connected-animated.svg) content/global/torconnect/tor-connect-broken.svg (content/tor-connect-broken.svg) ===================================== toolkit/themes/shared/desktop-jar.inc.mn ===================================== @@ -42,6 +42,8 @@ skin/classic/global/notification.css (../../shared/notification.css) skin/classic/global/numberinput.css (../../shared/numberinput.css) skin/classic/global/offlineSupportPages.css (../../shared/offlineSupportPages.css) + skin/classic/global/onion-pattern.css (../../shared/onion-pattern.css) + skin/classic/global/onion-pattern.svg (../../shared/onion-pattern.svg) skin/classic/global/popup.css (../../shared/popup.css) skin/classic/global/popupnotification.css (../../shared/popupnotification.css) skin/classic/global/splitter.css (../../shared/splitter.css) ===================================== toolkit/themes/shared/onion-pattern.css ===================================== @@ -0,0 +1,18 @@ +:root { + /* color-grey-light-20, color-grey-dark-40 */ + --onion-pattern-stroke-color: light-dark(#f0f0f4, #3a3944); + /* color-grey-light-10, color-grey-dark-60 */ + --onion-pattern-fill-color: light-dark(#f9f9fb, #2b2a33); + --onion-pattern-height: 150px; +} + +.onion-pattern-background { + -moz-context-properties: stroke, fill; + stroke: var(--onion-pattern-stroke-color); + fill: var(--onion-pattern-fill-color); + background: + local + url("chrome://global/skin/onion-pattern.svg") + center bottom + repeat-x; +} ===================================== toolkit/components/torconnect/content/onion-pattern.svg → toolkit/themes/shared/onion-pattern.svg ===================================== @@ -1,30 +1,30 @@ <svg width="1200" height="150" viewBox="0 0 1200 150" fill="none" xmlns="http://www.w3.org/2000/svg"> -<circle cx="3" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="3" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="3" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="3" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<path d="M223 0C225.761 0 228.017 2.24554 227.836 5.001C225.262 44.0907 192.741 75 153 75C113.259 75 80.7375 44.0907 78.1641 5.001C77.9827 2.24554 80.2386 0 83 0H223Z" fill="#D7D7DB" fill-opacity="0.3"/> -<path d="M223 75C225.761 75 228.017 77.2455 227.836 80.001C225.262 119.091 192.741 150 153 150C113.259 150 80.7375 119.091 78.1641 80.001C77.9827 77.2455 80.2386 75 83 75H223Z" fill="#D7D7DB" fill-opacity="0.2"/> -<circle cx="303" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="303" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="303" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="303" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<path d="M378 5C378 2.23859 380.246 -0.0173187 383.001 0.164093C422.091 2.7375 453 35.2591 453 75C453 114.741 422.091 147.262 383.001 149.836C380.246 150.017 378 147.761 378 145V5Z" fill="#D7D7DB" fill-opacity="0.3"/> -<path d="M453 5C453 2.23859 455.246 -0.0173187 458.001 0.164093C497.091 2.7375 528 35.2591 528 75C528 114.741 497.091 147.262 458.001 149.836C455.246 150.017 453 147.761 453 145V5Z" fill="#D7D7DB" fill-opacity="0.2"/> -<circle cx="603" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="603" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="603" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="603" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<path d="M823 0C825.761 0 828.017 2.24554 827.836 5.001C825.262 44.0907 792.741 75 753 75C713.259 75 680.738 44.0907 678.164 5.001C677.983 2.24554 680.239 0 683 0H823Z" fill="#D7D7DB" fill-opacity="0.3"/> -<path d="M823 75C825.761 75 828.017 77.2455 827.836 80.001C825.262 119.091 792.741 150 753 150C713.259 150 680.738 119.091 678.164 80.001C677.983 77.2455 680.239 75 683 75H823Z" fill="#D7D7DB" fill-opacity="0.2"/> -<circle cx="903" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="903" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="903" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="903" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<path d="M1128 145C1128 147.761 1125.75 150.017 1123 149.836C1083.91 147.262 1053 114.741 1053 75C1053 35.2591 1083.91 2.73751 1123 0.164089C1125.75 -0.0173134 1128 2.23858 1128 5V145Z" fill="#D7D7DB" fill-opacity="0.3"/> -<path d="M1053 145C1053 147.761 1050.75 150.017 1048 149.836C1008.91 147.262 978 114.741 978 75C978 35.2591 1008.91 2.73751 1048 0.164089C1050.75 -0.0173134 1053 2.23858 1053 5V145Z" fill="#D7D7DB" fill-opacity="0.2"/> -<circle cx="1203" cy="75" r="72.5" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="1203" cy="75" r="53.75" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="1203" cy="75" r="35" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> -<circle cx="1203" cy="75" r="16.25" stroke="#D7D7DB" stroke-opacity="0.3" stroke-width="5"/> +<circle cx="3" cy="75" r="72.5" stroke="context-stroke" stroke-width="5"/> +<circle cx="3" cy="75" r="53.75" stroke="context-stroke" stroke-width="5"/> +<circle cx="3" cy="75" r="35" stroke="context-stroke" stroke-width="5"/> +<circle cx="3" cy="75" r="16.25" stroke="context-stroke" stroke-width="5"/> +<path d="M223 0C225.761 0 228.017 2.24554 227.836 5.001C225.262 44.0907 192.741 75 153 75C113.259 75 80.7375 44.0907 78.1641 5.001C77.9827 2.24554 80.2386 0 83 0H223Z" fill="context-stroke"/> +<path d="M223 75C225.761 75 228.017 77.2455 227.836 80.001C225.262 119.091 192.741 150 153 150C113.259 150 80.7375 119.091 78.1641 80.001C77.9827 77.2455 80.2386 75 83 75H223Z" fill="context-fill"/> +<circle cx="303" cy="75" r="72.5" stroke="context-stroke" stroke-width="5"/> +<circle cx="303" cy="75" r="53.75" stroke="context-stroke" stroke-width="5"/> +<circle cx="303" cy="75" r="35" stroke="context-stroke" stroke-width="5"/> +<circle cx="303" cy="75" r="16.25" stroke="context-stroke" stroke-width="5"/> +<path d="M378 5C378 2.23859 380.246 -0.0173187 383.001 0.164093C422.091 2.7375 453 35.2591 453 75C453 114.741 422.091 147.262 383.001 149.836C380.246 150.017 378 147.761 378 145V5Z" fill="context-stroke"/> +<path d="M453 5C453 2.23859 455.246 -0.0173187 458.001 0.164093C497.091 2.7375 528 35.2591 528 75C528 114.741 497.091 147.262 458.001 149.836C455.246 150.017 453 147.761 453 145V5Z" fill="context-fill"/> +<circle cx="603" cy="75" r="72.5" stroke="context-stroke" stroke-width="5"/> +<circle cx="603" cy="75" r="53.75" stroke="context-stroke" stroke-width="5"/> +<circle cx="603" cy="75" r="35" stroke="context-stroke" stroke-width="5"/> +<circle cx="603" cy="75" r="16.25" stroke="context-stroke" stroke-width="5"/> +<path d="M823 0C825.761 0 828.017 2.24554 827.836 5.001C825.262 44.0907 792.741 75 753 75C713.259 75 680.738 44.0907 678.164 5.001C677.983 2.24554 680.239 0 683 0H823Z" fill="context-stroke"/> +<path d="M823 75C825.761 75 828.017 77.2455 827.836 80.001C825.262 119.091 792.741 150 753 150C713.259 150 680.738 119.091 678.164 80.001C677.983 77.2455 680.239 75 683 75H823Z" fill="context-fill"/> +<circle cx="903" cy="75" r="72.5" stroke="context-stroke" stroke-width="5"/> +<circle cx="903" cy="75" r="53.75" stroke="context-stroke" stroke-width="5"/> +<circle cx="903" cy="75" r="35" stroke="context-stroke" stroke-width="5"/> +<circle cx="903" cy="75" r="16.25" stroke="context-stroke" stroke-width="5"/> +<path d="M1128 145C1128 147.761 1125.75 150.017 1123 149.836C1083.91 147.262 1053 114.741 1053 75C1053 35.2591 1083.91 2.73751 1123 0.164089C1125.75 -0.0173134 1128 2.23858 1128 5V145Z" fill="context-stroke"/> +<path d="M1053 145C1053 147.761 1050.75 150.017 1048 149.836C1008.91 147.262 978 114.741 978 75C978 35.2591 1008.91 2.73751 1048 0.164089C1050.75 -0.0173134 1053 2.23858 1053 5V145Z" fill="context-fill"/> +<circle cx="1203" cy="75" r="72.5" stroke="context-stroke" stroke-width="5"/> +<circle cx="1203" cy="75" r="53.75" stroke="context-stroke" stroke-width="5"/> +<circle cx="1203" cy="75" r="35" stroke="context-stroke" stroke-width="5"/> +<circle cx="1203" cy="75" r="16.25" stroke="context-stroke" stroke-width="5"/> </svg> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b2ed2b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b2ed2b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Bug 7494: Create local home page for TBB.
by morgan (＠morgan) 11 Sep '24

11 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: b2ed2b65 by Henry Wilkes at 2024-09-11T02:13:21+00:00 fixup! Bug 7494: Create local home page for TBB. Bug 43115: Restore search bar height in about:tor. Also set the inner border radius of the search input to zero. - - - - - 1 changed file: - browser/components/abouttor/content/aboutTor.css Changes: ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -143,6 +143,7 @@ body:not(.show-tor-check) #tor-check { flex: 1 0 auto; min-width: 200px; min-height: var(--logo-size); + box-sizing: content-box; margin: 0; padding-block: var(--form-outer-padding); padding-inline-end: var(--form-padding); @@ -153,6 +154,8 @@ body:not(.show-tor-check) #tor-check { /* Make sure clickable area does not extend beyond the form's border. */ border-start-start-radius: var(--form-radius); border-end-start-radius: var(--form-radius); + border-start-end-radius: 0; + border-end-end-radius: 0; /* Focus and outline styling move to the parent. */ background: none; border: none; @@ -162,14 +165,16 @@ body:not(.show-tor-check) #tor-check { #onionize-toggle { flex: 0 0 auto; font-weight: 500; + justify-content: center; padding-block: var(--form-outer-padding); padding-inline-end: var(--form-outer-padding); border-start-end-radius: var(--form-radius); border-end-end-radius: var(--form-radius); + border-start-start-radius: 0; + border-end-start-radius: 0; padding-inline-start: 0; /* Non-clickable gap between input and toggle. */ margin-inline-start: 0.5em; - } @media not ((prefers-contrast) or (forced-colors)) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b2ed2b6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b2ed2b6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Bug 7494: Create local home page for TBB.
by morgan (＠morgan) 11 Sep '24

11 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 22170540 by Henry Wilkes at 2024-09-11T02:09:21+00:00 fixup! Bug 7494: Create local home page for TBB. Bug 43131: Reduce layout jank when loading about:tor. We wait until the initialization is complete before we reveal the page content. So on refresh, the page just shows a single flash, but no change in layout. We also speed up the usual page load by having l10n load both the stable and testing headings at initiation, rather than waiting for the "InitialData" event from the page actor. In the case where we have an update to show, we wait a little longer for the l10n to complete. - - - - - 5 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/abouttor/AboutTorChild.sys.mjs - browser/components/abouttor/content/aboutTor.css - browser/components/abouttor/content/aboutTor.html - browser/components/abouttor/content/aboutTor.js Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -513,6 +513,7 @@ let JSWINDOWACTORS = { events: { DOMContentLoaded: {}, + L10nMutationsFinished: {}, SubmitSearchOnionize: { wantUntrusted: true }, }, }, ===================================== browser/components/abouttor/AboutTorChild.sys.mjs ===================================== @@ -16,6 +16,12 @@ export class AboutTorChild extends JSWindowActorChild { case "SubmitSearchOnionize": this.sendAsyncMessage("AboutTor:SetSearchOnionize", !!event.detail); break; + case "L10nMutationsFinished": + // Pass on chrome-only event for completed localization to content. + this.contentWindow.dispatchEvent( + new this.contentWindow.CustomEvent("L10nMutationsFinished") + ); + break; } } } ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -29,6 +29,13 @@ body { repeat-x; } +body:not(.initialized) { + /* Hide the components before the page is initialized. + * NOTE: The layout can still be adjusted or measured in this time since we + * use visibility rather than `display: none`. */ + visibility: hidden; +} + h1 { grid-area: heading; display: flex; @@ -45,6 +52,14 @@ h1 { flex: 0 0 auto; } +body.is-testing #tor-browser-home-heading-stable { + display: none; +} + +body:not(.is-testing) #tor-browser-home-heading-testing { + display: none; +} + #tor-check { grid-area: tor-check; max-width: var(--form-max-width); ===================================== browser/components/abouttor/content/aboutTor.html ===================================== @@ -35,7 +35,14 @@ alt="" src="chrome://branding/content/about-logo.svg" /> - <span id="tor-browser-home-heading-text"></span> + <span + id="tor-browser-home-heading-stable" + data-l10n-id="tor-browser-home-heading-stable" + ></span> + <span + id="tor-browser-home-heading-testing" + data-l10n-id="tor-browser-home-heading-testing" + ></span> </h1> <p id="tor-check"> <img ===================================== browser/components/abouttor/content/aboutTor.js ===================================== @@ -137,12 +137,7 @@ const MessageArea = { } // Set heading. - document.l10n.setAttributes( - document.getElementById("tor-browser-home-heading-text"), - this._isStable - ? "tor-browser-home-heading-stable" - : "tor-browser-home-heading-testing" - ); + document.body.classList.toggle("is-testing", !this._isStable); document.body.classList.toggle("show-tor-check", !this._torConnectEnabled); @@ -167,6 +162,20 @@ const MessageArea = { "shown-message" ); } + + // In the case where we set the update message, we are still waiting for the + // l10n message to complete. We wait until then before showing the content. + if (document.hasPendingL10nMutations) { + window.addEventListener( + "L10nMutationsFinished", + () => { + document.body.classList.add("initialized"); + }, + { once: true } + ); + } else { + document.body.classList.add("initialized"); + } }, }; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2217054… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2217054… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 2 commits: fixup! Bug 7494: Create local home page for TBB.
by morgan (＠morgan) 11 Sep '24

11 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: f10b95b6 by Henry Wilkes at 2024-09-10T10:18:33+01:00 fixup! Bug 7494: Create local home page for TBB. Bug 42746: Extend prefers-contrast rules to include forced-colors. We also add a border to #tor-check to ensure it stands out with forced-colors. - - - - - d547cefb by Henry Wilkes at 2024-09-10T10:19:43+01:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 42746: Extend prefers-contrast rules to include forced-colors. - - - - - 2 changed files: - browser/components/abouttor/content/aboutTor.css - browser/components/torcircuit/content/torCircuitPanel.css Changes: ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -52,9 +52,11 @@ h1 { display: flex; gap: 10px; align-items: center; - padding-inline: 24px; - padding-block: 12px; + padding-inline: 23px; + padding-block: 11px; + border: 1px solid var(--in-content-box-border-color); border-radius: 8px; + background-color: var(--in-content-box-info-background); margin-block-start: 0; margin-block-end: 30px; } @@ -106,6 +108,7 @@ body:not(.show-tor-check) #tor-check { border-radius: calc(var(--form-radius) + var(--form-border-width)); border-width: var(--form-border-width); border-style: solid; + border-color: var(--in-content-box-border-color); } #search-form.search-input-focus-visible { @@ -154,17 +157,10 @@ body:not(.show-tor-check) #tor-check { } -@media (prefers-contrast) { - #search-form { - border-color: var(--in-content-box-border-color); - } +@media not ((prefers-contrast) or (forced-colors)) { + /* Force the page to follow the same Tor theme, regardless of + * prefers-color-scheme. */ - #tor-check { - background-color: var(--in-content-box-info-background); - } -} - -@media not (prefers-contrast) { /* On dark background */ :root { background-color: #2C0449; @@ -176,6 +172,7 @@ body:not(.show-tor-check) #tor-check { #tor-check { background-color: #1f0333; + border-color: transparent; } body > :not(#search-form) { ===================================== browser/components/torcircuit/content/torCircuitPanel.css ===================================== @@ -17,7 +17,7 @@ background: currentColor; } -@media not (prefers-contrast) { +@media not ((prefers-contrast) or (forced-colors)) { #tor-circuit-button-icon { background: linear-gradient(315deg, #008799 0%, #6153C6 50%, #CA00CC 100%); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a36c4f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a36c4f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] fixup! MB 38: Mullvad Browser configuration
by morgan (＠morgan) 10 Sep '24

10 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: a913090d by Richard Pospesel at 2024-09-10T21:56:29+00:00 fixup! MB 38: Mullvad Browser configuration Bug 222: Hide 'List all tabs' when the tabs don't overflow - - - - - 1 changed file: - browser/app/profile/000-mullvad-browser.js Changes: ===================================== browser/app/profile/000-mullvad-browser.js ===================================== @@ -48,3 +48,6 @@ pref("app.feedback.baseURL", "https://mullvad.net/help/tag/browser/"); // mullvad-browser#234: Do not spoof the OS in the User-Agent header pref("privacy.resistFingerprinting.spoofOsInUserAgentHeader", false); + +// mullvad-browser#222: Hide "List all tabs" when the tabs don't overflow +pref("browser.tabs.tabmanager.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a91… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a91… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] Update 11.5.8 mar URLs to point to archive.tpo (tor-browser-build#41233)
by boklm (＠boklm) 10 Sep '24

10 Sep '24

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: c68ab1ee by Nicolas Vigier at 2024-09-09T18:41:54+02:00 Update 11.5.8 mar URLs to point to archive.tpo (tor-browser-build#41233) We're been keeping 11.5.8 mar files on cdn.torproject.org as a watershed update for a while. We're switching to archive.tpo URLs to be able to remove it from cdn.tpo. - - - - - 30 changed files: - update_pre12.0/release/11.5.7-11.5.8-linux32-ar.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ca.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-cs.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-da.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-de.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-el.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-en-US.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-es-AR.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-es-ES.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-fa.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-fr.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ga-IE.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-he.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-hu.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-id.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-is.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-it.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ja.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ka.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ko.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-lt.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-mk.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ms.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-my.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-nb-NO.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-nl.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-pl.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-pt-BR.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ro.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ru.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.15.0esr-13.5-1] 3 commits: Revert "Add CI for Tor Browser"
by Pier Angelo Vendrame (＠pierov) 10 Sep '24

10 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-115.15.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 5be5f679 by Beatriz Rizental at 2024-09-10T15:27:58+02:00 Revert "Add CI for Tor Browser" This reverts commit da96aaddf555f72ecf3c5c50c7c563f943c78af4. - - - - - 4ec29062 by Beatriz Rizental at 2024-09-10T15:27:58+02:00 Revert "Add CI for Base Browser" This reverts commit 8a16305a6f2ee34e9e7fe7c0ce3f7edf407ebcc6. - - - - - 8eb0e1e5 by Beatriz Rizental at 2024-09-10T15:27:58+02:00 Add CI for Tor Browser - - - - - 3 changed files: - .gitlab-ci.yml - − .gitlab/ci/lint.yml - − .gitlab/ci/scripts/run_linters.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,7 +1,5 @@ stages: - - lint - update-translations include: - - local: '.gitlab/ci/lint.yml' - local: '.gitlab/ci/update-translations.yml' ===================================== .gitlab/ci/lint.yml deleted ===================================== @@ -1,319 +0,0 @@ -variables: - # This needs to be kept in sync with the max Python version accepted by ./mach - PYTHON_VERSION: "3.11.7" - -.base: - stage: lint - interruptible: true - variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" - cache: - paths: - - node_modules - - .cache/pip - -eslint: - extends: .base - image: cimg/python:$PYTHON_VERSION-node - script: - - .gitlab/ci/scripts/run_linters.py eslint - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - # Files that are likely audited. - - '**/*.js' - - '**/*.jsm' - - '**/*.json' - - '**/*.jsx' - - '**/*.mjs' - - '**/*.sjs' - - '**/*.html' - - '**/*.xhtml' - - '**/*.xml' - - 'tools/lint/eslint.yml' - # Run when eslint policies change. - - '**/.eslintignore' - - '**/*eslintrc*' - # The plugin implementing custom checks. - - 'tools/lint/eslint/eslint-plugin-mozilla/**' - - 'tools/lint/eslint/eslint-plugin-spidermonkey-js/**' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -stylelint: - extends: .base - image: cimg/python:$PYTHON_VERSION-node - script: - - .gitlab/ci/scripts/run_linters.py stylelint - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - # Files that are likely audited. - - '**/*.css' - - 'tools/lint/styleint.yml' - # Run when stylelint policies change. - - '**/.stylelintignore' - - '**/*stylelintrc*' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -py-black: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py black - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - # The list of extensions should match tools/lint/black.yml - - '**/*.py' - - '**/moz.build' - - '**/*.configure' - - '**/*.mozbuild' - - 'pyproject.toml' - - 'tools/lint/black.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -py-ruff: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py ruff - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.py' - - '**/*.configure' - - '**/.ruff.toml' - - 'pyproject.toml' - - 'tools/lint/ruff.yml' - - 'tools/lint/python/ruff.py' - - 'tools/lint/python/ruff_requirements.txt' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -yaml: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py yaml - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.yml' - - '**/*.yaml' - - '**/.ymllint' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -shellcheck: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py shellcheck - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.sh' - - 'tools/lint/shellcheck.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -clang-format: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py clang-format - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.cpp' - - '**/*.c' - - '**/*.cc' - - '**/*.h' - - '**/*.m' - - '**/*.mm' - - 'tools/lint/clang-format.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -rustfmt: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py rustfmt - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.rs' - - 'tools/lint/rustfmt.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -fluent-lint: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py fluent-lint - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.ftl' - - 'tools/lint/fluent-lint.yml' - - 'tools/lint/fluent-lint/exclusions.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -localization: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py l10n - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/locales/en-US/**' - - '**/l10n.toml' - - 'third_party/python/compare-locales/**' - - 'third_party/python/fluent/**' - - 'tools/lint/l10n.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -mingw-capitalization: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py mingw-capitalization - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.cpp' - - '**/*.cc' - - '**/*.c' - - '**/*.h' - - 'tools/lint/mingw-capitalization.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -mscom-init: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py mscom-init - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.cpp' - - '**/*.cc' - - '**/*.c' - - '**/*.h' - - 'tools/lint/mscom-init.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -file-whitespace: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py file-whitespace - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.c' - - '**/*.cc' - - '**/*.cpp' - - '**/*.css' - - '**/*.dtd' - - '**/*.idl' - - '**/*.ftl' - - '**/*.h' - - '**/*.html' - - '**/*.md' - - '**/*.properties' - - '**/*.py' - - '**/*.rs' - - '**/*.rst' - - '**/*.webidl' - - '**/*.xhtml' - - 'tools/lint/file-whitespace.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -test-manifest: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.ini' - - 'python/mozlint/**' - - 'tools/lint/**' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -trojan-source: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py trojan-source - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.c' - - '**/*.cc' - - '**/*.cpp' - - '**/*.h' - - '**/*.py' - - '**/*.rs' - - 'tools/lint/trojan-source.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' ===================================== .gitlab/ci/scripts/run_linters.py deleted ===================================== @@ -1,110 +0,0 @@ -#!/usr/bin/env python3 - -import argparse -import os -import re -import shlex -import subprocess -import sys - - -def git(command): - result = subprocess.run( - ["git"] + shlex.split(command), check=True, capture_output=True, text=True - ) - return result.stdout.strip() - - -def get_firefox_tag_from_branch_name(branch_name): - """Extracts the Firefox tag associated with a branch name. - - The "firefox tag" is the tag that marks - the end of the Mozilla commits and the start of the Tor Project commits. - - Know issue: If ever there is more than one tag per Firefox ESR version, - this function may return the incorrect reference number. - - Args: - branch_name: The branch name to extract the tag from. - Expected format is tor-browser-91.2.0esr-11.0-1, - where 91.2.0esr is the Firefox version. - - Returns: - The reference specifier of the matching Firefox tag. - An exception wil be raised if anything goes wrong. - """ - - # Extracts the version number from a branch name. - firefox_version = "" - match = re.search(r"(?<=browser-)([^-]+)", branch_name) - if match: - # TODO: Validate that what we got is actually a valid semver string? - firefox_version = match.group(1) - else: - raise ValueError(f"Failed to extract version from branch name '{branch_name}'.") - - tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" - remote_tags = git("ls-remote --tags") - - # Each line looks like: - # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 - pattern = rf"(.*){re.escape(tag)}(.*)$" - match = re.search(pattern, remote_tags, flags=re.MULTILINE) - if match: - return match.group(0).split()[0] - else: - raise ValueError( - f"Failed to find reference specifier for Firefox tag in branch '{branch_name}'." - ) - - -def get_list_of_changed_files(): - """Gets a list of files changed in the working directory. - - This function is meant to be run inside the Gitlab CI environment. - - When running in a default branch, get the list of changed files since the last Firefox tag. - When running for a new MR commit, get a list of changed files in the current MR. - - Returns: - A list of filenames of changed files (excluding deleted files). - An exception wil be raised if anything goes wrong. - """ - - base_reference = "" - - if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": - # For merge requests, the base_reference is the common ancestor between the MR and the target branch. - base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") - else: - # When not in merge requests, the base reference is the Firefox tag - base_reference = get_firefox_tag_from_branch_name(os.getenv("CI_COMMIT_BRANCH")) - - if not base_reference: - raise RuntimeError("No base reference found. There might be more errors above.") - - # Fetch the tag reference - git(f"fetch origin {base_reference} --depth=1 --filter=blob:none") - # Return the list of changed files - return git(f"diff --diff-filter=d --name-only {base_reference} HEAD").split("\n") - - -if __name__ == "__main__": - parser = argparse.ArgumentParser( - description="Run ./mach linters in CI. Warning: if you run this in your local environment it might mess up your git history." - ) - parser.add_argument( - "linters", metavar="L", type=str, nargs="+", help="A list of linters to run." - ) - args = parser.parse_args() - - command = [ - "./mach", - "lint", - "-v", - *(s for l in args.linters for s in ("-l", l)), - *get_list_of_changed_files(), - ] - result = subprocess.run(command, text=True) - - sys.exit(result.returncode) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/767815… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/767815… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41232: Implement single-arch testbuilds on the monorepo.
by Pier Angelo Vendrame (＠pierov) 10 Sep '24

10 Sep '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: fe08aea2 by Pier Angelo Vendrame at 2024-09-10T09:54:59+02:00 Bug 41232: Implement single-arch testbuilds on the monorepo. The trick of the fake fat AAR does not work anymore, as the fat AAR is consumed in the same script where it is created. However, running an Android build from a single-arch tree seems not to involve different commands, so we can create a shared script and include it in both the build steps. - - - - - d057d3b5 by Pier Angelo Vendrame at 2024-09-10T09:55:04+02:00 Bug 41234: Add some dependencies needed for Android/release. Building Android as release fails because we do not provide some additional dependencies to our offline builds. - - - - - 9 changed files: - projects/browser/config - projects/geckoview/build - + projects/geckoview/build_ac_fenix - projects/geckoview/build_apk - projects/geckoview/build_common - projects/geckoview/config - projects/geckoview/gradle-dependencies-list.txt - projects/tor-expert-bundle-aar/build - projects/tor-expert-bundle-aar/config Changes: ===================================== projects/browser/config ===================================== @@ -90,7 +90,11 @@ input_files: - project: geckoview name: fenix pkg_type: build_apk - enable: '[% c("var/android") %]' + enable: '[% c("var/android") && !c("var/android_single_arch") %]' + - project: geckoview + name: fenix + pkg_type: build + enable: '[% c("var/android") && c("var/android_single_arch") %]' - project: tor-expert-bundle name: tor-expert-bundle enable: '[% c("var/tor-browser") %]' ===================================== projects/geckoview/build ===================================== @@ -43,29 +43,14 @@ echo "Starting ./mach configure $(date)" echo "Starting ./mach build $(date)" ./mach build --verbose +echo "Build finished, copying the AAR to the to the destination directory $(date)" + [% IF !c("var/android_single_arch") -%] mkdir "$distdir/[% project %]" # We don't want the debug or "exoplayer" .aars, but the .aar that has `omni` in its name. find obj-* -type f -name geckoview*omni*.aar -exec cp {} $distdir/[% project %] \; [% ELSE -%] - # For single-arch builds, we want to fake a fat aar anyway, to avoid having - # arch suffixes in filenames, or having to rename files. - cat >> mozconfig-android-all << 'MOZCONFIG_EOF' -ac_add_options --enable-update-channel=[% c("var/variant") %] -ac_add_options --with-base-browser-version=[% c("var/torbrowser_version") %] -export MOZ_INCLUDE_SOURCE_INFO=1 -export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]" -export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %] -MOZCONFIG_EOF - - echo "Starting the creation of the fake fat AAR $(date)" - pushd tools/geckoview - touch android-env.sh - make fataar ARCHS="[% c('arch') %]" - popd - MOZCONFIG=mozconfig-android-all ./mach gradle \ - geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal \ - exoplayer2:publishDebugPublicationToMavenLocal +[% INCLUDE 'build_ac_fenix' %] [% END -%] echo "Starting to package artifacts $(date)" ===================================== projects/geckoview/build_ac_fenix ===================================== @@ -0,0 +1,56 @@ +[% IF c('var/has_l10n') -%] + echo "Injecting the Firefox's localization to GV $(date)" + supported_locales="[% tmpl(c('var/locales_mobile').join(' ')).replace('-r', '-').replace('in', 'id').replace('iw', 'he') %]" + l10ncentral="$HOME/.mozbuild/l10n-central" + mkdir "$l10ncentral" + for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do + tar -C "$l10ncentral" -xf "$tarball" + done + + # Do not setup our localization files, as we do not provide any frontend + # through GeckoView. + + # No quotes on purpose, to pass each locale as an additional argument. + ./mach package-multi-locale --locales en-US $supported_locales +[% END -%] + +echo "Building Android Components $(date)" +pushd mobile/android/android-components +gradle $GRADLE_FLAGS assembleGecko -x lint +popd + +# The build might fail with "file exists" otherwise. +rm -rf /var/tmp/dist/android-toolchain/gradle/glean/pythonenv + +echo "Building Fenix $(date)" +pushd mobile/android/fenix + +cp -a $rootdir/[% c('input_files_by_name/tor-expert-bundle-aar') %]/tor-expert-bundle.aar app/ + +# Use the Android Components we have just built +echo autoPublish.android-components.dir=../android-components > local.properties + +[% IF c('var/has_l10n') -%] + tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %] + # Add our localized strings + supported_locales="[% tmpl(c('var/locales_mobile').join(' ')) %]" + for lang in $supported_locales; do + cp "/var/tmp/dist/translation-fenix/$lang/torbrowser_strings.xml" "app/src/main/res/values-$lang/" + done +[% END -%] + +# Bug 40485: Inject deterministic build date into Glean. +echo 'ext.gleanBuildDate = "0"' >> app/build.gradle + +variant='[% c("var/variant") %]' +version_name="[% c('var/torbrowser_version') %] ([% c('var/geckoview_version') %])" + +gradle $GRADLE_FLAGS -PversionName="$version_name" "assemble$variant" + +echo "Build finished, copying the APK(s) to the destination directory $(date)" + +mkdir $distdir/[% project %] +cp app/build/outputs/apk/fenix/$variant/*.apk $distdir/[% project %] + +popd + ===================================== projects/geckoview/build_apk ===================================== @@ -1,10 +1,7 @@ #!/bin/bash [% INCLUDE 'build_common' %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %] - -tar -xf [% c('input_files_by_name/glean-wheels') %] -export GLEAN_PYTHON_WHEELS_DIR=$rootdir/glean-wheels +echo "Starting the creation of the fat AAR $(date)" tar -C $builddir -xf [% c('input_files_by_name/geckoview_armv7') %] tar -C $builddir -xf [% c('input_files_by_name/geckoview_aarch64') %] @@ -29,18 +26,6 @@ export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]" export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %] MOZCONFIG_EOF -[% IF c("var/has_l10n") -%] - supported_locales="[% tmpl(c('var/locales_mobile').join(' ')).replace('-r', '-').replace('in', 'id').replace('iw', 'he') %]" - l10ncentral="$HOME/.mozbuild/l10n-central" - mkdir "$l10ncentral" - for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do - tar -C "$l10ncentral" -xf "$tarball" - done - - # Do not setup our localization files, as we do not provide any frontend - # through GeckoView. -[% END -%] - # We still need to specify --tor-browser-version due to bug 34005. ./mach configure \ --with-base-browser-version=[% c("var/torbrowser_version") %] \ @@ -49,43 +34,7 @@ MOZCONFIG_EOF ./mach build --verbose -[% IF c('var/has_l10n') -%] - # No quotes on purpose, to pass each locale as an additional argument. - ./mach package-multi-locale --locales en-US $supported_locales -[% END -%] - -pushd mobile/android/android-components -gradle $GRADLE_FLAGS assembleGecko -x lint -popd - -# The build might fail with "file exists" otherwise. -rm -rf /var/tmp/dist/android-toolchain/gradle/glean/pythonenv - -pushd mobile/android/fenix - -cp -a $rootdir/[% c('input_files_by_name/tor-expert-bundle-aar') %]/tor-expert-bundle.aar app/ - -# Use the Android Components we have just built -echo autoPublish.android-components.dir=../android-components > local.properties - -# Add our localized strings -supported_locales="[% tmpl(c('var/locales_mobile').join(' ')) %]" -for lang in $supported_locales; do - cp "/var/tmp/dist/translation-fenix/$lang/torbrowser_strings.xml" "app/src/main/res/values-$lang/" -done - -# Bug 40485: Inject deterministic build date into Glean. -echo 'ext.gleanBuildDate = "0"' >> app/build.gradle - -variant='[% c("var/variant") %]' -version_name="[% c('var/torbrowser_version') %] ([% c('var/geckoview_version') %])" - -gradle $GRADLE_FLAGS -PversionName="$version_name" "assemble$variant" - -mkdir $distdir/[% project %] -cp app/build/outputs/apk/fenix/$variant/*.apk $distdir/[% project %] - -popd +[% INCLUDE 'build_ac_fenix' %] cd $distdir/ [% c('tar', { ===================================== projects/geckoview/build_common ===================================== @@ -37,6 +37,9 @@ cp -rl $gradle_repo/dl/android/maven2/* $gradle_repo || true cp -rl $gradle_repo/m2/* $gradle_repo || true cp -rl $gradle_repo/maven2/* $gradle_repo || true +tar -xf [% c('input_files_by_name/glean-wheels') %] +export GLEAN_PYTHON_WHEELS_DIR=$rootdir/glean-wheels + tar -xf [% c('input_files_by_name/oss-licenses-plugin') %] cp -rl oss-licenses-plugin/. $gradle_repo ===================================== projects/geckoview/config ===================================== @@ -36,7 +36,7 @@ var: - openjdk-17-jdk-headless # this should be updated when the list of gradle dependencies is changed # see doc/how-to-create-gradle-dependencies-list.txt - gradle_dependencies_version: 14 + gradle_dependencies_version: 15 gradle_version: 8.8 glean_parser: 14.0.1 variant: beta @@ -105,6 +105,7 @@ steps: - name: translation-fenix project: translation pkg_type: fenix + enable: '[% c("var/has_l10n") %]' - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' name: glean-wheels sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' @@ -150,5 +151,18 @@ input_files: - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' + - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' + name: glean-wheels + sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' - project: oss-licenses-plugin name: oss-licenses-plugin + - name: tor-expert-bundle-aar + project: tor-expert-bundle-aar + enable: '[% c("var/android_single_arch") %]' + - project: firefox-l10n + name: firefox-l10n + enable: '[% c("var/android_single_arch") && c("var/has_l10n") %]' + - name: translation-fenix + project: translation + pkg_type: fenix + enable: '[% c("var/android_single_arch") && c("var/has_l10n") %]' ===================================== projects/geckoview/gradle-dependencies-list.txt ===================================== @@ -2907,3 +2907,25 @@ fd64e97234d4c056018ed5ab1e22932bfe5a31b8d80ab9375b6b7b9dfa7ed031 | https://maven 9f40ab0b8cf4e7cb0f593493c2ed96e7155d0e91eb592407597ecd61e2d5a054 | https://maven.google.com/androidx/compose/runtime/runtime/1.6.7/runtime-1.6… 3018ecf7ef0302f1c2492e4c627ae36b763167779b4595fa89331553f5b0c51a | https://maven.google.com/androidx/compose/material/material-ripple/1.6.7/ma… 4e75469751c9d4c464c7d06af283b9737693c20bc4aaf657630bb294c27bbff1 | https://maven.google.com/androidx/compose/foundation/foundation-layout/1.6.… +74c0e3f8c3df0b1d32ab9d839448c914586d3e8479611e4386fecfa6b3f0a26b | https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/4.… +a99cf993825e5a2ff12f50973398e7c9fc570055368bdf1026a79efcfb5e6d72 | https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/4.… +b88186fde75edc3871c5e785c112006dfdd670abba1bb50cdb669fd32291f411 | https://repo1.maven.org/maven2/com/squareup/leakcanary/leakcanary-android-i… +db2f190ebcb2d5d2d5fdb535907df5ab0df0854db49186409ba51c7942441d96 | https://repo1.maven.org/maven2/com/squareup/leakcanary/leakcanary-android-i… +15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common… +8cd23d889a14095c6ce16840d29b1a6388fa5e115144c1309d4d6d469c1bc351 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common… +67359f609dfc2bf65da1270b23033f856064ec279f058e0a70c715f7c9003031 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… +d7c9e019cf68779387481877878f6c499d1786b85f2c0480e9264dd5097c51c0 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… +0157de61a2064047896a058080f3fd67ba57ad9a94857b3f7a363660243e3f90 | https://maven.google.com/androidx/annotation/annotation-experimental/1.1.0/… +550a6601e1af47cf99501cc6cc15d1ebe9cef17b51e5dd58b6ab6c23568ef7a9 | https://maven.google.com/androidx/annotation/annotation-experimental/1.1.0/… +9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36 | https://maven.google.com/androidx/annotation/annotation/1.2.0/annotation-1.… +62fb6dca2777efe08e7077d6b872d69110619df7fc21c99a6f54066499cc0383 | https://maven.google.com/androidx/annotation/annotation/1.2.0/annotation-1.… +4867fd5279742fba8388821930cb2affe06d81a52814e7e41e70392ea0ef887c | https://maven.google.com/androidx/lifecycle/lifecycle-runtime/2.6.2/lifecyc… +8175255546e2a5f510865f84ace680660954730240b1905d9175b4345beda977 | https://maven.google.com/androidx/lifecycle/lifecycle-runtime/2.6.2/lifecyc… +7bc7dcbab17636ec076f12afe4d02671265c389457b1b366b37a0e8cb91e2da0 | https://maven.google.com/androidx/lifecycle/lifecycle-viewmodel-savedstate/… +7fc854440644cf52c35894d58d946b208e42769e8517d71a5efcba17865432de | https://maven.google.com/androidx/lifecycle/lifecycle-viewmodel-savedstate/… +2256780a3cff4a1e57fbb3d442557c17dc363ab8af105bcaf5261d8e2d5db949 | https://maven.google.com/androidx/lifecycle/lifecycle-livedata-core/2.6.2/l… +1faf8ebf53f28b2f0ae2c2095371ae67d0ca16ac328fce7f163609a43214b5a4 | https://maven.google.com/androidx/lifecycle/lifecycle-livedata-core/2.6.2/l… +e4ff4338999e1c6c9c724719f5d4aa7dd61bf6f545d5256a27a9d375df9f2330 | https://maven.google.com/androidx/lifecycle/lifecycle-viewmodel/2.6.2/lifec… +a9fb0b39a8360beef7bdc8f3953d4d78f3d85304fc80adac3c8eaf530d758050 | https://maven.google.com/androidx/lifecycle/lifecycle-viewmodel/2.6.2/lifec… +f34831b6c71cd844e1d35d1be49d5e79447c5ab856346531b1e8676fda7374b1 | https://maven.google.com/androidx/lifecycle/lifecycle-common/2.6.2/lifecycl… +57304cdac4da289a6ecdd0738e16b1d8858f1ef8e9fabe2d65a963719fd81dba | https://maven.google.com/androidx/lifecycle/lifecycle-common/2.6.2/lifecycl… ===================================== projects/tor-expert-bundle-aar/build ===================================== @@ -7,8 +7,12 @@ mkdir -p /var/tmp/build $distdir mkdir tor-expert-bundle-aar cd tor-expert-bundle-aar -[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] - unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]/tor-expert-bundle-[% arch %].aar +[% IF c("var/android_single_arch") -%] + unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle') %]/tor-expert-bundle-[% c("arch") %].aar +[% ELSE -%] + [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] + unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]/tor-expert-bundle-[% arch %].aar + [% END -%] [% END -%] -jar -cvf $distdir/tor-expert-bundle.aar * \ No newline at end of file +jar -cvf $distdir/tor-expert-bundle.aar * ===================================== projects/tor-expert-bundle-aar/config ===================================== @@ -12,15 +12,22 @@ input_files: name: tor-expert-bundle-armv7 target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-android-armv7' + enable: '[% !c("var/android_single_arch") %]' - project: tor-expert-bundle name: tor-expert-bundle-aarch64 target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-android-aarch64' + enable: '[% !c("var/android_single_arch") %]' - project: tor-expert-bundle name: tor-expert-bundle-x86 target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86' + enable: '[% !c("var/android_single_arch") %]' - project: tor-expert-bundle name: tor-expert-bundle-x86_64 target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64' + enable: '[% !c("var/android_single_arch") %]' + - project: tor-expert-bundle + name: tor-expert-bundle + enable: '[% c("var/android_single_arch") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 09 Sep '24

09 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: fdc0d894 by Morgan at 2024-09-09T19:01:29+00:00 fixup! Firefox preference overrides. Bug 42255: lock pdfjs.disabled to false in stable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -433,6 +433,10 @@ pref("network.http.referer.XOriginTrimmingPolicy", 2); // Bug 17228: Force trim pref("network.http.windows-sso.enabled", false, locked); // tor-browser#40424 pref("pdfjs.enableScripting", false); +#if MOZ_UPDATE_CHANNEL == release +// tor-browser#42255: pdfjs.disabled used to be part of RFP until Bug 1838415; lock pref to false in stable +pref("pdfjs.disabled", false, locked); +#endif // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fdc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fdc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 09 Sep '24

09 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 69a7c008 by Morgan at 2024-09-09T19:01:06+00:00 fixup! Firefox preference overrides. Bug 42255: lock pdfjs.disabled to false in stable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -433,6 +433,10 @@ pref("network.http.referer.XOriginTrimmingPolicy", 2); // Bug 17228: Force trim pref("network.http.windows-sso.enabled", false, locked); // tor-browser#40424 pref("pdfjs.enableScripting", false); +#if MOZ_UPDATE_CHANNEL == release +// tor-browser#42255: pdfjs.disabled used to be part of RFP until Bug 1838415; lock pref to false in stable +pref("pdfjs.disabled", false, locked); +#endif // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69a7c00… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69a7c00… You're receiving this email because of your account on gitlab.torproject.org.

1 0