- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] TB 44633: Move CreateDirect3D11DeviceFromDXGIDevice to mingw-webrtc.patch
by Pier Angelo Vendrame (＠pierov) 04 Mar '26

04 Mar '26

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 648b1180 by june wilde at 2026-03-04T10:04:24+01:00 TB 44633: Move CreateDirect3D11DeviceFromDXGIDevice to mingw-webrtc.patch - - - - - 1 changed file: - projects/mingw-w64-clang/mingw-webrtc.patch Changes: ===================================== projects/mingw-w64-clang/mingw-webrtc.patch ===================================== @@ -1,9 +1,9 @@ diff --git a/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.h b/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.h new file mode 100644 -index 000000000..d7ff1be23 +index 000000000..d92535247 --- /dev/null +++ b/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.h -@@ -0,0 +1,160 @@ +@@ -0,0 +1,164 @@ +/*** Autogenerated by WIDL 8.0 from include/windows.graphics.directx.direct3d11.interop.idl - Do not edit ***/ + +#ifdef _WIN32 @@ -51,12 +51,16 @@ index 000000000..d7ff1be23 + +/* Headers for imported files */ + ++#include <dxgi.h> ++#include <inspectable.h> +#include <windows.graphics.directx.direct3d11.h> + +#ifdef __cplusplus +extern "C" { +#endif + ++HRESULT CreateDirect3D11DeviceFromDXGIDevice(IDXGIDevice *dxgiDevice,IInspectable **graphicsDevice); ++ +/***************************************************************************** + * IDirect3DDxgiInterfaceAccess interface + */ @@ -166,17 +170,37 @@ index 000000000..d7ff1be23 +#endif /* __windows_graphics_directx_direct3d11_interop_h__ */ diff --git a/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.idl b/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.idl new file mode 100644 -index 000000000..51e2845ea +index 000000000..b5ca72e40 --- /dev/null +++ b/mingw-w64-headers/include/windows.graphics.directx.direct3d11.interop.idl -@@ -0,0 +1,14 @@ +@@ -0,0 +1,34 @@ ++/* ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA ++ */ ++ +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + ++import "dxgi.idl"; ++import "inspectable.idl"; +import "windows.graphics.directx.direct3d11.idl"; + +namespace Windows.Graphics.DirectX.Direct3D11 { ++ HRESULT CreateDirect3D11DeviceFromDXGIDevice([in] IDXGIDevice* dxgiDevice, [out] IInspectable** graphicsDevice); ++ + [ + uuid(A9B3D012-3DF2-4EE3-B8D1-8695F457D3C1) + ] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 04 Mar '26

04 Mar '26

Pier Angelo Vendrame pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 864720e4 by Pier Angelo Vendrame at 2026-03-03T18:27:50+01:00 fixup! Firefox preference overrides. BB 44461: Fix caption buttons on Windows. They are rendered with the Segoe MDL2 Assets, so we have to add that font to the list of allowed fonts. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -910,7 +910,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 PGothic, ＭＳＰゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, 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 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, Pyidaungsu, Twemoji Mozilla"); +pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, ＭＳゴシック, MS PGothic, ＭＳＰゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe MDL2 Assets, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, 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 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, Pyidaungsu, Twemoji Mozilla"); pref("font.name-list.emoji", "Twemoji Mozilla"); // Arabic View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/864720e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/864720e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-148.0a1-16.0-2
by Dan Ballard (＠dan) 03 Mar '26

03 Mar '26

Dan Ballard pushed new branch mullvad-browser-148.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-148.0a1-16.0-2-build1
by Dan Ballard (＠dan) 03 Mar '26

03 Mar '26

Dan Ballard pushed new tag base-browser-148.0a1-16.0-2-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Deleted tag base-browser-148.0a1-16.0-2-build1
by Dan Ballard (＠dan) 03 Mar '26

03 Mar '26

Dan Ballard deleted tag base-browser-148.0a1-16.0-2-build1 at The Tor Project / Applications / Mullvad Browser -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 8 commits: Bug 41725: Update toolchains for Firefox 148
by boklm (＠boklm) 03 Mar '26

