commit c4f477ec7b2a05038afff08925cfa864ad61079c Author: Nicolas Vigier boklm@torproject.org Date: Fri Oct 31 00:24:10 2014 +0100

tor-launcher: add topdir.patch --- projects/tor-launcher/build | 1 + projects/tor-launcher/config | 2 ++ projects/tor-launcher/topdir.patch | 12 ++++++++++++ 3 files changed, 15 insertions(+)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 560c998..f9b509e 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -2,5 +2,6 @@ set -e tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] +patch -d src -p1 < ../topdir.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index b3b4264..14734be 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -4,3 +4,5 @@ git_hash: '[% c("version") %]' gpg_keyring: mikeperry.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" +input_files: + - filename: topdir.patch 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); + }