Commit d2f6fe03 authored by intrigeri's avatar intrigeri

Merge remote-tracking branch 'origin/bugfix/11097-tor-browser-fontconfig' into devel

Fix-committed: #11097
parents 614c63ea d4a69eae
......@@ -67,11 +67,6 @@ start_browser() {
# not enough to simply set intl.locale.matchOS to true.
configure_best_tor_browser_locale "${PROFILE}"
unset SESSION_MANAGER
export FONTCONFIG_PATH="${TBB_INSTALL}/TorBrowser/Data/fontconfig"
export FONTCONFIG_FILE="fonts.conf"
exec_firefox -allow-remote --class "Tor Browser" -profile "${PROFILE}" "${@}"
}
......
......@@ -6,16 +6,30 @@ TBB_EXT=/usr/local/share/tor-browser-extensions
TOR_LAUNCHER_INSTALL=/usr/local/lib/tor-launcher-standalone
TOR_LAUNCHER_LOCALES_DIR="${TOR_LAUNCHER_INSTALL}/chrome/locale"
exec_firefox_helper() {
local binary="${1}"; shift
export LD_LIBRARY_PATH="${TBB_INSTALL}"
export FONTCONFIG_PATH="${TBB_INSTALL}/TorBrowser/Data/fontconfig"
export FONTCONFIG_FILE="fonts.conf"
# The Tor Browser often assumes that the current directory is
# where the browser lives, e.g. for the fixed set of fonts set by
# fontconfig above.
cd "${TBB_INSTALL}"
# From start-tor-browser:
unset SESSION_MANAGER
exec "${TBB_INSTALL}"/"${binary}" "${@}"
}
exec_firefox() {
LD_LIBRARY_PATH="${TBB_INSTALL}"
export LD_LIBRARY_PATH
exec "${TBB_INSTALL}"/firefox "${@}"
exec_firefox_helper firefox "${@}"
}
exec_unconfined_firefox() {
LD_LIBRARY_PATH="${TBB_INSTALL}"
export LD_LIBRARY_PATH
exec "${TBB_INSTALL}"/firefox-unconfined "${@}"
exec_firefox_helper firefox-unconfined "${@}"
}
guess_best_tor_browser_locale() {
......
features/images/BrowserAddressBar.png

1.57 KB | W: | H:

features/images/BrowserAddressBar.png

1.72 KB | W: | H:

features/images/BrowserAddressBar.png
features/images/BrowserAddressBar.png
features/images/BrowserAddressBar.png
features/images/BrowserAddressBar.png
  • 2-up
  • Swipe
  • Onion skin
features/images/I2PNetworkHidden.png

1.04 KB | W: | H:

features/images/I2PNetworkHidden.png

1.19 KB | W: | H:

features/images/I2PNetworkHidden.png
features/images/I2PNetworkHidden.png
features/images/I2PNetworkHidden.png
features/images/I2PNetworkHidden.png
  • 2-up
  • Swipe
  • Onion skin
features/images/I2PRouterConsole.png

3.05 KB | W: | H:

features/images/I2PRouterConsole.png

2.83 KB | W: | H:

features/images/I2PRouterConsole.png
features/images/I2PRouterConsole.png
features/images/I2PRouterConsole.png
features/images/I2PRouterConsole.png
  • 2-up
  • Swipe
  • Onion skin
features/images/TorBrowserNoPlugins.png

3.26 KB | W: | H:

features/images/TorBrowserNoPlugins.png

3.22 KB | W: | H:

features/images/TorBrowserNoPlugins.png
features/images/TorBrowserNoPlugins.png
features/images/TorBrowserNoPlugins.png
features/images/TorBrowserNoPlugins.png
  • 2-up
  • Swipe
  • Onion skin
features/images/TorBrowserOkButton.png

598 Bytes | W: | H:

features/images/TorBrowserOkButton.png

1.17 KB | W: | H:

features/images/TorBrowserOkButton.png
features/images/TorBrowserOkButton.png
features/images/TorBrowserOkButton.png
features/images/TorBrowserOkButton.png
  • 2-up
  • Swipe
  • Onion skin
features/images/TorBrowserPrintDialog.png

3.15 KB | W: | H:

features/images/TorBrowserPrintDialog.png

828 Bytes | W: | H:

features/images/TorBrowserPrintDialog.png
features/images/TorBrowserPrintDialog.png
features/images/TorBrowserPrintDialog.png
features/images/TorBrowserPrintDialog.png
  • 2-up
  • Swipe
  • Onion skin
features/images/TorLauncherNextButton.png

816 Bytes | W: | H:

features/images/TorLauncherNextButton.png

1.07 KB | W: | H:

features/images/TorLauncherNextButton.png
features/images/TorLauncherNextButton.png
features/images/TorLauncherNextButton.png
features/images/TorLauncherNextButton.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -810,7 +810,7 @@ When /^I can print the current page as "([^"]+[.]pdf)" to the (default downloads
end
@screen.type("p", Sikuli::KeyModifier.CTRL)
@screen.wait("TorBrowserPrintDialog.png", 10)
@screen.wait_and_click("PrintToFile.png", 10)
@screen.wait_and_click("BrowserPrintToFile.png", 10)
@screen.wait_and_double_click("TorBrowserPrintOutputFile.png", 10)
@screen.hide_cursor
@screen.wait("TorBrowserPrintOutputFileSelected.png", 10)
......
......@@ -5,7 +5,7 @@ end
Then /^I can print the current document to "([^"]+)"$/ do |output_file|
@screen.type("p", Sikuli::KeyModifier.CTRL)
@screen.wait("EvincePrintDialog.png", 10)
@screen.wait_and_click("PrintToFile.png", 10)
@screen.wait_and_click("EvincePrintToFile.png", 10)
@screen.wait_and_click("EvincePrintOutputFileButton.png", 10)
@screen.wait("EvincePrintFileDialog.png", 10)
# Only the file's basename is selected by double-clicking,
......
......@@ -94,8 +94,10 @@ the corresponding tarballs ourselves, so read on the next section.
Sync with the start-tor-browser script
======================================
Adapt our `config/chroot_local-includes/usr/local/bin/tor-browser` for
recent changes in `RelativeLink/start-tor-browser` in the
Adapt our `config/chroot_local-includes/usr/local/bin/tor-browser`
and/or
`config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh`
for recent changes in `RelativeLink/start-tor-browser` in the
[Tor Browser Bundle Git repo](https://git.torproject.org/builders/tor-browser-bundle.git). Look
in the Git history:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment