commit e398eb49976e27765e660fb0565a6e0a9e3f12d5 Author: Arlo Breault <arlolra@gmail.com> Date: Fri Jul 8 12:44:17 2016 -0700 Bump tags to THUNDERBIRD_45_2_0_RELEASE * Remove upstreamed patches --- ChangeLog | 4 +- projects/instantbird/bug-1263653.mozpatch | 115 ------------------------------ projects/instantbird/config | 5 +- projects/instantbird/trac-19053.patch | 30 -------- projects/mozilla/config | 2 +- 5 files changed, 4 insertions(+), 152 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2505d5a..dc7841f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Tor Messenger 0.1.0b7 -- * All Platforms - * Use the THUNDERBIRD_45_1_1_RELEASE tag on mozilla-esr45 - * Use the THUNDERBIRD_45_1_1_RELEASE tag on comm-esr45 + * Use the THUNDERBIRD_45_2_0_RELEASE tag on mozilla-esr45 + * Use the THUNDERBIRD_45_2_0_RELEASE tag on comm-esr45 * Bug 19053: Display plaintext in notifications * ctypes-otr * GH 66: Provide functionality for adding verified fingerprints (patch by Vu Quoc Huy) diff --git a/projects/instantbird/bug-1263653.mozpatch b/projects/instantbird/bug-1263653.mozpatch deleted file mode 100644 index 8c54a55..0000000 --- a/projects/instantbird/bug-1263653.mozpatch +++ /dev/null @@ -1,115 +0,0 @@ - -# HG changeset patch -# User Jacek Caban <jacek@codeweavers.com> -# Date 1460457438 -7200 -# Node ID a2d94f934b2a733fa09e8f1097ee6fe07d7a2ad1 -# Parent 474f2f3c105915264882ba0f9733e7d1ee986c95 -Bug 1263653 - Fixed TSFTextStore.h compilation with mingw. r=masayuki - -diff --git a/widget/windows/TSFTextStore.cpp b/widget/windows/TSFTextStore.cpp ---- a/widget/windows/TSFTextStore.cpp -+++ b/widget/windows/TSFTextStore.cpp -@@ -5299,17 +5299,17 @@ TSFTextStore::SetInputContext(nsWindowBa - aWidget, GetIMEEnabledName(aContext.mIMEState.mEnabled), - GetFocusChangeName(aAction.mFocusChange), sEnabledTextStore.get(), - GetBoolName(ThinksHavingFocus()))); - - NS_ENSURE_TRUE_VOID(IsInTSFMode()); - - if (aAction.mFocusChange != InputContextAction::FOCUS_NOT_CHANGED) { - if (sEnabledTextStore) { -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - textStore->SetInputScope(aContext.mHTMLInputType, - aContext.mHTMLInputInputmode); - } - return; - } - - // If focus isn't actually changed but the enabled state is changed, - // emulate the focus move. -diff --git a/widget/windows/TSFTextStore.h b/widget/windows/TSFTextStore.h ---- a/widget/windows/TSFTextStore.h -+++ b/widget/windows/TSFTextStore.h -@@ -114,74 +114,74 @@ public: - static bool GetIMEOpenState(void); - - static void CommitComposition(bool aDiscard) - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - textStore->CommitCompositionInternal(aDiscard); - } - - static void SetInputContext(nsWindowBase* aWidget, - const InputContext& aContext, - const InputContextAction& aAction); - - static nsresult OnFocusChange(bool aGotFocus, - nsWindowBase* aFocusedWidget, - const InputContext& aContext); - static nsresult OnTextChange(const IMENotification& aIMENotification) - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnTextChangeInternal(aIMENotification); - } - - static nsresult OnSelectionChange(const IMENotification& aIMENotification) - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnSelectionChangeInternal(aIMENotification); - } - - static nsresult OnLayoutChange() - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnLayoutChangeInternal(); - } - - static nsresult OnUpdateComposition() - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnUpdateCompositionInternal(); - } - - static nsresult OnMouseButtonEvent(const IMENotification& aIMENotification) - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnMouseButtonEventInternal(aIMENotification); - } - - static nsIMEUpdatePreference GetIMEUpdatePreference(); - - // Returns the address of the pointer so that the TSF automatic test can - // replace the system object with a custom implementation for testing. - // XXX TSF doesn't work now. Should we remove it? - diff --git a/projects/instantbird/config b/projects/instantbird/config index d6c3a2b..bd8b4f1 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_1_1_RELEASE +hg_hash: THUNDERBIRD_45_2_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" remote_docker: 1 var: @@ -73,7 +73,6 @@ input_files: - filename: trac-17896.patch - filename: trac-17494.patch - filename: trac-13312.patch - - filename: trac-19053.patch - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch @@ -110,8 +109,6 @@ input_files: enable: '[% c("var/windows") %]' - filename: bug-1167248.mozpatch enable: '[% c("var/windows") %]' - - filename: bug-1263653.mozpatch - enable: '[% c("var/windows") %]' - filename: trac-18331.mozpatch enable: '[% c("var/osx") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch diff --git a/projects/instantbird/trac-19053.patch b/projects/instantbird/trac-19053.patch deleted file mode 100644 index e4267da..0000000 --- a/projects/instantbird/trac-19053.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User Arlo Breault <arlolra@gmail.com> -# Date 1464281776 25200 -# Thu May 26 09:56:16 2016 -0700 -# Node ID f7624aac9022c38cfec6b2bc4f73ad69a5cf2a04 -# Parent 664eff8ea96f4bb2c15aa3ff01fd7c33e5cc3480 -Notification should use message prepared for dislaying - -diff --git a/im/modules/ibNotifications.jsm b/im/modules/ibNotifications.jsm ---- a/im/modules/ibNotifications.jsm -+++ b/im/modules/ibNotifications.jsm -@@ -20,17 +20,17 @@ var Notifications = { - } catch (e) { } - return ellipsis; - }, - - _showMessageNotification: function (aMessage) { - // Put the message content into a div node of the hidden HTML window. - let doc = getHiddenHTMLWindow().document; - let xhtmlElement = doc.createElementNS("http://www.w3.org/1999/xhtml", "div"); -- xhtmlElement.innerHTML = aMessage.message.replace(/<br>/gi, "<br/>"); -+ xhtmlElement.innerHTML = aMessage.displayMessage.replace(/<br>/gi, "<br/>"); - - // Convert the div node content to plain text. - let encoder = - Components.classes["@mozilla.org/layout/documentEncoder;1?type=text/plain"] - .createInstance(Components.interfaces.nsIDocumentEncoder); - encoder.init(doc, "text/plain", 0); - encoder.setNode(xhtmlElement); - let messageText = encoder.encodeToString().replace(/\s+/g, " "); diff --git a/projects/mozilla/config b/projects/mozilla/config index 653fb7a..c2b2e4d 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_1_1_RELEASE +hg_hash: THUNDERBIRD_45_2_0_RELEASE src: | #!/bin/sh set -e