Browse Source

disable maintenance service

Bill Gianopoulos 3 years ago
parent
commit
a559c95c62

+ 0 - 36
frg-buildfixes/comm/9999999-disablemaint-257.patch

@@ -1,36 +0,0 @@
-# HG changeset patch
-# User Frank-Rainer Grahl <frgrahl@gmx.net>
-# Date 1603751310 -3600
-# Parent  34cd15bde894ca5d89768e61b40af24761dec082
-Bug 9999999 - Disable maintenance service for SeaMonkey. r=IanN a=IanN
-
-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
-@@ -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):
-+    if target.os == "WINNT":
-+        return True
-+
-+imply_option('--enable-maintenance-service', False)
-+
-+
- @depends(application)
- def is_comm(app):
-     return app[0].startswith('comm/')
- 
- 
- @depends(is_comm)
- def toolkit_configure(is_comm):
-     if is_comm:

+ 0 - 1
frg-buildfixes/comm/series

@@ -316,7 +316,6 @@ 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
 1600103-port296655-257.patch
 1673959-subscribe-1425962-257.patch
 1673959-subscribe-1466705-257.patch

+ 39 - 0
frg-buildfixes/mozilla/TOP-9999999-disablemaint-257.patch

@@ -0,0 +1,39 @@
+
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1606573580 18000
+#      Sat Nov 28 09:26:20 2020 -0500
+Bug 9999999 - Disable maintenance service for SeaMonkey.
+
+diff --git a/toolkit/moz.configure b/toolkit/moz.configure
+--- a/toolkit/moz.configure
++++ b/toolkit/moz.configure
+@@ -1366,25 +1366,25 @@ def unsigned_addon_scopes(scopes):
+     )
+ 
+ set_config('MOZ_UNSIGNED_APP_SCOPE', unsigned_addon_scopes.app)
+ set_config('MOZ_UNSIGNED_SYSTEM_SCOPE', unsigned_addon_scopes.system)
+ 
+ # Maintenance service (Windows only)
+ # ==============================================================
+ 
+-option('--enable-maintenance-service',
++option('--disable-maintenance-service',
+        when=target_is_windows, default=target_is_windows,
+        help='{Enable|Disable} building of maintenance service')
+ 
+ set_define('MOZ_MAINTENANCE_SERVICE',
+-           depends_if('--enable-maintenance-service',
++           depends_if('--disable-maintenance-service',
+                       when=target_is_windows)(lambda _: False))
+ set_config('MOZ_MAINTENANCE_SERVICE',
+-           depends_if('--enable-maintenance-service',
++           depends_if('--disable-maintenance-service',
+                       when=target_is_windows)(lambda _: False))
+ 
+ # Bundled fonts on desktop platform
+ # ==============================================================
+ 
+ @depends(target)
+ def bundled_fonts_default(target):
+     return target.os == 'WINNT' or target.kernel == 'Linux'

+ 1 - 0
frg-buildfixes/mozilla/series

@@ -2426,6 +2426,7 @@ TOP-1493400-6-PLASTER-dav1d-avoid-mColorDepth-257.patch
 TOP-1445683-14-PLASTER-aom-fix-win32-bustage-257.patch
 TOP-1294490-7-PLASTER-webp-257.patch
 TOP-9999999-fixlangpack-257.patch
+TOP-9999999-disablemaint-257.patch
 1395504-61a1.patch
 1457545-1-62a1.patch
 1457545-2-62a1.patch