From: Pacho Ramos Date: Fri, 12 Mar 2010 13:39:12 +0000 (+0000) Subject: Fix bug 307097 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c73aa50d3eefb393c373424dbc8ac58c46068463;p=gentoo.git Fix bug 307097 Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- 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 + +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 +metadata.xml, +swfdec-mozilla-0.6.0.ebuild, +swfdec-mozilla-0.8.0.ebuild, diff --git a/www-plugins/swfdec-mozilla/Manifest b/www-plugins/swfdec-mozilla/Manifest index f2e4967f4801..52734f1fb33d 100644 --- a/www-plugins/swfdec-mozilla/Manifest +++ b/www-plugins/swfdec-mozilla/Manifest @@ -1,18 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX swfdec-mozilla-0.8.2-fix-crash.patch 671 RMD160 5c9723e06c83fd723bec0587d1f8cc7618da46a7 SHA1 c11fcfba343e27bd30c3e9241aef24d72349ea4a SHA256 23b6076e25a93479df5441732c3d92df09a5260c579401bc08626c9a701b3e8e DIST swfdec-mozilla-0.6.0.tar.gz 399937 RMD160 2879954ae3fdddeeaa04b1eb7e8b73beeb1ea614 SHA1 7edefcf1577c1029163623688d1dfc12c00e304e SHA256 05e93b4343998afd24b0ba879e25ef4f08c87af6afb51fb0cc5a0362c3feff34 DIST swfdec-mozilla-0.8.0.tar.gz 426235 RMD160 5c6c253d8bd67e3796cab0346e1f5a29017878c9 SHA1 a330ca74daa536870c2b6395309792e06af652d6 SHA256 d3b15e577229895acfc5ac5dff57231b1c22b718b52abc8f956c9bb46f0b6c43 DIST swfdec-mozilla-0.8.2.tar.gz 381148 RMD160 c6aef5170a06477d5bb7720c8814b34d7711b8b9 SHA1 330fc304acc8ee63f4e9af993cbf87c25d82cebf SHA256 49fd905f41b67832e7b2cfa2cf664657ab08f8fef4a2324e74202fc951396cd5 EBUILD swfdec-mozilla-0.6.0.ebuild 1311 RMD160 bfa6e676987a95b16a0dd401e6aae978de48bd88 SHA1 0849752fce51606669d06cc560653121cfd5132b SHA256 e3c06aeda6da4afcb2258836662b828c39a34bb9e95f2e296e650cb5f7f81449 EBUILD swfdec-mozilla-0.8.0.ebuild 1302 RMD160 dcec3f5a936d3ab36f99a58380793c54a176e112 SHA1 614842905c258f1d142d93ea8de033e4a557ca1e SHA256 14a1d2f2cc3949d2b0c6ca3b83d45159881be9c13a513b26313955bdc9d47f36 +EBUILD swfdec-mozilla-0.8.2-r1.ebuild 1174 RMD160 71e0cbcc44900499bf8111f16dbca5d804a82a69 SHA1 cde6b3e4e9e40d8b7fd17689d41e0e3a3c7013ea SHA256 2efa5325fcfbbe968b35b29e761947fdd213bbdefd3bb02557e87cfdb59eded3 EBUILD swfdec-mozilla-0.8.2.ebuild 1302 RMD160 57d722303832643b749e198755be3f9f1b1f9106 SHA1 93aeed11fa36a51f2db88d795037c526592b3311 SHA256 41fe2d362ab617b0dac951eaa32cd43e99933a86768a0454352d845ab5a59f10 -MISC ChangeLog 2435 RMD160 2b9ea87ddc31be16303605347b2f75da59ad997d SHA1 b0f90f6099de932f34207d69545159b3a9b4da46 SHA256 9184ae84d2fdfc32eeb695f589cf9073ab0ea3f32aabe6587b83dfbf9da71b4b +MISC ChangeLog 2691 RMD160 54f6517f84acb71c64b201b5b009482bf1e742a6 SHA1 5e03995a64a75d256582b42b214422dd04a2398b SHA256 a625eeb0b00cd7a4175e5d36ec9680794bb6738b89d194186369380adf5ffac7 MISC metadata.xml 298 RMD160 f40e40fc258485782640a94b6b5741c433d20e78 SHA1 997399f5b93807c2c39074854c024aef46c5ed35 SHA256 8b9d3a21d81d7124b94ded089edc7bd3f3dc5fed78444e97db3c08949e388363 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAknfS+YACgkQOeoy/oIi7uy/KgCgrOVTOZZ9zYFnQgq4Q7z710HU -rnoAn0bJjEeblxwmpVTYGyrpA8TmvhRC -=z6Rn +iEYEARECAAYFAkuaRAQACgkQCaWpQKGI+9RMdQCfTI8FmO6EAK20i530aSOAZryq +1PQAnRSNpg2jDv2uAfkF1pScQyKTld+d +=0yCw -----END PGP SIGNATURE----- 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: 李智豪 +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 +}