summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2010-10-21 13:06:35 +0000
committerLars Wendler <polynomial-c@gentoo.org>2010-10-21 13:06:35 +0000
commit3f5b8701f2afa757787c2ed7e121f2a0fd7b1f75 (patch)
tree024dc4b30db0842b1c0e4fb367db15c754297e1b /www-client/seamonkey
parentMarking xorg-server-1.7.7-r1 ppc for bug 330593 (diff)
downloadgentoo-2-3f5b8701f2afa757787c2ed7e121f2a0fd7b1f75.tar.gz
gentoo-2-3f5b8701f2afa757787c2ed7e121f2a0fd7b1f75.tar.bz2
gentoo-2-3f5b8701f2afa757787c2ed7e121f2a0fd7b1f75.zip
Fixed compilation with disabled wav/ogg support (upstream bug #606109).
(Portage version: 2.2_rc98/cvs/Linux x86_64)
Diffstat (limited to 'www-client/seamonkey')
-rw-r--r--www-client/seamonkey/ChangeLog6
-rw-r--r--www-client/seamonkey/files/bug-606109.patch48
-rw-r--r--www-client/seamonkey/seamonkey-2.0.9.ebuild4
3 files changed, 56 insertions, 2 deletions
diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index ec6ef7a07664..2451fa8eedce 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/seamonkey
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.262 2010/10/20 14:13:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.263 2010/10/21 13:06:35 polynomial-c Exp $
+
+ 21 Oct 2010; Lars Wendler <polynomial-c@gentoo.org>
+ seamonkey-2.0.9.ebuild, +files/bug-606109.patch:
+ Fixed compilation with disabled wav/ogg support (upstream bug #606109).
*seamonkey-2.0.9 (20 Oct 2010)
diff --git a/www-client/seamonkey/files/bug-606109.patch b/www-client/seamonkey/files/bug-606109.patch
new file mode 100644
index 000000000000..57d9cd98cf61
--- /dev/null
+++ b/www-client/seamonkey/files/bug-606109.patch
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User Jory A. Pratt <anarchy@gentoo.org>
+# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c
+Add missing ifde MOZ_MEDIA
+
+diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
+--- a/mozilla/content/base/src/nsContentSink.cpp
++++ b/mozilla/content/base/src/nsContentSink.cpp
+@@ -1860,17 +1860,19 @@ nsIAtom** const kDefaultAllowedTags [] =
+ &nsGkAtoms::nobr,
+ &nsGkAtoms::noscript,
+ &nsGkAtoms::ol,
+ &nsGkAtoms::optgroup,
+ &nsGkAtoms::option,
+ &nsGkAtoms::output,
+ &nsGkAtoms::p,
+ &nsGkAtoms::pre,
++#ifdef MOZ_MEDIA
+ &nsGkAtoms::progress,
++#endif
+ &nsGkAtoms::q,
+ &nsGkAtoms::rp,
+ &nsGkAtoms::rt,
+ &nsGkAtoms::ruby,
+ &nsGkAtoms::s,
+ &nsGkAtoms::samp,
+ &nsGkAtoms::section,
+ &nsGkAtoms::select,
+@@ -1952,17 +1954,19 @@ nsIAtom** const kDefaultAllowedAttribute
+ &nsGkAtoms::itemref,
+ &nsGkAtoms::itemscope,
+ &nsGkAtoms::itemtype,
+ &nsGkAtoms::kind,
+ &nsGkAtoms::label,
+ &nsGkAtoms::lang,
+ &nsGkAtoms::list,
+ &nsGkAtoms::longdesc,
++#ifdef MOZ_MEDIA
+ &nsGkAtoms::loop,
++#endif
+ &nsGkAtoms::low,
+ &nsGkAtoms::max,
+ &nsGkAtoms::maxlength,
+ &nsGkAtoms::media,
+ &nsGkAtoms::min,
+ &nsGkAtoms::mozdonotsend,
+ &nsGkAtoms::method,
+ &nsGkAtoms::multiple,
diff --git a/www-client/seamonkey/seamonkey-2.0.9.ebuild b/www-client/seamonkey/seamonkey-2.0.9.ebuild
index 6a732026ec39..dce6a0bd4ce0 100644
--- a/www-client/seamonkey/seamonkey-2.0.9.ebuild
+++ b/www-client/seamonkey/seamonkey-2.0.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.9.ebuild,v 1.1 2010/10/20 14:13:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.9.ebuild,v 1.2 2010/10/21 13:06:35 polynomial-c Exp $
EAPI="2"
WANT_AUTOCONF="2.1"
@@ -146,6 +146,8 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/patch"
+ epatch "${FILESDIR}"/bug-606109.patch
+
if use crypt && use mailclient ; then
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
cd "${S}"/mailnews/extensions/enigmail || die