Bill Gianopoulos 3 years ago
parent
commit
cb1d99e2da
2 changed files with 11 additions and 8 deletions
  1. 10 7
      frg-buildfixes/comm/9999999-disablemaint-257.patch
  2. 1 1
      frg-buildfixes/comm/series

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

@@ -9,21 +9,23 @@ Port Bug 1491419 part 1 "move --enable-maintenance-service to moz.configue"
 diff --git a/suite/moz.configure b/suite/moz.configure
 --- a/suite/moz.configure
 +++ b/suite/moz.configure
-@@ -8,16 +8,21 @@ set_config('MOZ_SUITE', True)
- set_define('MOZ_SUITE', True)
+@@ -9,16 +9,24 @@ set_define('MOZ_SUITE', True)
  
  set_define('MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES', True)
  
- 
  imply_option('MOZ_PLACES', True)
  imply_option('MOZ_SERVICES_SYNC', False)
  imply_option('MOZ_ALLOW_LEGACY_EXTENSIONS', True)
-+
+ 
+ 
 +@depends(target)
-+def is_winnt(target):
++def is_winnt(target)
 +    if target.os == "WINNT":
-+        imply_option('--enable-maintenance-service', False)
- 
++    return True
++
++imply_option('--enable-maintenance-service', False)
++
++
  @depends(application)
  def is_comm(app):
      return app[0].startswith('comm/')
@@ -31,3 +33,4 @@ diff --git a/suite/moz.configure b/suite/moz.configure
  
  @depends(is_comm)
  def toolkit_configure(is_comm):
+     if is_comm:

+ 1 - 1
frg-buildfixes/comm/series

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