03 Mar '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6e095bab by Nicolas Vigier at 2026-03-03T11:21:23+01:00 Bug 41725: Update toolchains for Firefox 148 - - - - - a29c899d by Nicolas Vigier at 2026-03-03T11:21:26+01:00 Bug 41725: Remove projects/oss-licenses-plugin https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… - - - - - f4700966 by Nicolas Vigier at 2026-03-03T11:21:28+01:00 Bug 41726: check that the sha512sum we have for the macOS SDK is the same as Mozilla - - - - - 9406ba99 by Nicolas Vigier at 2026-03-03T11:21:29+01:00 Bug 41728: Check that the sha256sum we have for nss is the same as Mozilla - - - - - eafc83b5 by Nicolas Vigier at 2026-03-03T11:21:30+01:00 Bug 41725: Bump firefox version to 148.0a1-2 - - - - - ba70ed85 by Nicolas Vigier at 2026-03-03T11:21:32+01:00 Bug 41737: Remove comment saying to update var/gradle_dependencies_version - - - - - 45b2ba09 by Nicolas Vigier at 2026-03-03T11:21:33+01:00 Bug 41736: Add generate_gradle_dependencies_list-$project makefile targets - - - - - 9921a71b by Nicolas Vigier at 2026-03-03T12:15:31+01:00 Bug 41745: Add .sh file extension to included build_* scripts in projects/geckoview Since those files are included and don't have a shebang, text editors which have syntax highlighting cannot easily detect the format. Adding the .sh file extension usually fixes that. - - - - - 28 changed files: - Makefile - doc/how-to-update-gradle-dependencies-list.md - projects/application-services/build - projects/application-services/config - projects/application-services/gradle-dependencies-list.txt - projects/application-services/list_toolchain_updates_checks - projects/common/gen-gradle-deps-file.py - projects/firefox/config - projects/firefox/list_toolchain_updates_checks - projects/geckoview/build - projects/geckoview/build_ac_fenix → projects/geckoview/build_ac_fenix.sh - projects/geckoview/build_apk - projects/geckoview/build_common → projects/geckoview/build_common.sh - projects/geckoview/config - projects/geckoview/gradle-dependencies-list.txt - projects/geckoview/list_toolchain_updates_checks - projects/glean/build - projects/glean/config - projects/glean/gradle-dependencies-list.txt - projects/glean/use-uniffi-noop.diff - projects/gradle/config - projects/macosx-toolchain/config - − projects/oss-licenses-plugin/build - − projects/oss-licenses-plugin/build-customization.diff - − projects/oss-licenses-plugin/config - − projects/oss-licenses-plugin/gradle-dependencies-list.txt - − projects/oss-licenses-plugin/sort-dependencies-pr-268.patch - rbm.conf The diff was not included because it is too large. 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/tor-browser][tor-browser-148.0a1-16.0-2] fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by Dan Ballard (＠dan) 03 Mar '26

03 Mar '26

Dan Ballard pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 69e76487 by Dan Ballard at 2026-03-03T09:21:29-08:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates TB 44703: Updating rebase alpha template with recent 148 experience - - - - - 1 changed file: - .gitlab/issue_templates/060 Rebase - Alpha.md Changes: ===================================== .gitlab/issue_templates/060 Rebase - Alpha.md ===================================== @@ -13,7 +13,7 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl - Rebase application-services - uniffi-rs - Prepare the rebase - - [ ] Verify if application-services has updated it's uniffi-rs version + - [ ] Verify if application-services has updated it's uniffi-rs version else skip this step - [ ] Get the [upstream](https://github.com/mozilla/uniffi-rs) tag - [ ] Freeze the current default branch - [ ] Create the target branch (`X.XX.X`) @@ -45,10 +45,11 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl - Prepare the rebase - [ ] Get the [Firefox](https://github.com/mozilla-firefox/firefox) tag - Do the rebase [Part 1] - - [ ] Create the target branch (`tor-browser-...-1`) - - [ ] Cherry-pick commits until `tor-browser-...-build1` + - [ ] Create the target branch (`tor-browser-XXX.0a1-YY.0-1`) + - [ ] Cherry-pick commits until `tor-browser-(XXX - 1).0a1-YY.0-2-build1` + - Optional: If your first rebase, complex, or difficult, can do an MR here for feedback. - [ ] Freeze the current default branch - - [ ] Cherry-pick remaining commits + - [ ] Cherry-pick remaining commits (rest of tor-browser-(XXX - 1)a1-YY.Y-2) - Merge - [ ] Perform a self-review (`git range-diff`) - [ ] Run linters @@ -62,10 +63,14 @@ The step-by-step rebase process is detailed on the [Rebase Process](https://gitl - [ ] Make `tor-browser-...-1` the default branch and freeze it - Do the rebase [Part 2] - [ ] Create the target branch (`tor-browser-...-2`) - - [ ] Cherry-pick commits until `tor-browser-...-1-build1` + - [ ] Cherry-pick commits until `tor-browser-XXX...-1-build1` - [ ] Squash (`git rebase --autosquash FIREFOX_...`) - [ ] Cherry-pick the remaining commits - [ ] Reorder commits + - [ ] Move Mozilla "Bug ZZZZZZZZ" issues to the very start + - [ ] Move any Base Browser "BB TTTTT" issues into the BB range + - [ ] Move `--fixups` next to their parent (`git rebase -i --autosquash FIREFOX_...` then change all the `fixup` to `pick`) + - Note: also `drop` any commits marked `!dropme` - Merge - [ ] Perform a self-review (`git range-diff` + diff of diffs) - [ ] Run linters View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69e7648… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69e7648… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] 2 commits: fixup! TB 44098: [android] Disable sync
by Dan Ballard (＠dan) 03 Mar '26

03 Mar '26

Dan Ballard pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 9a24e35c by clairehurst at 2026-03-03T09:19:42-08:00 fixup! TB 44098: [android] Disable sync - - - - - 1142203f by clairehurst at 2026-03-03T09:19:42-08:00 fixup! TB 34403 [android]: Disable Normal mode by default. - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/banner/TabsTrayBanner.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/banner/TabsTrayBanner.kt ===================================== @@ -326,40 +326,6 @@ private fun TabPageBanner( style = FirefoxTheme.typography.button, ) } - - Tab( - selected = selectedPage == Page.NormalTabs, - onClick = { onTabPageIndicatorClicked(Page.NormalTabs) }, - modifier = Modifier - .testTag(TabsTrayTestTag.NORMAL_TABS_PAGE_BUTTON) - .semantics { - contentDescription = normalTabDescription - } - .height(RowHeight), - unselectedContentColor = inactiveColor, - ) { - Text( - text = stringResource(R.string.tabs_header_normal_tabs_title), - style = FirefoxTheme.typography.button, - ) - } - - Tab( - selected = selectedPage == Page.SyncedTabs, - onClick = { onTabPageIndicatorClicked(Page.SyncedTabs) }, - modifier = Modifier - .testTag(TabsTrayTestTag.SYNCED_TABS_PAGE_BUTTON) - .semantics { - contentDescription = syncedTabDescription - } - .height(RowHeight), - unselectedContentColor = inactiveColor, - ) { - Text( - text = stringResource(id = R.string.tabs_header_synced_tabs_title), - style = FirefoxTheme.typography.button, - ) - } } } }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec8f5c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec8f5c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] fixup! BB 44522: Modify the about dialog.
by henry (＠henry) 03 Mar '26

