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: Sat, 14 Dec 2013 00:48:21 +0000 (UTC)	[thread overview]
Message-ID: <1386982067.a913c374040c05c3172054af49733f0b7ff1c1a5.anarchy@gentoo> (raw)

commit:     a913c374040c05c3172054af49733f0b7ff1c1a5
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 00:47:47 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 00:47:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=a913c374

Fix race in enigmail, bug #494094

---
 .../files/enigmail-1.6.0-parallel-fix.patch        | 38 ++++++++++++++++++++++
 mail-client/thunderbird/thunderbird-24.2.0.ebuild  |  3 ++
 2 files changed, 41 insertions(+)

diff --git a/mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch b/mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch
new file mode 100644
index 0000000..ab4b613
--- /dev/null
+++ b/mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch
@@ -0,0 +1,38 @@
+commit dd4ad2eebd36c84307222ca56c10c073527d7054
+Author: Patrick Brunschwig <patrick@enigmail.net>
+Date:   Sun Nov 24 19:06:23 2013 +0100
+
+    fixed broken parallel full build of TB (patch by Fabio Rossi)
+
+diff --git a/lang/Makefile.in b/lang/Makefile.in
+index 2334d4f..38688e0 100644
+--- a/lang/Makefile.in
++++ b/lang/Makefile.in
+@@ -16,12 +16,12 @@ include $(topsrcdir)/config/config.mk
+ 
+ include $(srcdir)/../util/build.mk
+ 
+-all: export jar
++all: jar
+ 
+ export:
+ 	$(PERL) $(srcdir)/make-lang-xpi.pl $(srcdir)/current-languages.txt $(srcdir)
+ 
+-jar:
++jar: export
+ 	$(MAKEJAR)
+ 
+ clean:
+diff --git a/ui/Makefile.in b/ui/Makefile.in
+index 6309525..13c98ee 100644
+--- a/ui/Makefile.in
++++ b/ui/Makefile.in
+@@ -28,7 +28,7 @@ include $(topsrcdir)/config/config.mk
+ 
+ include $(srcdir)/../util/build.mk
+ 
+-jar:
++jar: dirs
+ 	$(MAKEJAR)
+ 
+ clean:

diff --git a/mail-client/thunderbird/thunderbird-24.2.0.ebuild b/mail-client/thunderbird/thunderbird-24.2.0.ebuild
index 0937c29..600d19f 100644
--- a/mail-client/thunderbird/thunderbird-24.2.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.2.0.ebuild
@@ -143,6 +143,9 @@ src_prepare() {
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
+		epatch "${FILESDIR}"/enigmail-1.6.0-parallel-fix.patch
+		popd &>/dev/null || die
 	fi
 
 	# Ensure that are plugins dir is enabled as default


             reply	other threads:[~2013-12-14  0:48 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-14  0:48 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-09-23 21:14 Jory Pratt
2012-02-01  2:33 Jory Pratt
2011-12-11 22:50 Jory Pratt
2011-11-11 13:44 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=1386982067.a913c374040c05c3172054af49733f0b7ff1c1a5.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