commit f394f29c2221e88b124620382a190d50072d46bd Author: Sukhbir Singh sukhbir@torproject.org Date: Mon Mar 23 09:18:38 2015 +0530

Remove Tor Launcher patch merged upstream (#13983) --- projects/tor-launcher/config | 1 - projects/tor-launcher/topdir.patch | 12 ------------ 2 files changed, 13 deletions(-)

diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 7aca5ec..7d35e66 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -6,7 +6,6 @@ gpg_keyring: mikeperry.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - - 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); - }