[tor-commits] [tor-messenger-build/master] Use THUNDERBIRD_45_0b3_RELEASE

[arlo at torproject.org]

commit ff21e9bb3ae9d272dc2064555f6ae8a3871f34a4
Author: Arlo Breault <arlolra at gmail.com>
Date:   Tue Mar 22 19:48:03 2016 -0700

    Use THUNDERBIRD_45_0b3_RELEASE
    
     * Remove a patch for bug 955324, which was uplifted.
---
 ChangeLog                             |  5 ++++
 projects/instantbird/bug-955324.patch | 52 -----------------------------------
 projects/instantbird/config           |  3 +-
 projects/mozilla/config               |  2 +-
 4 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3bdd17b..7e9e7a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tor Messenger 0.1.0b6
+ * All Platforms
+   * Use the THUNDERBIRD_45_0b3_RELEASE tag on mozilla-esr45
+   * Use the THUNDERBIRD_45_0b3_RELEASE tag on comm-esr45
+
 Tor Messenger 0.1.0b5 -- March 09, 2016
  * All Platforms
    * Bug 13795: Remove SPI root certificate because Debian no longer ships it
diff --git a/projects/instantbird/bug-955324.patch b/projects/instantbird/bug-955324.patch
deleted file mode 100644
index c16b0db..0000000
--- a/projects/instantbird/bug-955324.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# HG changeset patch
-# User Arlo Breault <arlolra at gmail.com>
-# Date 1456775633 28800
-#      Mon Feb 29 11:53:53 2016 -0800
-# Node ID 6e6444a94b87a64b6ac316280f810709b632d461
-# Parent  f2acd8984cea1a68e57a2c30e93a3089a9bce76d
-Bug 955324 - Starting/stopping to follow someone doesn't update the participant list of the timeline
-
-diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter.js
---- a/chat/protocols/twitter/twitter.js
-+++ b/chat/protocols/twitter/twitter.js
-@@ -569,16 +569,17 @@ Account.prototype = {
-     // friendships/destroy will return the user in case of success.
-     // Error cases would return a non 200 HTTP code and not call our callback.
-     this.signAndSend("1.1/friendships/destroy.json", null,
-                      [["screen_name", aUserName]], function(aData, aXHR) {
-       let user = JSON.parse(aData);
-       if (!("id_str" in user))
-         return; // Unexpected response...
-       this._friends.delete(user.id_str);
-+      this.timeline.removeParticipant(user.screen_name);
-       let date = aXHR.getResponseHeader("Date");
-       this.timeline.systemMessage(_("event.unfollow", user.screen_name), false,
-                                   new Date(date) / 1000);
-     }, null, this);
-   },
-   addBuddy: function(aTag, aName) {
-     this.follow(aName);
-   },
-@@ -775,19 +776,21 @@ Account.prototype = {
-         // Overwrite the existing _friends list (if any).
-         this._friends = new Set(msg.friends.map(aId => aId.toString()));
-       }
-       else if ("event" in msg) {
-         let user, event;
-         switch(msg.event) {
-           case "follow":
-             if (msg.source.screen_name == this.name) {
--              this._friends.add(msg.target.id_str);
-               user = msg.target;
-               event = "follow";
-+              this.setUserInfo(user);
-+              this._friends.add(user.id_str);
-+              this.timeline._ensureParticipantExists(user.screen_name);
-             }
-             else if (msg.target.screen_name == this.name) {
-               user = msg.source;
-               event = "followed";
-             }
-             if (user) {
-               this.setUserInfo(user);
-               this.timeline.systemMessage(_("event." + event, user.screen_name),
diff --git a/projects/instantbird/config b/projects/instantbird/config
index abc8610..0496cef 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 hg_url: https://hg.mozilla.org/releases/comm-esr45/
-hg_hash: THUNDERBIRD_45_0b2_RELEASE
+hg_hash: THUNDERBIRD_45_0b3_RELEASE
 filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]"
 remote_docker: 1
 var:
@@ -75,7 +75,6 @@ input_files:
   - filename: trac-17896.patch
   - filename: trac-17494.patch
   - filename: trac-13312.patch
-  - filename: bug-955324.patch
   - filename: version.patch
   - filename: search-context-menu.patch
   - filename: search-preferences-xul.patch
diff --git a/projects/mozilla/config b/projects/mozilla/config
index f96adbe..e062cfd 100644
--- a/projects/mozilla/config
+++ b/projects/mozilla/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 hg_url: https://hg.mozilla.org/releases/mozilla-esr45/
-hg_hash: THUNDERBIRD_45_0b2_RELEASE
+hg_hash: THUNDERBIRD_45_0b3_RELEASE
 src: |
   #!/bin/sh
   set -e