[tor-commits] [tor-messenger-build/master] Trac 20608: Use Instantbird app version
arlo at torproject.org
arlo at torproject.org
Tue Nov 8 20:55:43 UTC 2016
commit ec41e467065ab4c8d5b64e0b2b8f16fe5c1a2871
Author: Arlo Breault <arlolra at gmail.com>
Date: Tue Nov 8 11:40:12 2016 -0800
Trac 20608: Use Instantbird app version
* Otherwise, extensions are considered incompatible.
---
.../instantbird/0001-Set-Tor-Messenger-preferences.patch | 6 +++---
.../0002-Trac-16489-Prevent-account-autologin.patch | 2 +-
...ac-17896-Support-Special-Characters-input-prompt-o.patch | 2 +-
...ac-17494-Better-error-reporting-for-failed-outgoin.patch | 2 +-
.../instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +-
...g-1218193-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +-
...g-1246431-XMPP-createConversation-should-handle-in.patch | 2 +-
...g-1298574-Set-_userVCard-own-property-when-downloa.patch | 2 +-
projects/instantbird/0009-XMPP-in-band-registration.patch | 2 +-
projects/instantbird/0010-Remove-search-from-UI.patch | 2 +-
projects/instantbird/0011-Add-Tor-Messenger-branding.patch | 13 +++++++------
projects/instantbird/0012-Account-picture.patch | 2 +-
projects/instantbird/0013-Modify-protocol-defaults.patch | 2 +-
projects/instantbird/0014-Modify-IRC-defaults.patch | 2 +-
projects/instantbird/0015-Modify-themes.patch | 2 +-
projects/instantbird/0016-Modify-XMPP-defaults.patch | 2 +-
projects/instantbird/0017-Remove-logging-UI.patch | 2 +-
projects/instantbird/0018-Cert-override.patch | 2 +-
.../instantbird/0019-Display-all-traffic-over-Tor.patch | 2 +-
projects/instantbird/0020-Trac-17480-Content-sink.patch | 2 +-
.../instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +-
...g-1313137-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +-
...g-954368-Contact-list-entries-should-adapt-their-h.patch | 2 +-
...0024-Bug-1187281-Only-show-close-button-on-Windows.patch | 2 +-
projects/instantbird/build | 2 --
25 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index ed4f073..44e2669 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,4 +1,4 @@
-From 6d141536baa7461f99f8067a2a93fd10740569c1 Mon Sep 17 00:00:00 2001
+From 1d67d081f0a1c5c354152c5c54387403a7334946 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:48:41 -0700
Subject: [PATCH 01/24] Set Tor Messenger preferences
@@ -8,7 +8,7 @@ Subject: [PATCH 01/24] Set Tor Messenger preferences
1 file changed, 378 insertions(+), 21 deletions(-)
diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js
-index b7a3970..09cfee3 100644
+index b7a3970..2d9a217 100644
--- a/im/app/profile/all-instantbird.js
+++ b/im/app/profile/all-instantbird.js
@@ -1,3 +1,46 @@
@@ -298,7 +298,7 @@ index b7a3970..09cfee3 100644
+pref("general.appversion.override", "5.0 (Windows)");
+pref("general.oscpu.override", "Windows NT 6.1");
+pref("general.platform.override", "Win32");
-+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Instantbird/1.5"); // TM
++pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0");
+pref("general.productSub.override", "20100101");
+pref("general.buildID.override", "20100101");
+pref("browser.startup.homepage_override.buildID", "20100101");
diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
index c5c01b4..3b908e3 100644
--- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
+++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
@@ -1,4 +1,4 @@
-From 7c9ac99bbcb06d68fb908333eb8cc5143637154a Mon Sep 17 00:00:00 2001
+From f1e661a5b83c86b1f2d04a434f59c938d3ae1eef Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Mon, 16 Nov 2015 20:37:53 -0800
Subject: [PATCH 02/24] Trac 16489: Prevent account autologin
diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
index 204be81..454ce61 100644
--- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
+++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
@@ -1,4 +1,4 @@
-From 2613a52919e2418eb1203ced487e220d9b41095d Mon Sep 17 00:00:00 2001
+From ffc41b64d3a203ada0549a57044329afb31e88dd Mon Sep 17 00:00:00 2001
From: aleth <aleth at instantbird.org>
Date: Sat, 30 Jan 2016 20:56:38 +0100
Subject: [PATCH 03/24] Trac 17896: Support "Special Characters" input prompt
diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
index 653080f..d7bcf52 100644
--- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
+++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
@@ -1,4 +1,4 @@
-From 92e7071ae41a3c93b39e0f1199aa11c027d86b05 Mon Sep 17 00:00:00 2001
+From 4f8444932609dcf396adf0ee8a44668015d0ab8a Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Tue, 2 Feb 2016 16:04:51 -0800
Subject: [PATCH 04/24] Trac 17494: Better error reporting for failed outgoing
diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
index 2755d7d..5b2b93b 100644
--- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
+++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
@@ -1,4 +1,4 @@
-From 18c08ca0d6a94cb77bf2a9b35d45c4be3dff86f3 Mon Sep 17 00:00:00 2001
+From 5a0596c8ea7d084e1f9f1851c85fcc1999df6422 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Tue, 15 Mar 2016 17:40:42 -0700
Subject: [PATCH 05/24] Trac 13312: OTR over Twitter DMs
diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
index 3b52744..39efb0d 100644
--- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
+++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
@@ -1,4 +1,4 @@
-From 6dc11e3fa7ce0719021b7c0934c5e183f206e461 Mon Sep 17 00:00:00 2001
+From 41cedec3b05aefe585f32f4ebde2d6b39e2f01b3 Mon Sep 17 00:00:00 2001
From: Nihanth Subramanya <nhnt11 at gmail.com>
Date: Sun, 9 Oct 2016 21:53:04 -0700
Subject: [PATCH 06/24] Bug 1218193 - Fix tab strip background colour on OS X.
diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
index 9dc8e12..ce7bf88 100644
--- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
+++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
@@ -1,4 +1,4 @@
-From de331fcdf0cc8a9aa02842cce5a906f55dc96000 Mon Sep 17 00:00:00 2001
+From bbb740af1dc8fd62723494efa3593b6d82bc4ffc Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sun, 9 Oct 2016 21:57:07 -0700
Subject: [PATCH 07/24] Bug 1246431 - XMPP createConversation should handle
diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
index 4b70b8e..76faa87 100644
--- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
+++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
@@ -1,4 +1,4 @@
-From 64add4a690525d378c41a87ccaa127a9a92ed0a3 Mon Sep 17 00:00:00 2001
+From 1f0fdd5fa6e4ad05edb9ee6424d773c3d1d3f503 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sun, 28 Aug 2016 08:57:41 -0700
Subject: [PATCH 08/24] Bug 1298574 - Set _userVCard own property when
diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch
index 127a925..0e96930 100644
--- a/projects/instantbird/0009-XMPP-in-band-registration.patch
+++ b/projects/instantbird/0009-XMPP-in-band-registration.patch
@@ -1,4 +1,4 @@
-From 01347aee5ea469a8d491baec2f6d8ad93e33aa92 Mon Sep 17 00:00:00 2001
+From 30f8a460dc5b471bb303874a25534bc4ec79a78c Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 18:42:25 -0700
Subject: [PATCH 09/24] XMPP in-band registration
diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch
index 3825fa1..a33bf1c 100644
--- a/projects/instantbird/0010-Remove-search-from-UI.patch
+++ b/projects/instantbird/0010-Remove-search-from-UI.patch
@@ -1,4 +1,4 @@
-From 5c32bcb15c37b9b56313abda82e11920f5b2623a Mon Sep 17 00:00:00 2001
+From adee8bb3ecf5d6c2358ac5795653420cd4cd906b Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 18:47:48 -0700
Subject: [PATCH 10/24] Remove search from UI
diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
index 33e1502..8ca2358 100644
--- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
+++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
@@ -1,4 +1,4 @@
-From da207230ff44df7db7e0591d1e87208c60a3efd9 Mon Sep 17 00:00:00 2001
+From e86eb410dfe15ffe4a5128baf41d4aa30f290070 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 18:56:27 -0700
Subject: [PATCH 11/24] Add Tor Messenger branding
@@ -48,13 +48,13 @@ Subject: [PATCH 11/24] Add Tor Messenger branding
im/branding/messenger/wizWatermark.bmp | Bin 0 -> 154542 bytes
im/content/aboutDialog-appUpdater.js | 576 +++++++++++++++++++++
im/content/aboutDialog.css | 105 ++--
- im/content/aboutDialog.js | 79 +++
+ im/content/aboutDialog.js | 80 +++
im/content/aboutDialog.xul | 257 +++++----
im/content/browserMountPoints.inc | 12 +
im/content/jar.mn | 3 +-
.../en-US/chrome/instantbird/aboutDialog.dtd | 139 ++++-
im/locales/en-US/updater/updater.ini | 2 +-
- 50 files changed, 1694 insertions(+), 160 deletions(-)
+ 50 files changed, 1695 insertions(+), 160 deletions(-)
create mode 100644 im/branding/messenger/Makefile.in
create mode 100644 im/branding/messenger/background.png
create mode 100755 im/branding/messenger/branding.nsi
@@ -4573,10 +4573,10 @@ index 2507060..a065c8e 100644
+}
diff --git a/im/content/aboutDialog.js b/im/content/aboutDialog.js
new file mode 100644
-index 0000000..b3ae0de
+index 0000000..e265f23
--- /dev/null
+++ b/im/content/aboutDialog.js
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,80 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -4635,7 +4635,8 @@ index 0000000..b3ae0de
+ let versionElem = document.getElementById("version");
+ if (versionElem) {
+ versionElem.textContent = TOR_BROWSER_VERSION +
-+ " (based on Instantbird Nightly)";
++ " (based on Instantbird " +
++ version + ")";
+ }
+#endif
+
diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch
index e97c9bf..67c7d6e 100644
--- a/projects/instantbird/0012-Account-picture.patch
+++ b/projects/instantbird/0012-Account-picture.patch
@@ -1,4 +1,4 @@
-From 6201f00e2487bc187183690778ecc5ba5064ce86 Mon Sep 17 00:00:00 2001
+From f7ea3deb695f7cd076735264fa2f9a0f1dcc715f Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:24:09 -0700
Subject: [PATCH 12/24] Account picture
diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch
index fea4828..1e1b075 100644
--- a/projects/instantbird/0013-Modify-protocol-defaults.patch
+++ b/projects/instantbird/0013-Modify-protocol-defaults.patch
@@ -1,4 +1,4 @@
-From 274c4787f0458da7427a93e69f6ace6bb08b11ed Mon Sep 17 00:00:00 2001
+From 90636b77ec46308386df5acefb43a55ad86548cf Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:25:34 -0700
Subject: [PATCH 13/24] Modify protocol defaults
diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch
index 27459e1..ee86b1e 100644
--- a/projects/instantbird/0014-Modify-IRC-defaults.patch
+++ b/projects/instantbird/0014-Modify-IRC-defaults.patch
@@ -1,4 +1,4 @@
-From a2553fd55f027979f643d2d0a70b6675087e11fb Mon Sep 17 00:00:00 2001
+From 9f2fe7b31af96af64ec93dd5b9c3d199705e5114 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:31:58 -0700
Subject: [PATCH 14/24] Modify IRC defaults
diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch
index 6008fc5..318cffc 100644
--- a/projects/instantbird/0015-Modify-themes.patch
+++ b/projects/instantbird/0015-Modify-themes.patch
@@ -1,4 +1,4 @@
-From 00be98b4b335bdf0903ea496e1a3bd8170ce0bc9 Mon Sep 17 00:00:00 2001
+From 92aa4ae0d3bde10c502bac0721a2ff5057891840 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:36:38 -0700
Subject: [PATCH 15/24] Modify themes
diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch
index b35b90a..afce7ea 100644
--- a/projects/instantbird/0016-Modify-XMPP-defaults.patch
+++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch
@@ -1,4 +1,4 @@
-From efceb9ec5be40e3e3881dfb2bd6d4b9e5d9343b3 Mon Sep 17 00:00:00 2001
+From 50c6ab1b9ddded85679dd91b3e0dd71918511d38 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:38:49 -0700
Subject: [PATCH 16/24] Modify XMPP defaults
diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch
index 26befca..b820b03 100644
--- a/projects/instantbird/0017-Remove-logging-UI.patch
+++ b/projects/instantbird/0017-Remove-logging-UI.patch
@@ -1,4 +1,4 @@
-From 5f4e7fe4ac8dce025442aebff7234fe53bf9422c Mon Sep 17 00:00:00 2001
+From ae5671b3b7ebff4470d091cdb50ee1efd94f60d2 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:50:48 -0700
Subject: [PATCH 17/24] Remove logging UI
diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch
index 708b2c3..a10f32a 100644
--- a/projects/instantbird/0018-Cert-override.patch
+++ b/projects/instantbird/0018-Cert-override.patch
@@ -1,4 +1,4 @@
-From 4a181acfe5b127e8b7122f77f37ebc56f00918cc Mon Sep 17 00:00:00 2001
+From c9c8d083f1176e60299af2abe9db3bcad3b87e67 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:56:46 -0700
Subject: [PATCH 18/24] Cert override
diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
index 471a267..f481e7a 100644
--- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
+++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
@@ -1,4 +1,4 @@
-From f6d53ed6b3e1ca51d1cc78be5cdbb9937e02ccc5 Mon Sep 17 00:00:00 2001
+From 6fb6121d1bf2942358ead4424e8f368debcc0631 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:58:31 -0700
Subject: [PATCH 19/24] Display all traffic over Tor
diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch
index 9f824e9..9f4d67b 100644
--- a/projects/instantbird/0020-Trac-17480-Content-sink.patch
+++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch
@@ -1,4 +1,4 @@
-From a9951d83efad660b1e900a49a64abaf15547db80 Mon Sep 17 00:00:00 2001
+From 837b27c523d1eaba88d14758adb8653caa3f202d Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Wed, 5 Oct 2016 11:09:25 -0700
Subject: [PATCH 20/24] Trac 17480: Content sink
diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
index 7455ebe..e87f26c 100644
--- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
+++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
@@ -1,4 +1,4 @@
-From e491d72574569b18ff08e8e9eface244235a94fb Mon Sep 17 00:00:00 2001
+From b7169c4c36ea9e7f582259b8b93516c319539c9f Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sun, 2 Oct 2016 08:46:55 -0700
Subject: [PATCH 21/24] SASL ECDSA-NIST256P-CHALLENGE
diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
index 4faa099..d562407 100644
--- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
+++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
@@ -1,4 +1,4 @@
-From 9aae674e02a0a0be09ee6732c9701a6d1c94b880 Mon Sep 17 00:00:00 2001
+From df14c41303be11e2b684359f504b80954c7a6de6 Mon Sep 17 00:00:00 2001
From: aleth <aleth at instantbird.org>
Date: Wed, 26 Oct 2016 20:16:58 +0200
Subject: [PATCH 22/24] Bug 1313137 - "msg is not defined" error in
diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
index e64f5d2..b8e2b2a 100644
--- a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
+++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
@@ -1,4 +1,4 @@
-From a8110cf4903739733c9e51da3ec521fe5c2ecb30 Mon Sep 17 00:00:00 2001
+From 9ec3b2210152f48feda6d1f7fa12db4455cc7f01 Mon Sep 17 00:00:00 2001
From: aleth <aleth at instantbird.org>
Date: Thu, 12 May 2016 15:10:43 +0200
Subject: [PATCH 23/24] Bug 954368 - Contact list entries should adapt their
diff --git a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch
index 97701b5..500615c 100644
--- a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch
+++ b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch
@@ -1,4 +1,4 @@
-From 48f4f902f6d737e7dbe9970b17893fe02b0bc65f Mon Sep 17 00:00:00 2001
+From 52731dd57da7b04b18c6835b77d284e0f70536a5 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sat, 5 Nov 2016 14:55:20 -0700
Subject: [PATCH 24/24] Bug 1187281 - Only show "close" button on Windows
diff --git a/projects/instantbird/build b/projects/instantbird/build
index ca349ec..a173dd2 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -56,8 +56,6 @@ do
git apply -p1 < $patch
done
-echo '[% c("var/tormessenger_version") %]' > im/config/version.txt
-
cp $rootdir/mozconfig-common .mozconfig
cat $rootdir/[% c('input_files_by_name/mozconfig') %] >> .mozconfig
echo ac_add_options --with-tor-browser-version='[% c("var/tormessenger_version") %]' >> .mozconfig
More information about the tor-commits
mailing list