Browse Source

fix suite bustage from bug 1880242

Bill Gianopoulos 8 months ago
parent
commit
416d082743
2 changed files with 51 additions and 0 deletions
  1. 50 0
      comm-central/patches/9999999-suite-bustage.patch
  2. 1 0
      comm-central/patches/series

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

@@ -0,0 +1,50 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1708522134 0
+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
+--- a/mail/extensions/openpgp/moz.build
++++ b/mail/extensions/openpgp/moz.build
+@@ -1,17 +1,12 @@
+ # 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
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-XPIDL_SOURCES += [
+-    "nsIMsgOpenPGPSink.idl",
+-]
+-
+-XPIDL_MODULE = "msgbase"
+ 
+ JAR_MANIFESTS += ["jar.mn"]
+ 
+ EXTRA_JS_MODULES += ["PgpMimeHandler.sys.mjs"]
+ 
+ XPCSHELL_TESTS_MANIFESTS += ["test/unit/rnp/xpcshell.ini"]
+ 
+ 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

+ 1 - 0
comm-central/patches/series

@@ -1,5 +1,6 @@
 9999999-port1877852-suite-bustage.patch
 9999999-port1823953-suite-bustage.patch
+9999999-suite-bustage.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch
 TOP-1611647-1-rename-xul-suite.patch