Browse Source

fix disable-maintenance-service patch

Bill Gianopoulos 3 years ago
parent
commit
727eaeb320

+ 7 - 8
frg-buildfixes/comm/9999999-disablemaint-257.patch

@@ -9,21 +9,20 @@ Port Bug 1491419 part 1 "move --enable-maintenance-service to moz.configue"
 diff --git a/suite/moz.configure b/suite/moz.configure
 diff --git a/suite/moz.configure b/suite/moz.configure
 --- a/suite/moz.configure
 --- a/suite/moz.configure
 +++ b/suite/moz.configure
 +++ b/suite/moz.configure
-@@ -4,20 +4,21 @@
- # 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/.
- 
- set_config('MOZ_SUITE', True)
+@@ -8,16 +8,21 @@ set_config('MOZ_SUITE', True)
  set_define('MOZ_SUITE', True)
  set_define('MOZ_SUITE', True)
  
  
  set_define('MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES', True)
  set_define('MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES', True)
  
  
-+
+ 
  imply_option('MOZ_PLACES', True)
  imply_option('MOZ_PLACES', True)
  imply_option('MOZ_SERVICES_SYNC', False)
  imply_option('MOZ_SERVICES_SYNC', False)
  imply_option('MOZ_ALLOW_LEGACY_EXTENSIONS', True)
  imply_option('MOZ_ALLOW_LEGACY_EXTENSIONS', True)
--
-+imply_option('--enable-maintenance-service', False)
++
++@depends(target)
++def is_winnt(target):
++    if target.os == "WINNT":
++        imply_option('--enable-maintenance-service', False)
  
  
  @depends(application)
  @depends(application)
  def is_comm(app):
  def is_comm(app):

+ 1 - 1
frg-buildfixes/comm/series

@@ -316,7 +316,7 @@ WIP-1655362-default-zoom-v3.patch
 1645892-1-port1475647-257.patch
 1645892-1-port1475647-257.patch
 1645892-2-port1468222-257.patch
 1645892-2-port1468222-257.patch
 1646495-remove-nsIHTTPIndex-v1_1-257.patch
 1646495-remove-nsIHTTPIndex-v1_1-257.patch
-#9999999-disablemaint-257.patch
+9999999-disablemaint-257.patch
 1600103-port296655-257.patch
 1600103-port296655-257.patch
 1673959-subscribe-1425962-257.patch
 1673959-subscribe-1425962-257.patch
 1673959-subscribe-1466705-257.patch
 1673959-subscribe-1466705-257.patch