From 85eb40aee45e2c62a802cdf4699f52caea22e40a Mon Sep 17 00:00:00 2001
From: daijro <daijro.dev@gmail.com>
Date: Thu, 21 Nov 2024 01:59:01 -0600
Subject: [PATCH] Leak fixes #90

---
 assets/base.mozconfig       |  2 --
 scripts/copy-additions.sh   |  3 ---
 scripts/generate-locales.sh | 49 -------------------------------------
 settings/camoufox.cfg       |  9 ++-----
 4 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 scripts/generate-locales.sh

diff --git a/assets/base.mozconfig b/assets/base.mozconfig
index 99b2fd3..588160e 100644
--- a/assets/base.mozconfig
+++ b/assets/base.mozconfig
@@ -22,8 +22,6 @@ ac_add_options --with-branding=browser/branding/camoufox
 
 ac_add_options --with-unsigned-addon-scopes=app,system
 
-ac_add_options --with-l10n-base=$PWD/browser/locales/l10n
-
 ac_add_options --enable-bootstrap
 
 export MOZ_REQUIRE_SIGNING=
diff --git a/scripts/copy-additions.sh b/scripts/copy-additions.sh
index aafc19f..91959c7 100644
--- a/scripts/copy-additions.sh
+++ b/scripts/copy-additions.sh
@@ -50,6 +50,3 @@ run 'cp -v ../scripts/mozfetch.sh lw/'
 for file in "browser/config/version.txt" "browser/config/version_display.txt"; do
     echo "${version}-${release}" > "$file"
 done
-
-# Generate locales
-run "bash ../scripts/generate-locales.sh"
\ No newline at end of file
diff --git a/scripts/generate-locales.sh b/scripts/generate-locales.sh
deleted file mode 100644
index e5fa3bb..0000000
--- a/scripts/generate-locales.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/bash
-
-if [ ! -f browser/locales/shipped-locales ]; then
-  echo "ERROR: Run this script from the root of the Camoufox source code"
-  exit 1
-fi
-
-rm -rf browser/locales/l10n
-mkdir browser/locales/l10n
-
-N=8
-for i in $(seq $N); do echo; done
-total=$(wc -l < browser/locales/shipped-locales)
-
-echo_status() {
-  printf "\033[$((($N - $n) + 1))A$@ %40s\r\033[$((($N - $n) + 1))B"
-}
-
-generate_locale() {
-  if echo " en-US ca ja " | grep -q " $1 "; then
-    echo_status "Skipping locale \"$1\""
-    sleep 1
-    echo_status
-    return
-  fi
-  echo_status "Downloading locale \"$1\""
-  wget -q -O browser/locales/l10n/$1.zip https://hg.mozilla.org/l10n-central/$1/archive/tip.zip
-  echo_status "Extracting locale \"$1\""
-  7z x -y -obrowser/locales/l10n browser/locales/l10n/$1.zip > /dev/null
-  mv browser/locales/l10n/$1-*/ browser/locales/l10n/$1/
-  rm -f browser/locales/l10n/$1.zip
-  echo_status "Generating locale \"$1\""
-  mv browser/locales/l10n/$1/browser/branding/official browser/locales/l10n/$1/browser/branding/camoufox
-  find browser/locales/l10n/$1 -type f -exec sed -i -e 's/Mozilla Firefox/Camoufox/g' {} \;
-  find browser/locales/l10n/$1 -type f -exec sed -i -e 's/Mozilla/Camoufox/g' {} \;
-  find browser/locales/l10n/$1 -type f -exec sed -i -e 's/Firefox/Camoufox/g' {} \;
-  echo_status "Done"
-  sleep 0.3
-  echo_status
-}
-
-while read in; do
-  ((n=n%N)); ((n++==0)) && wait
-  generate_locale $in &
-done < browser/locales/shipped-locales
-
-wait
-
-printf "\033[$(($N))A\rGenerated $total locales %-40s\n"
\ No newline at end of file
diff --git a/settings/camoufox.cfg b/settings/camoufox.cfg
index f825aaf..56448f7 100644
--- a/settings/camoufox.cfg
+++ b/settings/camoufox.cfg
@@ -189,12 +189,6 @@ defaultPref("print.tab_modal.enabled", false);
 defaultPref("browser.tabs.tabMinWidth", 120);
 defaultPref("layout.css.always_underline_links", true);
 
-// No WebGL
-defaultPref("webgl.disabled", true);
-// Force software rendering
-defaultPref("webgl.forbid-hardware", true);
-defaultPref("webgl.forbid-software", false);
-
 // Debloat pt.2 (from Librewolf)
 
 // Forms
@@ -752,7 +746,8 @@ defaultPref("toolkit.telemetry.server", "");
 defaultPref("extensions.blocklist.enabled", false);
 
 // Force Firefox Devtools to open in a separate window.
-defaultPref("devtools.toolbox.host", "window");
+// Causes strange artifacts that make it difficult to debug:
+// defaultPref("devtools.toolbox.host", "window");
 
 // Disable auto translations
 defaultPref("browser.translations.enable", false);