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 959C61381F3 for ; Mon, 23 Sep 2013 21:14:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A5DCE0A72; Mon, 23 Sep 2013 21:14:18 +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 DD950E0A72 for ; Mon, 23 Sep 2013 21:14:17 +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 E496D33ED36 for ; Mon, 23 Sep 2013 21:14:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4C8ECE468F for ; Mon, 23 Sep 2013 21:14:14 +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: <1379970792.1b6810a26219cd1b1c5873fd43c17c7b028fd0e1.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_mailnews_extensions_genxpi.patch mail-client/thunderbird/thunderbird-24.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: 1b6810a26219cd1b1c5873fd43c17c7b028fd0e1 X-VCS-Branch: master Date: Mon, 23 Sep 2013 21:14:14 +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: 839e9ce6-2a65-40fc-a515-0d844148d2be X-Archives-Hash: 90e0ad4563da0bc82214b241a11d42e1 commit: 1b6810a26219cd1b1c5873fd43c17c7b028fd0e1 Author: Jory A. Pratt gentoo org> AuthorDate: Mon Sep 23 21:13:12 2013 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon Sep 23 21:13:12 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=1b6810a2 Thunderbird: Finish fixing build failure, enigmail breakage --- .../files/enigmail_mailnews_extensions_genxpi.patch | 19 +++++++++++++++++++ mail-client/thunderbird/thunderbird-24.0.ebuild | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/mail-client/thunderbird/files/enigmail_mailnews_extensions_genxpi.patch b/mail-client/thunderbird/files/enigmail_mailnews_extensions_genxpi.patch new file mode 100644 index 0000000..a945cf2 --- /dev/null +++ b/mail-client/thunderbird/files/enigmail_mailnews_extensions_genxpi.patch @@ -0,0 +1,19 @@ +$OpenBSD$ +https://bugzilla.mozilla.org/show_bug.cgi?id=886095 +--- mailnews/extensions/enigmail/genxpi.orig Wed Jul 3 13:21:33 2013 ++++ mailnews/extensions/enigmail/genxpi Thu Jul 11 09:33:44 2013 +@@ -78,6 +78,7 @@ fi + subprocessDll=${libPrefix}subprocess${dllSuffix} + spDllFile=platform/${platform}/lib/${libPrefix}subprocess-${xpcomAbi}${dllSuffix} + ++cp ${targetDir}/chrome.manifest ${targetDir}/chrome.manifest.save + # Prepare chrome.manifest + cat ${srcDir}/package/chrome.manifest | \ + sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' \ +@@ -151,4 +152,5 @@ zip ${xpiFile} \ + chrome.manifest \ + install.rdf + +-rm install.rdf chrome.manifest ++rm install.rdf ++mv chrome.manifest.save chrome.manifest diff --git a/mail-client/thunderbird/thunderbird-24.0.ebuild b/mail-client/thunderbird/thunderbird-24.0.ebuild index 1fed86f..7cb66a9 100644 --- a/mail-client/thunderbird/thunderbird-24.0.ebuild +++ b/mail-client/thunderbird/thunderbird-24.0.ebuild @@ -132,7 +132,9 @@ src_prepare() { if use crypt ; then mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail - cd "${S}" + pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die + epatch "${FILESDIR}"/enigmail_mailnews_extensions_genxpi.patch + popd &>/dev/null || die fi # Ensure that are plugins dir is enabled as default