9999999-port1900200-suite-bustage.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. # HG changeset patch
  2. # User Bill Gianopoulos <wgianopoulos@gmail.com>
  3. # Date 1718654652 0
  4. Bug 9999999 - Port bug 1900200 to suite.
  5. Bug 1900200 - Move MOZ_DEVTOOLS from confvars.sh to moz.configure
  6. diff --git a/suite/confvars.sh b/suite/confvars.sh
  7. --- a/suite/confvars.sh
  8. +++ b/suite/confvars.sh
  9. @@ -17,12 +17,9 @@ MOZ_UPDATER=1
  10. # If more than one ID is needed, then you should use a comma separated list
  11. # of values.
  12. ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
  13. # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
  14. MAR_CHANNEL_ID=seamonkey-comm-central
  15. MOZ_PROFILE_MIGRATOR=1
  16. -# Include the DevTools client, not just the server (which is the default)
  17. -MOZ_DEVTOOLS=all
  18. -
  19. NSS_EXTRA_SYMBOLS_FILE=../comm/mailnews/nss-extra.symbols
  20. diff --git a/suite/moz.configure b/suite/moz.configure
  21. --- a/suite/moz.configure
  22. +++ b/suite/moz.configure
  23. @@ -5,16 +5,18 @@
  24. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  25. set_config("MOZ_SUITE", True)
  26. set_define("MOZ_SUITE", True)
  27. imply_option("MOZ_APP_BASENAME", "SeaMonkey")
  28. imply_option("MOZ_APP_ID", "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}")
  29. imply_option("MOZ_APP_VENDOR", "Mozilla")
  30. +# Include the DevTools client, not just the server (which is the default)
  31. +imply_option("MOZ_DEVTOOLS", "all")
  32. imply_option('--enable-default-browser-agent', False)
  33. @depends(target_is_windows, target_has_linux_kernel)
  34. def bundled_fonts(is_windows, is_linux):
  35. if is_windows or is_linux:
  36. return True