summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2011-11-11 23:40:14 +0000
committerJory Pratt <anarchy@gentoo.org>2011-11-11 23:40:14 +0000
commitad1316258cefbfea7364d70d87a2e0daa49b54df (patch)
treef5d0498e2fd1379133cb77341a83e2b9852f3d9d /mail-client/thunderbird
parentChange some einfo commands to elog. (diff)
downloadgentoo-2-ad1316258cefbfea7364d70d87a2e0daa49b54df.tar.gz
gentoo-2-ad1316258cefbfea7364d70d87a2e0daa49b54df.tar.bz2
gentoo-2-ad1316258cefbfea7364d70d87a2e0daa49b54df.zip
Ensure enigmail connects to gpg agent, bug #373733
(Portage version: 2.1.10.33/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/thunderbird')
-rw-r--r--mail-client/thunderbird/ChangeLog6
-rw-r--r--mail-client/thunderbird/files/enigmail-1.3.3-bug373733.patch20
-rw-r--r--mail-client/thunderbird/thunderbird-8.0.ebuild4
3 files changed, 28 insertions, 2 deletions
diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index f356594d5a05..c0c0650fa056 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-client/thunderbird
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.100 2011/11/11 01:46:45 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.101 2011/11/11 23:40:14 anarchy Exp $
+
+ 11 Nov 2011; Jory A. Pratt <anarchy@gentoo.org>
+ +files/enigmail-1.3.3-bug373733.patch, thunderbird-8.0.ebuild:
+ Ensure enigmail connects to gpg agent, bug #373733
*thunderbird-8.0 (11 Nov 2011)
diff --git a/mail-client/thunderbird/files/enigmail-1.3.3-bug373733.patch b/mail-client/thunderbird/files/enigmail-1.3.3-bug373733.patch
new file mode 100644
index 000000000000..2b8d6d91b693
--- /dev/null
+++ b/mail-client/thunderbird/files/enigmail-1.3.3-bug373733.patch
@@ -0,0 +1,20 @@
+--- a/mailnews/extensions/enigmail/package/enigmail.js 2011-09-19 10:46:49.000000000 -0500
++++ b/mailnews/extensions/enigmail/package/enigmail.js 2011-11-11 06:30:21.000000000 -0600
+@@ -924,7 +924,7 @@
+ Components.classes["@mozilla.org/file/directory_service;1"].
+ getService(Components.interfaces.nsIProperties);
+
+- var extensionLoc = directoryService.get("ProfD", Components.interfaces.nsIFile);
++ var extensionLoc = directoryService.get("CurProcD", Components.interfaces.nsIFile);
+ extensionLoc.append("extensions");
+ extensionLoc.append(ENIGMAIL_EXTENSION_ID);
+ extensionLoc.append("wrappers");
+@@ -1460,7 +1460,7 @@
+ Components.classes["@mozilla.org/file/directory_service;1"].
+ getService(Components.interfaces.nsIProperties);
+ var extensionLoc =
+- directoryService.get("ProfD", Components.interfaces.nsIFile);
++ directoryService.get("CurProcD", Components.interfaces.nsIFile);
+ extensionLoc.append("extensions");
+ extensionLoc.append(ENIGMAIL_EXTENSION_ID);
+ extensionLoc.append("wrappers");
diff --git a/mail-client/thunderbird/thunderbird-8.0.ebuild b/mail-client/thunderbird/thunderbird-8.0.ebuild
index d91b2a560fad..c3cb6d1b644e 100644
--- a/mail-client/thunderbird/thunderbird-8.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-8.0.ebuild,v 1.1 2011/11/11 01:46:45 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-8.0.ebuild,v 1.2 2011/11/11 23:40:14 anarchy Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -144,6 +144,8 @@ src_prepare() {
if use crypt ; then
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+ # Ensure enigmail can find its scripts for gpg
+ epatch "${FILESDIR}"/enigmail-1.3.3-bug373733.patch
cd "${S}"/mailnews/extensions/enigmail || die
./makemake -r 2&> /dev/null
sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in