summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-07-12 21:09:39 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-07-12 21:09:39 +0000
commitbfff635cb768d413c347e37a1371710a680bf7ec (patch)
tree9dc3155cdd4e804145f5a3c47b7abe7dde81033f /www-client
parentVersion bump, bug#476648 (diff)
downloadgentoo-2-bfff635cb768d413c347e37a1371710a680bf7ec.tar.gz
gentoo-2-bfff635cb768d413c347e37a1371710a680bf7ec.tar.bz2
gentoo-2-bfff635cb768d413c347e37a1371710a680bf7ec.zip
Version bump. Removed old. Fixed bug #471968
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/seamonkey/ChangeLog9
-rw-r--r--www-client/seamonkey/files/enigmail_mailnews_extensions_genxpi.patch19
-rw-r--r--www-client/seamonkey/seamonkey-2.19.ebuild (renamed from www-client/seamonkey/seamonkey-2.18_beta4.ebuild)17
3 files changed, 36 insertions, 9 deletions
diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index c72d1375d886..25cfc05796f6 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for www-client/seamonkey
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.452 2013/05/30 09:06:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.453 2013/07/12 21:09:39 polynomial-c Exp $
+
+*seamonkey-2.19 (12 Jul 2013)
+
+ 12 Jul 2013; Lars Wendler <polynomial-c@gentoo.org>
+ -seamonkey-2.18_beta4.ebuild, +seamonkey-2.19.ebuild,
+ +files/enigmail_mailnews_extensions_genxpi.patch:
+ Version bump. Removed old. Fixed bug #471968.
*seamonkey-2.18_beta4 (30 May 2013)
diff --git a/www-client/seamonkey/files/enigmail_mailnews_extensions_genxpi.patch b/www-client/seamonkey/files/enigmail_mailnews_extensions_genxpi.patch
new file mode 100644
index 000000000000..a945cf2be3ac
--- /dev/null
+++ b/www-client/seamonkey/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/www-client/seamonkey/seamonkey-2.18_beta4.ebuild b/www-client/seamonkey/seamonkey-2.19.ebuild
index c88840f16ad8..efe86f746232 100644
--- a/www-client/seamonkey/seamonkey-2.18_beta4.ebuild
+++ b/www-client/seamonkey/seamonkey-2.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.18_beta4.ebuild,v 1.1 2013/05/30 09:06:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.19.ebuild,v 1.1 2013/07/12 21:09:39 polynomial-c Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -28,9 +28,9 @@ fi
inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
-PATCHFF="firefox-21.0-patches-0.1"
+PATCHFF="firefox-22.0-patches-0.2"
PATCH="${PN}-2.14-patches-01"
-EMVER="1.5.1"
+EMVER="1.5.2"
DESCRIPTION="Seamonkey Web Browser"
HOMEPAGE="http://www.seamonkey-project.org"
@@ -143,15 +143,16 @@ src_prepare() {
edos2unix "${file}" || die
done
- # Allow user to apply any additional patches without modifing ebuild
- epatch_user
-
if use crypt ; then
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
- #cd "${S}"/mailnews/extensions/enigmail || die
- #cd "${S}"
+ pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
+ epatch "${FILESDIR}"/enigmail_mailnews_extensions_genxpi.patch
+ popd &>/dev/null || die
fi
+ # Allow user to apply any additional patches without modifing ebuild
+ epatch_user
+
local ms="${S}/mozilla"
# Enable gnomebreakpad