03 Mar '26

henry pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: ec8f5ce3 by Henry Wilkes at 2026-03-03T16:25:56+00:00 fixup! BB 44522: Modify the about dialog. TB 44713: Restore the top padding that was removed upstream. - - - - - 1 changed file: - browser/base/content/aboutDialog.css Changes: ===================================== browser/base/content/aboutDialog.css ===================================== @@ -192,6 +192,7 @@ } #rightBox { + padding-block-start: 38px; background-size: auto; margin-inline: 30px; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ec8f5ce… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ec8f5ce… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-148.0a1-16.0-2] fixup! TB 42669: [android] Use custom no-op app-services
by boklm (＠boklm) 03 Mar '26

03 Mar '26

boklm pushed to branch tor-browser-148.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 3c502c6e by Nicolas Vigier at 2026-03-03T11:23:14+01:00 fixup! TB 42669: [android] Use custom no-op app-services TB 44690: remove nimbus handling code as it's changed in moz - - - - - 2 changed files: - mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy - mobile/android/moz.configure Changes: ===================================== mobile/android/gradle/plugins/nimbus-gradle-plugin/src/main/groovy/org/mozilla/appservices/tooling/nimbus/NimbusAssembleToolsTask.groovy ===================================== @@ -23,6 +23,12 @@ import org.gradle.api.tasks.Nested import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction +import java.io.File +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import java.nio.file.StandardCopyOption + import javax.inject.Inject import java.security.MessageDigest @@ -148,6 +154,17 @@ abstract class NimbusAssembleToolsTask extends DefaultTask { @TaskAction void assembleTools() { + String nimbusFml = System.getenv("NIMBUS_FML") + if (nimbusFml == null || "".equals(nimbusFml)) { + nimbusFml = System.getProperty("nimbusFml") + } + if (nimbusFml != null && !"".equals(nimbusFml)) { + Path source = (new File(nimbusFml)).toPath() + Path dest = fmlBinary.get().asFile.toPath() + Files.copy(source, dest, StandardCopyOption.REPLACE_EXISTING) + return + } + def binaryFile = fmlBinary.get().asFile def archiveFileObj = archiveFile.get().asFile def hashFileObj = hashFile.get().asFile ===================================== mobile/android/moz.configure ===================================== @@ -233,8 +233,8 @@ def check_host_bin_prog(var, prog, toolchain=None): ) -check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen") # tb-44669 - this was added in rebase 148 to make android compile but tracking potentially better fix +#check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen") #check_host_bin_prog("NIMBUS_FML", "nimbus-fml") project_flag( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3c502c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3c502c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0