Bug 1313885 - Port bug 1252570. Remove payments support from Seamonkey. r=IanN a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sun, 30 Oct 2016 15:30:44 +0100
changeset 27622 367e660506d18e9bf5744be5829bea46615b20f3
parent 27621 8092e9f6af685dcbbd97c02b0ac4282e29f8c82f
child 27623 6cc9a5013cea95365d71a314f30c337ce69e5a32
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs1313885, 1252570
Bug 1313885 - Port bug 1252570. Remove payments support from Seamonkey. r=IanN a=IanN
suite/confvars.sh
suite/installer/package-manifest.in
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -17,18 +17,16 @@ MOZ_EXTENSIONS_DEFAULT=" inspector irc g
 MOZ_UPDATER=1
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
 MOZ_MORK=1
-# Enable navigator.mozPay
-MOZ_PAY=1
 MOZ_SAFE_BROWSING=1
 MOZ_SERVICES_FXACCOUNTS=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 MOZ_URL_CLASSIFIER=1
 MOZ_WEBGL_CONFORMANT=1
 MOZ_WEBM_ENCODER=1
 MOZ_BINARY_EXTENSIONS=1
 
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -191,19 +191,16 @@
 @RESPATH@/components/dom_geolocation.xpt
 @RESPATH@/components/dom_html.xpt
 @RESPATH@/components/dom_json.xpt
 @RESPATH@/components/dom_media.xpt
 @RESPATH@/components/dom_mobilemessage.xpt
 @RESPATH@/components/dom_network.xpt
 @RESPATH@/components/dom_notification.xpt
 @RESPATH@/components/dom_offline.xpt
-#ifdef MOZ_PAY
-@RESPATH@/components/dom_payment.xpt
-#endif
 @RESPATH@/components/dom_permissionsettings.xpt
 @RESPATH@/components/dom_power.xpt
 @RESPATH@/components/dom_push.xpt
 @RESPATH@/components/dom_presentation.xpt
 @RESPATH@/components/dom_quota.xpt
 @RESPATH@/components/dom_range.xpt
 @RESPATH@/components/dom_security.xpt
 @RESPATH@/components/dom_settings.xpt
@@ -482,21 +479,16 @@
 @RESPATH@/components/nsURLFormatter.manifest
 @RESPATH@/components/nsWebHandlerApp.js
 @RESPATH@/components/nsWebHandlerApp.manifest
 @RESPATH@/components/PACGenerator.js
 @RESPATH@/components/PACGenerator.manifest
 @RESPATH@/components/PageThumbsProtocol.js
 @RESPATH@/components/BrowserPageThumbs.manifest
 @RESPATH@/components/passwordmgr.manifest
-#ifdef MOZ_PAY
-@RESPATH@/components/Payment.js
-@RESPATH@/components/PaymentFlowInfo.js
-@RESPATH@/components/Payment.manifest
-#endif
 #ifdef MOZ_WEBRTC
 @RESPATH@/components/PeerConnection.js
 @RESPATH@/components/PeerConnection.manifest
 #endif
 @RESPATH@/components/PermissionSettings.js
 @RESPATH@/components/PermissionSettings.manifest
 @RESPATH@/components/PhoneNumberService.js
 @RESPATH@/components/PhoneNumberService.manifest