Browse Source

Revert "fix bustage form bug 18732"

This reverts commit 0b3c04c6446c199e5a37fcce70424fc2af3ede98.
Bill Gianopoulos 2 months ago
parent
commit
b748a2b852
1 changed files with 0 additions and 73 deletions
  1. 0 73
      comm-central/patches/9999999-port18732-suite-bustage.patch

+ 0 - 73
comm-central/patches/9999999-port18732-suite-bustage.patch

@@ -1,73 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1722078693 0
-Bug 9999999 - Port bug 18732 to suite.
-Bug 18732 - Add the linux system tray icon crate and its ksni dependency,
-
-diff --git a/suite/moz.build b/suite/moz.build
---- a/suite/moz.build
-+++ b/suite/moz.build
-@@ -16,16 +16,21 @@ DIRS += [
-     "extensions",
-     "locales",
-     "mailnews",
-     "modules",
-     "themes/classic",
-     "themes/modern",
- ]
- 
-+if CONFIG["MOZ_OVERRIDE_GKRUST"]:
-+    DIRS += [
-+        "../rust",
-+    ]
-+
- if CONFIG['MOZ_IRC']:
-     DIRS += ['chatzilla']
- 
- if CONFIG["MAKENSISU"]:
-     DIRS += ["installer/windows"]
- 
- if CONFIG["MOZ_BUNDLED_FONTS"]:
-     DIRS += ["/browser/fonts"]
-diff --git a/suite/moz.configure b/suite/moz.configure
---- a/suite/moz.configure
-+++ b/suite/moz.configure
-@@ -74,16 +74,38 @@ set_defconf("SEAMONKEY_VERSION", seamonk
- set_defconf("SEAMONKEY_VERSION_DISPLAY", seamonkey_version.version_display)
- # Currently not set in suite comm-central
- # set_defconf("MOZ_PKG_VERSION", seamonkey_version.version_package)
- 
- 
- imply_option("MOZ_PLACES", True)
- imply_option("MOZ_SERVICES_SYNC", False)
- 
-+# Thunderbird Rust code is now the default
-+option("--disable-thunderbird-rust", help="Enable Rust support within Thunderbird")
-+
-+set_config("MOZ_THUNDERBIRD_RUST", True, when="--enable-thunderbird-rust")
-+set_define("MOZ_THUNDERBIRD_RUST", True, when="--enable-thunderbird-rust")
-+set_config("MOZ_OVERRIDE_GKRUST", True, when="--enable-thunderbird-rust")
-+
-+
-+@depends("--enable-thunderbird-rust")
-+def moz_override_cargo_config(enable_rust):
-+    rust_override = "comm/rust/.cargo/config.toml.in"
-+    if enable_rust:
-+        log.info(f"Using {rust_override} for Rust code.")
-+        return rust_override
-+
-+
-+set_config(
-+    "MOZ_OVERRIDE_CARGO_CONFIG",
-+    moz_override_cargo_config,
-+    when="--enable-thunderbird-rust",
-+)
-+
- # Building extensions is disabled by default.
- 
- # =========================================================
- # = ChatZilla extension
- # =========================================================
- option(
-     "--enable-irc", default=False, help="Enable building of the ChatZilla IRC extension"
- )