[tor-commits] [tor-messenger-build/master] Revert topdir.patch merged upstream as it is not in 0.2.7.2

[sukhbir at torproject.org]

commit d1a698c6bc15ead24e1598e64979f9ab7d1b0211
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Mar 23 10:53:41 2015 +0530

    Revert topdir.patch merged upstream as it is not in 0.2.7.2
---
 projects/tor-launcher/build        |    1 +
 projects/tor-launcher/config       |    1 +
 projects/tor-launcher/topdir.patch |   12 ++++++++++++
 3 files changed, 14 insertions(+)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index 4da21ee..a3c5f48 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -2,6 +2,7 @@
 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 df501d3..baceb0d 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -8,6 +8,7 @@ filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi"
 input_files:
   - filename: torbirdy.png
   - filename: torbirdy-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
new file mode 100644
index 0000000..747416f
--- /dev/null
+++ b/projects/tor-launcher/topdir.patch
@@ -0,0 +1,12 @@
+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);
+           }