Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • Tor Browser Tor Browser
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 837
    • Issues 837
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 4
    • Merge requests 4
  • Deployments
    • Deployments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • The Tor Project
  • Applications
  • Tor BrowserTor Browser
  • Merge requests
  • !243

Resolve Bug 40769: rebase tor-browser patches to geckoview-96.0-11.5-1

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Pier Angelo Vendrame requested to merge pierov/tor-browser:bug_40769 into geckoview-96.0-11.5-1 Jan 11, 2022
  • Overview 20
  • Commits 65
  • Changes 534

I have rebased our patches to geckoview-96.0-11.5-1.

I had some issues with Bug 19273, please have a look at the original issue for more details.

Please notice that this did not compile with rbm.

First, I had to change GRADLE_FLAGS not to use the offline mode:

export GRADLE_FLAGS="--no-daemon"

Then, I had to add --without-wasm-sandboxed-libraries to the ./mach configure command.

Then, I had some issues with the JDK:

 0:02.41 ERROR: Could not locate Java at /var/tmp/tmp.dbXU5uHUgD/.mozbuild/jdk/jdk8u312-b07/bin, please run ./mach bootstrap --no-system-changes

Finally, ./mach configure failed because it ignored the if not CONFIG["TOR_BROWSER_VERSION"]: in toolkit/modules/moz.build, so I had to remove a pair of additions to EXTRA_JS_MODULES.

If you do that inside the debug shell, ./mach build succeeds, so the patches of this MR should be okay (I expect most of the other problems are to be solved in tor-browser-build). However, in this way, I did not get a full Tor Browser package to test, so I am not really sure they work.

Edited Feb 17, 2022 by Pier Angelo Vendrame
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: bug_40769