|
@@ -1,25 +1,22 @@
|
|
|
# HG changeset patch
|
|
# HG changeset patch
|
|
|
# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
-# Date 1716023254 0
|
|
|
|
|
|
|
+# Date 1708522134 0
|
|
|
Bug 9999999 - remove bad dependency on mail/extensions/openpgp in mailnewsr/base.
|
|
Bug 9999999 - remove bad dependency on mail/extensions/openpgp in mailnewsr/base.
|
|
|
|
|
|
|
|
diff --git a/mail/extensions/openpgp/moz.build b/mail/extensions/openpgp/moz.build
|
|
diff --git a/mail/extensions/openpgp/moz.build b/mail/extensions/openpgp/moz.build
|
|
|
--- a/mail/extensions/openpgp/moz.build
|
|
--- a/mail/extensions/openpgp/moz.build
|
|
|
+++ b/mail/extensions/openpgp/moz.build
|
|
+++ b/mail/extensions/openpgp/moz.build
|
|
|
-@@ -1,20 +1,14 @@
|
|
|
|
|
|
|
+@@ -1,17 +1,12 @@
|
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
|
|
|
|
- with Files("**"):
|
|
|
|
|
- BUG_COMPONENT = ("MailNews Core", "Security: OpenPGP")
|
|
|
|
|
-
|
|
|
|
|
-XPIDL_SOURCES += [
|
|
-XPIDL_SOURCES += [
|
|
|
- "nsIMsgOpenPGPSink.idl",
|
|
- "nsIMsgOpenPGPSink.idl",
|
|
|
-]
|
|
-]
|
|
|
-
|
|
-
|
|
|
-XPIDL_MODULE = "msgbase"
|
|
-XPIDL_MODULE = "msgbase"
|
|
|
--
|
|
|
|
|
|
|
+
|
|
|
JAR_MANIFESTS += ["jar.mn"]
|
|
JAR_MANIFESTS += ["jar.mn"]
|
|
|
|
|
|
|
|
EXTRA_JS_MODULES += ["PgpMimeHandler.sys.mjs"]
|
|
EXTRA_JS_MODULES += ["PgpMimeHandler.sys.mjs"]
|
|
@@ -27,3 +24,27 @@ diff --git a/mail/extensions/openpgp/moz.build b/mail/extensions/openpgp/moz.bui
|
|
|
XPCSHELL_TESTS_MANIFESTS += ["test/unit/rnp/xpcshell.ini"]
|
|
XPCSHELL_TESTS_MANIFESTS += ["test/unit/rnp/xpcshell.ini"]
|
|
|
|
|
|
|
|
XPCOM_MANIFESTS += ["components.conf"]
|
|
XPCOM_MANIFESTS += ["components.conf"]
|
|
|
|
|
+diff --git a/mailnews/base/public/moz.build b/mailnews/base/public/moz.build
|
|
|
|
|
+--- a/mailnews/base/public/moz.build
|
|
|
|
|
++++ b/mailnews/base/public/moz.build
|
|
|
|
|
+@@ -39,16 +39,17 @@ XPIDL_SOURCES += [
|
|
|
|
|
+ "nsIMsgHdr.idl",
|
|
|
|
|
+ "nsIMsgIdentity.idl",
|
|
|
|
|
+ "nsIMsgIncomingServer.idl",
|
|
|
|
|
+ "nsIMsgMailNewsUrl.idl",
|
|
|
|
|
+ "nsIMsgMailSession.idl",
|
|
|
|
|
+ "nsIMsgMdnGenerator.idl",
|
|
|
|
|
+ "nsIMsgMessageService.idl",
|
|
|
|
|
+ "nsIMsgOfflineManager.idl",
|
|
|
|
|
++ "nsIMsgOpenPGPSink.idl",
|
|
|
|
|
+ "nsIMsgPluggableStore.idl",
|
|
|
|
|
+ "nsIMsgProgress.idl",
|
|
|
|
|
+ "nsIMsgProtocolHandler.idl",
|
|
|
|
|
+ "nsIMsgProtocolInfo.idl",
|
|
|
|
|
+ "nsIMsgPurgeService.idl",
|
|
|
|
|
+ "nsIMsgShutdown.idl",
|
|
|
|
|
+ "nsIMsgStatusFeedback.idl",
|
|
|
|
|
+ "nsIMsgTagService.idl",
|
|
|
|
|
+diff --git a/mail/extensions/openpgp/nsIMsgOpenPGPSink.idl b/mailnews/base/public/nsIMsgOpenPGPSink.idl
|
|
|
|
|
+rename from mail/extensions/openpgp/nsIMsgOpenPGPSink.idl
|
|
|
|
|
+rename to mailnews/base/public/nsIMsgOpenPGPSink.idl
|
Bill Gianopoulos