Fixed compilation with disabled wav/ogg support (upstream bug #606109).

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

4 files changed, 59 insertions, 4 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/Manifest b/www-client/seamonkey/Manifest
index b12e93d4eb6f..8f9591057558 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,4 +1,5 @@
 AUX all-gentoo.js 712 RMD160 9c8352b0780ee3ac1e6f372dccb15975dfa09212 SHA1 5825d4485807fe53ddf8bbee70c7352f16c5ea45 SHA256 dfe92f212383bb79b3e2aebb03763c1ad179b3cbc90b22eb4b6aeddba98d100b
+AUX bug-606109.patch 1259 RMD160 6d3f5d354524268e34293e9ce2d8b173c47163af SHA1 e1488807cc61ec04b2caa50019c000ba5d077450 SHA256 f2e645dfaa03cabcf46703be5bdeff8ee021694896465d3d263b038682dc0395
 AUX enigmail/70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
 AUX icon/seamonkey.desktop 154 RMD160 7e1712122cee7510bf058024338e0b75ea7a5e9a SHA1 6f5e33c702fbaa86974e139e398399927462e31e SHA256 78ebd5d753065f6ecf148a010cb59a4756a8c94447cfac6f4db502864bac5d8c
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
@@ -78,6 +79,6 @@ DIST seamonkey-2.0.9-zh-CN.xpi 503793 RMD160 380888790f23573cef96759ba0f080cbb45
 DIST seamonkey-2.0.9.source.tar.bz2 61599701 RMD160 d6f7cc463564b4e18ed5d71f15ccd611c7b7050b SHA1 c23f61d06c54cda841da128b3e2a649a2390eebb SHA256 726d4461dd6b3e58b53439ac86d06c11b36574836a4075232aa3d65f33979372
 EBUILD seamonkey-2.0.7.ebuild 9165 RMD160 441bfa79e9eb75f6b2df347e6ce6f2203b6ceb9a SHA1 bc594e1d6071dc07d931dbae245f26778b162f1f SHA256 d93ed1d42dd58c475d4777f9807b6d7c22f536e8882198678daebcbf04702698
 EBUILD seamonkey-2.0.8-r1.ebuild 9420 RMD160 e265780dbac43c0e2f3c6894cb2e0bb634b6bcde SHA1 90dffd1654ba9c662091158300c7a97d4b7d6c9e SHA256 3bd24c686a999338d2ed33256fa6ff942ad4d71d7e028abeb674f8a7eb31df3a
-EBUILD seamonkey-2.0.9.ebuild 9382 RMD160 555da59f8b50446bf48d53b07fa8a2ded122b480 SHA1 bbbb4480441ae83f4ad8ffd1002df028d5e5a8ff SHA256 5ad6eb1841aa7f9f4c3fb7a37ae5f2442fcb396ee2906a54ed4b47161e0caa36
-MISC ChangeLog 33882 RMD160 ed7b5f0f40634972a0b0661429c04738fb4782cd SHA1 2cc97937d92699315e41edc86ffdc4b614246c04 SHA256 f280dba6492ce54cc4ec1e5997a190d15de80cbaaa7993fda3c1a8e93de0b39b
+EBUILD seamonkey-2.0.9.ebuild 9422 RMD160 7f9d1235b56d01b8b7b1d5f1e095556f086ffc13 SHA1 c14714cb6536a8e258aaf4c45b4196e3513ff255 SHA256 2f713657043d170ed9697a37d5a7646790deb1322668b4a5a6719ea859548a4e
+MISC ChangeLog 34062 RMD160 4c68f2698e954323e7dc3a801ae19838048cd93f SHA1 e7772cd53b47d55d9df43281bd71ddc089e7c22c SHA256 9db20984a3bb2896fbe244f60fe0aa7326f32c04e48615bdeb0988c652ab0554
 MISC metadata.xml 845 RMD160 d313bde4cd255346a825ea0d99afb7585151cc0f SHA1 7941c776107161a6278ba5893345aeac2a5cbe7a SHA256 404caecf817491893c2ef118b48f025bc0d5c37d910979dd5602273127e479f9
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