Browse Source

Bug 1783623 fix shell service

Bill Gianopoulos 2 years ago
parent
commit
9da371c764
1 changed files with 54 additions and 5 deletions
  1. 54 5
      comm-central/patches/WIP-1783623-port1524687-suite.patch

+ 54 - 5
comm-central/patches/WIP-1783623-port1524687-suite.patch

@@ -4,12 +4,59 @@
 Bug 1783623 - Convert suite binary components registration to components.conf.
 Bug 1783623 - Convert suite binary components registration to components.conf.
 Port Bug 1524687 Part 11  to suite.
 Port Bug 1524687 Part 11  to suite.
 
 
+diff --git a/suite/components/build/components.conf b/suite/components/build/components.conf
+new file mode 100644
+--- /dev/null
++++ b/suite/components/build/components.conf
+@@ -0,0 +1,44 @@
++# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
++# vim: set filetype=python:
++# 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/.
++
++Classes = []
++
++TOOLKIT = buildconfig.substs['MOZ_WIDGET_TOOLKIT']
++
++shell_service_contracts = [
++    '@mozilla.org/suite/shell-service;1',
++    '@mozilla.org/toolkit/shell-service;1',
++]
++
++if TOOLKIT == 'gtk':
++    Classes += [
++        {
++            'cid': '{39b688ec-e308-49e5-be6b-28dc7fcd6154}',
++            'contract_ids': shell_service_contracts,
++            'type': 'nsGNOMEShellService',
++            'headers': ['/suite/components/shell/nsGNOMEShellService.h'],
++            'init_method': 'Init',
++        },
++    ]
++
++if buildconfig.substs['OS_ARCH'] == 'Darwin':
++    Classes += [
++        {
++            'cid': '{39b688ec-e308-49e5-be6b-28dc7fcd6154}',
++            'contract_ids': shell_service_contracts,
++            'type': 'nsMacShellService',
++            'headers': ['/suite/components/shell/nsMacShellService.h'],
++        },
++    ]
++elif buildconfig.substs['OS_ARCH'] == 'WINNT':
++    Classes += [
++        {
++            'cid': '{39b688ec-e308-49e5-be6b-28dc7fcd6154}',
++            'contract_ids': shell_service_contracts,
++            'type': 'nsWindowsShellService',
++            'headers': ['/suite/components/shell/nsWindowsShellService.h'],
++        },
++    ]
 diff --git a/suite/components/build/moz.build b/suite/components/build/moz.build
 diff --git a/suite/components/build/moz.build b/suite/components/build/moz.build
 --- a/suite/components/build/moz.build
 --- a/suite/components/build/moz.build
 +++ b/suite/components/build/moz.build
 +++ b/suite/components/build/moz.build
-@@ -1,14 +1,10 @@
- # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
- # vim: set filetype=python:
+@@ -3,18 +3,18 @@
  # 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/.
@@ -20,8 +67,10 @@ diff --git a/suite/components/build/moz.build b/suite/components/build/moz.build
  
  
 -SOURCES += [
 -SOURCES += [
 -    "nsSuiteModule.cpp",
 -    "nsSuiteModule.cpp",
--]
--
++XPCOM_MANIFESTS += [
++    "components.conf",
+ ]
+ 
  Library("suite")
  Library("suite")
  FINAL_LIBRARY = "xul"
  FINAL_LIBRARY = "xul"