Fix bug 307097

(Portage version: 2.1.7.17/cvs/Linux x86_64)

3 files changed, 72 insertions, 2 deletions

diff --git a/www-plugins/swfdec-mozilla/ChangeLog b/www-plugins/swfdec-mozilla/ChangeLog
index ec5305e352fe..dbcd00b39fb7 100644
--- a/www-plugins/swfdec-mozilla/ChangeLog
+++ b/www-plugins/swfdec-mozilla/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-plugins/swfdec-mozilla
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/swfdec-mozilla/ChangeLog,v 1.1 2009/04/10 13:37:18 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/swfdec-mozilla/ChangeLog,v 1.2 2010/03/12 13:39:11 pacho Exp $
+
+*swfdec-mozilla-0.8.2-r1 (12 Mar 2010)
+
+  12 Mar 2010; Pacho Ramos <pacho@gentoo.org>
+  +swfdec-mozilla-0.8.2-r1.ebuild,
+  +files/swfdec-mozilla-0.8.2-fix-crash.patch:
+  Fix bug 307097, thanks to Jean-Marc Hengen for reporting and linking to
+  the fix.
 
   10 Apr 2009; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
   +swfdec-mozilla-0.6.0.ebuild, +swfdec-mozilla-0.8.0.ebuild,
diff --git a/www-plugins/swfdec-mozilla/files/swfdec-mozilla-0.8.2-fix-crash.patch b/www-plugins/swfdec-mozilla/files/swfdec-mozilla-0.8.2-fix-crash.patch
new file mode 100644
index 000000000000..98550029259e
--- /dev/null
+++ b/www-plugins/swfdec-mozilla/files/swfdec-mozilla-0.8.2-fix-crash.patch
@@ -0,0 +1,21 @@
+From 11bfe822fc16a06d8eacacd36a069ccf9dbc1201 Mon Sep 17 00:00:00 2001
+From: 李智豪 <zhihaoli.scut@gmail.com>
+Date: Thu, 05 Nov 2009 22:30:21 +0000
+Subject: Read correct argument when parsing alignment
+
+---
+diff --git a/src/plugin.c b/src/plugin.c
+index 857d733..9a50cdc 100644
+--- a/src/plugin.c
++++ b/src/plugin.c
+@@ -289,7 +289,7 @@ plugin_new (NPMIMEType mime_type, NPP instance,
+       guint j;
+ 
+       for (j = 0; j < G_N_ELEMENTS (possibilities); j++) {
+-	if (g_ascii_strcasecmp (argv[j], possibilities[j].name) == 0) {
++	if (g_ascii_strcasecmp (argv[i], possibilities[j].name) == 0) {
+ 	  align = possibilities[j].align;
+ 	  break;
+ 	}
+--
+cgit v0.8.3-6-g21f6
diff --git a/www-plugins/swfdec-mozilla/swfdec-mozilla-0.8.2-r1.ebuild b/www-plugins/swfdec-mozilla/swfdec-mozilla-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..9da0ade4cb25
--- /dev/null
+++ b/www-plugins/swfdec-mozilla/swfdec-mozilla-0.8.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/swfdec-mozilla/swfdec-mozilla-0.8.2-r1.ebuild,v 1.1 2010/03/12 13:39:11 pacho Exp $
+
+EAPI="2"
+
+inherit multilib versionator eutils
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Swfdec-mozilla is a decoder/renderer netscape style plugin for Macromedia Flash animations."
+HOMEPAGE="http://swfdec.freedesktop.org/"
+SRC_URI="http://swfdec.freedesktop.org/download/${PN}/${MY_PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+	>=media-libs/swfdec-0.8[gtk]"
+DEPEND="${RDEPEND}
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.20"
+
+src_prepare() {
+	# Read correct argument when parsing alignment, see bug #307097
+	epatch "${FILESDIR}/${P}-fix-crash.patch"
+}
+
+src_configure() {
+	econf --with-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/nsbrowser/plugins
+	doexe src/.libs/libswfdecmozilla.so || die "libswfdecmozilla.so failed"
+
+	insinto /usr/$(get_libdir)/nsbrowser/plugins
+	doins src/libswfdecmozilla.la
+}