Version bump, fixes bug #330177

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 60 insertions, 3 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index 59d7f627275d..932f994ce985 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/lightspark
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.11 2010/07/25 21:32:03 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.12 2010/07/31 14:50:36 chithanh Exp $
+
+*lightspark-0.4.2.2 (31 Jul 2010)
+
+  31 Jul 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -lightspark-0.4.2.ebuild, +lightspark-0.4.2.2.ebuild,
+  +files/lightspark-0.4.2.2-fix-disabled-plugin.diff:
+  Version bump, fixes bug #330177
 
   25 Jul 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   lightspark-0.4.2.ebuild:
diff --git a/www-plugins/lightspark/files/lightspark-0.4.2.2-fix-disabled-plugin.diff b/www-plugins/lightspark/files/lightspark-0.4.2.2-fix-disabled-plugin.diff
new file mode 100644
index 000000000000..a56fc8f6a726
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.4.2.2-fix-disabled-plugin.diff
@@ -0,0 +1,32 @@
+=== modified file 'swf.cpp'
+--- swf.cpp	2010-07-28 22:52:35 +0000
++++ swf.cpp	2010-07-29 16:21:13 +0000
+@@ -497,6 +497,7 @@
+ 	//Check if we should fall back on gnash
+ 	if(useGnashFallback && engine==GTKPLUG && vmVersion!=AVM2)
+ 	{
++#ifdef COMPILE_PLUGIN
+ 		if(dumpedSWFPath.len()==0) //The path is not known yet
+ 		{
+ 			waitingForDump=true;
+@@ -565,11 +566,19 @@
+ 			stopEngines();
+ 			return;
+ 		}
++#else 
++		//COMPILE_PLUGIN not defined
++		throw new UnsupportedException("GNASH fallback not available when not built with COMPILE_PLUGIN");
++#endif
+ 	}
+ 
+ 	if(engine==GTKPLUG) //The engines must be created int the context of the main thread
+ 	{
++#ifdef COMPILE_PLUGIN
+ 		npapiParams.helper(npapiParams.helperArg, (helper_t)delayedCreation, this);
++#else
++		throw new UnsupportedException("Plugin engine not available when not built with COMPILE_PLUGIN");
++#endif
+ 	}
+ 	else //SDL engine
+ 	{
+
diff --git a/www-plugins/lightspark/lightspark-0.4.2.ebuild b/www-plugins/lightspark/lightspark-0.4.2.2.ebuild
index fb1bc6a1f1c1..8b0b0c4d621e 100644
--- a/www-plugins/lightspark/lightspark-0.4.2.ebuild
+++ b/www-plugins/lightspark/lightspark-0.4.2.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.2.ebuild,v 1.2 2010/07/25 21:32:03 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.2.2.ebuild,v 1.1 2010/07/31 14:50:36 chithanh Exp $
 
 EAPI=3
 inherit cmake-utils nsplugins multilib
 
 DESCRIPTION="High performance flash player"
 HOMEPAGE="https://launchpad.net/lightspark/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PN}-0.4.2/+download/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -25,6 +25,7 @@ RDEPEND="dev-libs/libpcre[cxx]
 		media-sound/pulseaudio
 	)
 	net-misc/curl
+	>=sys-devel/gcc-4.4
 	>=sys-devel/llvm-2.7
 	virtual/opengl
 	nsplugin? (
@@ -40,6 +41,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_rc*/}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-disabled-plugin.diff
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
@@ -55,3 +60,16 @@ src_install() {
 
 	use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
 }
+
+pkg_postinst() {
+	if use nsplugin && ! has_version www-plugins/gnash; then
+		elog "Lightspark now supports gnash fallback for its browser plugin."
+		elog "Install www-plugins/gnash to take advantage of it."
+	fi
+	if use nsplugin && has_version www-plugins/gnash[nsplugin]; then
+		elog "Having two plugins installed for the same MIME type may confuse"
+		elog "Mozilla based browsers. It is recommended to disable the nsplugin"
+		elog "USE flag for either gnash or lightspark. For details, see"
+		elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848"
+	fi
+}