public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/
Date: Fri, 11 Nov 2011 13:44:03 +0000 (UTC)	[thread overview]
Message-ID: <4a14c4faf6c815e79a8a635c7c070c7250653072.anarchy@gentoo> (raw)

commit:     4a14c4faf6c815e79a8a635c7c070c7250653072
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 13:43:47 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 13:43:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=4a14c4fa

ensure enigmail can find its gpg scripts

---
 mail-client/thunderbird/Manifest                   |    3 ++-
 .../files/enigmail-1.3.3-bug373733.patch           |   20 ++++++++++++++++++++
 mail-client/thunderbird/thunderbird-8.0.ebuild     |    2 ++
 3 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 1f2b7c8..f3ae1be 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,3 +1,4 @@
+AUX enigmail-1.3.3-bug373733.patch 1168 RMD160 296a154bb79945a763f922149eb68667c4b51343 SHA1 52f5ec3cc1818eaa45a689200e4a84c7c599e377 SHA256 c8a61a29164e66a47c2d12ec96c3c31a6b3019f3fd3b961584642fdde228b379
 AUX icon/thunderbird-unbranded.desktop 280 RMD160 9a479a1f7c82021962ea35ee7289e0ba24fea967 SHA1 5ab05edfba3bd1df21145107167176280a2b14eb SHA256 3693d0b91739c01f838d53955f8c3fd9906347a9dde2338d94d7f2a169cd4a46
 AUX icon/thunderbird.desktop 270 RMD160 09855ea05674863e5daca1465446ef60dcc58ba8 SHA1 594b164f3d410497315a1bae4b1b0222786aca5e SHA256 e8756ac8a421ac18f28b3620b2a021199f3bc4a3a9c566479a9b6697a5305dea
 AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA256 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c
@@ -42,4 +43,4 @@ DIST thunderbird-8.0-uk.xpi 456674 RMD160 95c1009e180d50940e8ecedc1d373c834c278b
 DIST thunderbird-8.0-zh-CN.xpi 422519 RMD160 ef881e92de682aa3d807a53a7f536f51e6740b94 SHA1 564f90305e0458f57cd27a876f90e8c12b5ade8f SHA256 bb46c2b4d395488104528ac225f2c129e9c4ddb500e6f44082df549560013132
 DIST thunderbird-8.0-zh-TW.xpi 423019 RMD160 3326d286df45aee39ea4dc9303c6e4459b41dba2 SHA1 a81c24ab001eb521a1b4e49da16c8f6914676641 SHA256 a6c78df16a242b1731709fdacae8fcfde630fe10469abfd6a696b46076e9059a
 DIST thunderbird-8.0.source.tar.bz2 89435206 RMD160 373420ec009a7f28f12a64a0d55e9d959573974e SHA1 18b77e44f1653eb3d59056870f535e3c373d99fd SHA256 f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5
-EBUILD thunderbird-8.0.ebuild 9180 RMD160 5b5a9a9358ac6e22197d1681128fcfdea3276077 SHA1 2d84c5f4f6dd738864b3ce67a662226b09772173 SHA256 b9158131fd530c31ca0d9c069b1504250b848c2f1f0c51272301b1c244b39ac1
+EBUILD thunderbird-8.0.ebuild 9283 RMD160 79922c8f45639e1b1a70a1085c7da6a435fd1209 SHA1 d9b522a16daf72ecc4fd1900c941bbe1aec446a0 SHA256 496d8899c8ea76b5aa688cc903f50cee85839d61b4f865b9edcc733ec7a86d76

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 0000000..2b8d6d9
--- /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 12bd58c..99db324 100644
--- a/mail-client/thunderbird/thunderbird-8.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-8.0.ebuild
@@ -145,6 +145,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



             reply	other threads:[~2011-11-11 13:44 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-11 13:44 Jory Pratt [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-08-30 14:14 [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/ Jory Pratt
2018-11-30 20:09 Ian Stakenvicius
2018-10-22 20:15 Ian Stakenvicius
2018-08-15 21:11 Ian Stakenvicius
2017-01-08 21:19 Jory Pratt
2016-10-06 16:31 Ian Stakenvicius
2015-06-10  1:31 Jory Pratt
2013-12-14  0:48 Jory Pratt
2013-09-23 21:14 Jory Pratt
2012-02-01  2:33 Jory Pratt
2011-12-11 22:50 Jory Pratt
2011-10-02 23:48 Jory Pratt
2011-06-06 14:16 Jory Pratt
2011-04-16 13:00 Jory Pratt
2011-04-10 20:01 Jory Pratt
2011-04-04  2:41 Jory Pratt
2011-03-28 20:12 Jory Pratt
2011-03-17  2:53 Jory Pratt
2011-03-06  2:42 Jory Pratt
2011-02-04  5:57 anarchy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4a14c4faf6c815e79a8a635c7c070c7250653072.anarchy@gentoo \
    --to=anarchy@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox