[tor-commits] [tor-messenger-build/master] Update Tor Launcher to 0.2.7.6 and remove redundant patch

[sukhbir at torproject.org]

commit 58569abafedebfb04c500974a984bc233b6a4424
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sat Jun 27 03:20:51 2015 -0400

    Update Tor Launcher to 0.2.7.6 and remove redundant patch
---
 projects/tor-launcher/build        |    1 -
 projects/tor-launcher/config       |    3 +--
 projects/tor-launcher/topdir.patch |   12 ------------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index 66909f9..50b73fd 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -2,7 +2,6 @@
 set -e
 tar xvf [% project %]-[% c('version') %].tar.gz
 cd [% project %]-[% c('version') %]
-patch -d src -p1 < ../topdir.patch
 [% IF c("var/tor_control_port") -%]
 patch -p1 < ../controlport.patch
 [% END -%]
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index b6d8524..3e3bc2b 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.7.2
+version: 0.2.7.6
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: mikeperry.gpg
@@ -9,7 +9,6 @@ input_files:
   - filename: torbirdy.png
   - filename: messenger.png
   - filename: logo.patch
-  - filename: topdir.patch
   - filename: controlport.patch
     content: '[% INCLUDE controlport.patch.tmpl -%]'
     refresh_input: 1
diff --git a/projects/tor-launcher/topdir.patch b/projects/tor-launcher/topdir.patch
deleted file mode 100644
index 747416f..0000000
--- a/projects/tor-launcher/topdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru tor-launcher/components/tl-process.js tor-launcher.n/components/tl-process.js
---- tor-launcher/components/tl-process.js	2014-10-11 01:18:10.000000000 +0200
-+++ tor-launcher.n/components/tl-process.js	2014-09-30 13:41:39.000000000 +0200
-@@ -694,7 +694,7 @@
-           {
-             // For Thunderbird and Instantbird, paths are relative to this extension's folder.
-             topDir = Cc["@mozilla.org/file/directory_service;1"]
--                       .getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile);
-+                       .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile);
-             topDir.append("extensions");
-             topDir.append(this.kTorLauncherExtPath);
-           }