diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2010-10-21 12:16:00 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2010-10-21 12:16:00 +0000 |
| commit | cfe6fc153fc32ceed29db1c2949c86116d2f96bd (patch) | |
| tree | 3d15d3642b9cfc8d62881e321ee85c946200b920 /net-libs | |
| parent | Remove GTK_DISABLE_DEPRECATED allowing build with x11-libs/gtk+-2.22. Bug #34... (diff) | |
| download | gentoo-2-cfe6fc153fc32ceed29db1c2949c86116d2f96bd.tar.gz gentoo-2-cfe6fc153fc32ceed29db1c2949c86116d2f96bd.tar.bz2 gentoo-2-cfe6fc153fc32ceed29db1c2949c86116d2f96bd.zip | |
Address build failure with -alsa
(Portage version: 2.1.9.20/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/xulrunner/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/xulrunner/files/bug-606109.patch | 48 | ||||
| -rw-r--r-- | net-libs/xulrunner/xulrunner-1.9.2.11.ebuild | 4 |
3 files changed, 56 insertions, 2 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog index d8b16009393a..abad4ecc26c5 100644 --- a/net-libs/xulrunner/ChangeLog +++ b/net-libs/xulrunner/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/xulrunner # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.364 2010/10/20 10:53:31 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.365 2010/10/21 12:16:00 anarchy Exp $ + + 21 Oct 2010; Jory A. Pratt <anarchy@gentoo.org> xulrunner-1.9.2.11.ebuild, + +files/bug-606109.patch: + Address build failure with -alsa 20 Oct 2010; Lars Wendler <polynomial-c@gentoo.org> xulrunner-1.9.2.11.ebuild: diff --git a/net-libs/xulrunner/files/bug-606109.patch b/net-libs/xulrunner/files/bug-606109.patch new file mode 100644 index 000000000000..93f114215e32 --- /dev/null +++ b/net-libs/xulrunner/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/content/base/src/nsContentSink.cpp ++++ b/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/net-libs/xulrunner/xulrunner-1.9.2.11.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.11.ebuild index e8bd5b91a5d4..dface0d49e70 100644 --- a/net-libs/xulrunner/xulrunner-1.9.2.11.ebuild +++ b/net-libs/xulrunner/xulrunner-1.9.2.11.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/net-libs/xulrunner/xulrunner-1.9.2.11.ebuild,v 1.2 2010/10/20 10:53:31 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.11.ebuild,v 1.3 2010/10/21 12:16:00 anarchy Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -66,6 +66,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}" + epatch "${FILESDIR}/bug-606109.patch" + eprefixify \ extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \ xpcom/build/nsXPCOMPrivate.h \ |