[tor-commits] [tor-messenger-build/master] Update tor-launcher to 0.2.14.3

[arlo at torproject.org]

commit 62d6599a292d0f47b5fb14dc8f920eacfa4dc104
Author: Arlo Breault <arlolra at gmail.com>
Date:   Thu Jan 25 12:00:20 2018 -0500

    Update tor-launcher to 0.2.14.3
---
 ChangeLog                           |   1 +
 projects/tor-launcher/build         |   8 --------
 projects/tor-launcher/config        |   6 +-----
 projects/tor-launcher/default48.png | Bin 1178 -> 0 bytes
 projects/tor-launcher/logo.patch    |  28 ----------------------------
 projects/tor-launcher/messenger.png | Bin 2724 -> 0 bytes
 projects/tor-launcher/torbirdy.png  | Bin 15844 -> 0 bytes
 7 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7bed2b6..3b68030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Tor Messenger 0.6.0b1 --
    * Use the tor-browser-52.6.0esr-7.5-2-build1 tag on tor-browser
    * Use the THUNDERBIRD_52_6_0_RELEASE tag on comm-esr52
    * Update tor-browser to 7.5
+   * Update tor-launcher to 0.2.14.3
    * Update tor-browser-build to d2dee35
    * Update rbm to 5c89374
  * Linux
diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index 8735d33..0891389 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -5,13 +5,5 @@ cd [% project %]-[% c('version') %]
 [% IF c("var/tor_control_port") -%]
 patch -p1 < ../controlport.patch
 [% END -%]
-[% IF c("var/tor-mail") -%]
-cp ../torbirdy.png src/chrome/skin/tbb-logo.png
-[% END -%]
-[% IF c("var/tor-messenger") -%]
-cp ../messenger.png src/chrome/skin/tbb-logo.png
-cp ../default48.png src/chrome/skin/default48.png
-[% END -%]
-patch -p1 < ../logo.patch
 make package
 mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %]
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index de39ebb..1b7cb3b 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,15 +1,11 @@
 # vim: filetype=yaml sw=2
-version: 0.2.12.3
+version: 0.2.14.3
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: gk.gpg
 tag_gpg_id: 1
 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"
 input_files:
-  - filename: torbirdy.png
-  - filename: messenger.png
-  - filename: default48.png
-  - filename: logo.patch
   - filename: controlport.patch
     content: '[% INCLUDE controlport.patch.tmpl -%]'
     refresh_input: 1
diff --git a/projects/tor-launcher/default48.png b/projects/tor-launcher/default48.png
deleted file mode 100644
index 8381428..0000000
Binary files a/projects/tor-launcher/default48.png and /dev/null differ
diff --git a/projects/tor-launcher/logo.patch b/projects/tor-launcher/logo.patch
deleted file mode 100644
index 00b273b..0000000
--- a/projects/tor-launcher/logo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
-index 646baa6..66a89a3 100644
---- a/src/chrome/skin/network-settings.css
-+++ b/src/chrome/skin/network-settings.css
-@@ -89,8 +89,8 @@ button.firstAnswer {
- 
- .tbb-logo {
-   list-style-image: url("chrome://torlauncher/skin/tbb-logo.png");
--  width: 115px;
--  height: 80px;
-+  width: 128px;
-+  height: 96px;
-   margin-right: 20px;
- }
-
-diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css
-index d718452..5706f4d 100644
---- a/src/chrome/skin/progress.css
-+++ b/src/chrome/skin/progress.css
-@@ -23,7 +23,7 @@ dialog {
- #tbb-icon {
-   list-style-image: url("chrome://torlauncher/skin/default48.png");
-   width: 48px;
--  height: 48px;
-+  height: 36px;
- }
- 
- #progressDesc {
diff --git a/projects/tor-launcher/messenger.png b/projects/tor-launcher/messenger.png
deleted file mode 100644
index 3de3c93..0000000
Binary files a/projects/tor-launcher/messenger.png and /dev/null differ
diff --git a/projects/tor-launcher/torbirdy.png b/projects/tor-launcher/torbirdy.png
deleted file mode 100644
index 6fecc45..0000000
Binary files a/projects/tor-launcher/torbirdy.png and /dev/null differ