[tbb-bugs] #33533 [Applications/Tor Browser]: Rebase Tor Browser esr68 patches on top of mozilla-central

[Tor Bug Tracker & Wiki]

#33533: Rebase Tor Browser esr68 patches on top of mozilla-central
--------------------------------------+--------------------------------
 Reporter:  acat                      |          Owner:  acat
     Type:  task                      |         Status:  needs_review
 Priority:  Medium                    |      Milestone:
Component:  Applications/Tor Browser  |        Version:
 Severity:  Normal                    |     Resolution:
 Keywords:  TorBrowserTeam202003R     |  Actual Points:  14
Parent ID:                            |         Points:
 Reviewer:  sysrqb, pospeselr         |        Sponsor:  Sponsor58-must
--------------------------------------+--------------------------------
Changes (by acat):

 * actualpoints:  12 => 14


Comment:

 It seems the build error from comment:3 was fixed in
 https://bugzilla.mozilla.org/show_bug.cgi?id=1620744. So to get a working
 tor-browser-build I decided to rebase the patches from 33533 to a recent
 mozilla-central.
 The result of that is in https://github.com/acatarineu/tor-
 browser/commits/33533+1.

 FWIW, these are the conflicts that occurred in the process:

 {{{
 Patch failed at 0011 Bug 10760: Integrate TorButton to TorBrowser core
   browser/base/content/browser-menubar.inc

 Patch failed at 0019 Bug 2176: Rebrand Firefox to TorBrowser
   browser/components/enterprisepolicies/content/aboutPolicies.html
   browser/components/privatebrowsing/content/aboutPrivateBrowsing.html

 Patch failed at 0035 Bug 4234: Use the Firefox Update Process for Tor
 Browser.
   toolkit/mozapps/update/updater/moz.build

 Patch failed at 0059 Bug 23247: Communicating security expectations for
 .onion
   browser/base/content/browser-siteIdentity.js
   docshell/base/nsDocShell.cpp
   dom/security/nsMixedContentBlocker.cpp

 Patch failed at 0076 Bug 26345: Hide tracking protection UI
   browser/base/content/browser-siteIdentity.js

 Patch failed at 0078 Bug 31575: Replace Firefox Home (newtab) with
 about:tor
   browser/components/newtab/AboutNewTabService.jsm

 Patch failed at 0099 Bug 32414: Make Services.search.addEngine obey FPI
   toolkit/components/search/SearchEngine.jsm
 }}}

 Besides, I had to fix a compilation error in `Bug 23104: Add a default
 line height compensation` because of a new call to `GetNormalLineHeight`
 that needed to be changed
 (https://bugzilla.mozilla.org/show_bug.cgi?id=1623124).

 Most conflicts were straightforward to solve. Perhaps the one that changed
 a bit more was `Bug 31575: Replace Firefox Home (newtab) with about:tor`.
 In https://bugzilla.mozilla.org/show_bug.cgi?id=1619992 `AboutNewTab.init`
 was moved to `BrowserGlue.jsm`, so I had to fix the patch and remove it
 from there.

 Something I did not mention before is the last 4 commits of the branch.
 One is just to set a temp torbutton submodule on my repo, the others are
 quick fixes for #33697, #33734 and #33726. I added these to get a better
 looking build, but these should be probably investigated deeper and solved
 in the respective tickets.

 ----

 After rebasing to latest mozilla-central, and a few more changes to tor-
 browser-build (https://github.com/acatarineu/tor-browser-
 build/commit/33533+1) I could get a testbuild for linux64 working.

 The changes from previous tor-browser-build branch (33533) were due to
 https://bugzilla.mozilla.org/show_bug.cgi?id=1594933 (libnssdbm3.so is not
 there by default anymore) and to address_a python3 error complaining about
 `_sqlite3` module not being available (installing libsqlite3-dev before
 compiling Python solves the issue).

 I assume there will be more work needed (e.g. did not try to build mac or
 win), but I hope having a linux64 build that "seems to work" is useful for
 now.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/33533#comment:9>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online