diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-11-25 17:39:19 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-11-25 17:39:19 +0000 |
| commit | 2b734186289e209ca22ae37aef131f2cfa95b6dd (patch) | |
| tree | a5d3990948abb1fe61a71e80bcc1a4a617ade1b8 /www-plugins | |
| parent | Version bump. Removed some patches applied upstream (diff) | |
| download | gentoo-2-2b734186289e209ca22ae37aef131f2cfa95b6dd.tar.gz gentoo-2-2b734186289e209ca22ae37aef131f2cfa95b6dd.tar.bz2 gentoo-2-2b734186289e209ca22ae37aef131f2cfa95b6dd.zip | |
Fix kde multilib library path, bug #391283.
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins')
| -rw-r--r-- | www-plugins/gnash/ChangeLog | 9 | ||||
| -rw-r--r-- | www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch | 12 | ||||
| -rw-r--r-- | www-plugins/gnash/gnash-0.8.9-r2.ebuild (renamed from www-plugins/gnash/gnash-0.8.9-r1.ebuild) | 5 |
3 files changed, 24 insertions, 2 deletions
diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog index 08e90d58e011..bca9fd865f5d 100644 --- a/www-plugins/gnash/ChangeLog +++ b/www-plugins/gnash/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-plugins/gnash # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.67 2011/11/21 21:30:22 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.68 2011/11/25 17:39:19 chithanh Exp $ + +*gnash-0.8.9-r2 (25 Nov 2011) + + 25 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + -gnash-0.8.9-r1.ebuild, +gnash-0.8.9-r2.ebuild, + +files/gnash-0.8.9-kde4-libdir.patch: + Fix kde multilib library path, bug #391283. *gnash-0.8.9-r1 (21 Nov 2011) diff --git a/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch b/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch new file mode 100644 index 000000000000..b3279441d2f0 --- /dev/null +++ b/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch @@ -0,0 +1,12 @@ +diff -ur a/macros/kde4.m4 b/macros/kde4.m4 +--- a/macros/kde4.m4 2011-02-26 19:11:08.000000000 +0100 ++++ b/macros/kde4.m4 2011-11-25 18:09:25.000000000 +0100 +@@ -198,7 +198,7 @@ + if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release; then + KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4" + else +- KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4" ++ KDE4_PLUGINDIR="${KDE4_PREFIX}/${acl_libdirstem}/kde4" + fi + fi + if test x"${with_kde4_servicesdir}" != x ; then diff --git a/www-plugins/gnash/gnash-0.8.9-r1.ebuild b/www-plugins/gnash/gnash-0.8.9-r2.ebuild index 2ad7855b3c97..e0cb2a913916 100644 --- a/www-plugins/gnash/gnash-0.8.9-r1.ebuild +++ b/www-plugins/gnash/gnash-0.8.9-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9-r1.ebuild,v 1.1 2011/11/21 21:30:22 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9-r2.ebuild,v 1.1 2011/11/25 17:39:19 chithanh Exp $ EAPI=3 CMAKE_REQUIRED="never" @@ -171,6 +171,9 @@ src_prepare() { # Fix building on ppc64, bug #342535 use ppc64 && append-flags -mminimal-toc + # Fix kde multilib library path, bug #391283 + epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch + # Fix security bug #391283 epatch "${FILESDIR}"/${PN}-0.8.9-cve-2011-4328.patch |