Commit 62d6599a authored by Arlo Breault's avatar Arlo Breault
Browse files

Update tor-launcher to 0.2.14.3

parent 18a19dfa

ChangeLog

+1 −0
Original line number Original line Diff line number Diff line
@@ -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 tor-browser-52.6.0esr-7.5-2-build1 tag on tor-browser

   * Use the THUNDERBIRD_52_6_0_RELEASE tag on comm-esr52

   * Use the THUNDERBIRD_52_6_0_RELEASE tag on comm-esr52

   * Update tor-browser to 7.5

   * Update tor-browser to 7.5

   * Update tor-launcher to 0.2.14.3

   * Update tor-browser-build to d2dee35

   * Update tor-browser-build to d2dee35

   * Update rbm to 5c89374

   * Update rbm to 5c89374

 * Linux

 * Linux

projects/tor-launcher/build

+0 −8
Original line number Original line Diff line number Diff line
@@ -5,13 +5,5 @@ cd [% project %]-[% c('version') %] 
[% IF c("var/tor_control_port") -%]

[% IF c("var/tor_control_port") -%]

patch -p1 < ../controlport.patch

patch -p1 < ../controlport.patch

[% END -%]

[% 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

make package

mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %]
 
mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %]

projects/tor-launcher/config

+1 −5
Original line number Original line Diff line number Diff line 
# vim: filetype=yaml sw=2

# 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_url: https://git.torproject.org/tor-launcher.git

git_hash: '[% c("version") %]'

git_hash: '[% c("version") %]'

gpg_keyring: gk.gpg

gpg_keyring: gk.gpg

tag_gpg_id: 1

tag_gpg_id: 1

filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"

filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"

input_files:

input_files:

  - filename: torbirdy.png

  - filename: messenger.png

  - filename: default48.png

  - filename: logo.patch

  - filename: controlport.patch

  - filename: controlport.patch

    content: '[% INCLUDE controlport.patch.tmpl -%]'

    content: '[% INCLUDE controlport.patch.tmpl -%]'

    refresh_input: 1

    refresh_input: 1

projects/tor-launcher/default48.png

deleted100644 → 0
−1.15 KiB
Loading image diff...

projects/tor-launcher/logo.patch

deleted100644 → 0
+0 −28
Original line number Original line Diff line number Diff line 
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 {