[tbb-commits] [tor-browser] 01/10: fixup! TB3: Tor Browser's official .mozconfigs.

[gitolite role]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2
in repository tor-browser.

commit 6fc29f91fbe8576a3b935c44f3aa4674d4980a57
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Mon Oct 10 15:34:25 2022 +0200

    fixup! TB3: Tor Browser's official .mozconfigs.
    
    Bug 40933: Move tor-launcher to tor-browser.git
---
 browser/config/mozconfigs/tor-browser-android |  3 ---
 browser/installer/Makefile.in                 |  4 ----
 moz.configure                                 | 18 ------------------
 mozconfig-linux-x86_64-dev                    |  1 -
 4 files changed, 26 deletions(-)

diff --git a/browser/config/mozconfigs/tor-browser-android b/browser/config/mozconfigs/tor-browser-android
index 1aef19a587a3..484f6303c6b4 100644
--- a/browser/config/mozconfigs/tor-browser-android
+++ b/browser/config/mozconfigs/tor-browser-android
@@ -2,9 +2,6 @@
 
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 
-# We do not use Tor Launcher on Android:
-ac_add_options --disable-tor-launcher
-
 ac_add_options --disable-tor-browser-update
 ac_add_options --disable-verify-mar
 
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index f5411547c0a7..e1e0a15e86a0 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -82,10 +82,6 @@ endif
 endif
 endif
 
-ifdef TOR_BROWSER_DISABLE_TOR_LAUNCHER
-DEFINES += -DTOR_BROWSER_DISABLE_TOR_LAUNCHER
-endif
-
 ifdef TOR_BROWSER_UPDATE
 DEFINES += -DTOR_BROWSER_UPDATE
 endif
diff --git a/moz.configure b/moz.configure
index d7073eba80b7..7ec6d25a8ac1 100755
--- a/moz.configure
+++ b/moz.configure
@@ -1107,24 +1107,6 @@ add_old_configure_assignment(
     "TOR_BROWSER_DATA_OUTSIDE_APP_DIR", tor_browser_data_outside_app_dir)
 
 
-option(
-    "--disable-tor-launcher",
-    help="Do not include Tor Launcher"
-)
-
-
- at depends("--disable-tor-launcher")
-def tor_browser_disable_launcher(value):
-    if not value:
-        return True
-
-
-set_config("TOR_BROWSER_DISABLE_TOR_LAUNCHER", tor_browser_disable_launcher)
-set_define("TOR_BROWSER_DISABLE_TOR_LAUNCHER", tor_browser_disable_launcher)
-add_old_configure_assignment(
-    "TOR_BROWSER_DISABLE_TOR_LAUNCHER", tor_browser_disable_launcher)
-
-
 # Please do not add configure checks from here on.
 
 # Fallthrough to autoconf-based configure
diff --git a/mozconfig-linux-x86_64-dev b/mozconfig-linux-x86_64-dev
index 06d16d40fcf1..491fc507362f 100644
--- a/mozconfig-linux-x86_64-dev
+++ b/mozconfig-linux-x86_64-dev
@@ -9,7 +9,6 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 
-ac_add_options --enable-tor-launcher
 ac_add_options --disable-tor-browser-update
 ac_add_options --with-tor-browser-version=dev-build
 ac_add_options --without-wasm-sandboxed-libraries

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.