From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8555113827E for ; Sat, 14 Dec 2013 00:48:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEC30E0B4A; Sat, 14 Dec 2013 00:48:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47A48E0B4A for ; Sat, 14 Dec 2013 00:48:25 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 147AF33F4D0 for ; Sat, 14 Dec 2013 00:48:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A6B15E5770 for ; Sat, 14 Dec 2013 00:48:21 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1386982067.a913c374040c05c3172054af49733f0b7ff1c1a5.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/ X-VCS-Repository: proj/mozilla X-VCS-Files: mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch mail-client/thunderbird/thunderbird-24.2.0.ebuild X-VCS-Directories: mail-client/thunderbird/ mail-client/thunderbird/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: a913c374040c05c3172054af49733f0b7ff1c1a5 X-VCS-Branch: master Date: Sat, 14 Dec 2013 00:48:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4893f134-c3bf-47cb-984c-3281d6491a7e X-Archives-Hash: f3386fb717363bb9b1d80d077224c1d0 commit: a913c374040c05c3172054af49733f0b7ff1c1a5 Author: Jory A. Pratt gentoo org> AuthorDate: Sat Dec 14 00:47:47 2013 +0000 Commit: Jory Pratt gentoo 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 +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