From 8ed7fef5f64193a2d8edadd025252e0f546cde1c Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 4 Nov 2011 16:56:15 +0000 Subject: [PATCH] Add LD_PRELOAD hack to prevent operapluginwrapper from segfaulting when loading libflashplayer.so (bug #363387). Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- www-client/opera-next/ChangeLog | 6 +++++- www-client/opera-next/opera-next-12.00.1116.ebuild | 5 +++-- www-client/opera/ChangeLog | 10 +++++++++- www-client/opera/opera-11.60.1134.ebuild | 5 +++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog index b52a37c3d119..002de2b479fe 100644 --- a/www-client/opera-next/ChangeLog +++ b/www-client/opera-next/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/opera-next # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.49 2011/10/20 12:22:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.50 2011/11/04 16:56:15 jer Exp $ + + 04 Nov 2011; Jeroen Roovers opera-next-12.00.1116.ebuild: + Add LD_PRELOAD hack to prevent operapluginwrapper from segfaulting when + loading libflashplayer.so (bug #363387). *opera-next-12.00.1116 (20 Oct 2011) diff --git a/www-client/opera-next/opera-next-12.00.1116.ebuild b/www-client/opera-next/opera-next-12.00.1116.ebuild index 2636052efdfc..f1a9ddfb4d18 100644 --- a/www-client/opera-next/opera-next-12.00.1116.ebuild +++ b/www-client/opera-next/opera-next-12.00.1116.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-client/opera-next/opera-next-12.00.1116.ebuild,v 1.1 2011/10/20 12:22:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1116.ebuild,v 1.2 2011/11/04 16:56:15 jer Exp $ EAPI="4" @@ -161,9 +161,10 @@ src_prepare() { # Create /usr/bin/opera wrapper echo '#!/bin/sh' > ${PN} - echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN} + echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN} echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \ >> ${PN} + echo 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${PN} echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN} # Change libz.so.3 to libz.so.1 for gentoo/freebsd diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index 97fa46f6d037..cd0b6a0695cd 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-client/opera # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.655 2011/11/04 16:40:27 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.656 2011/11/04 16:56:14 jer Exp $ + + 04 Nov 2011; Jeroen Roovers opera-11.60.1134.ebuild: + Add LD_PRELOAD hack to prevent operapluginwrapper from segfaulting when + loading libflashplayer.so (bug #363387). + + 04 Nov 2011; Jeroen Roovers opera-11.60.1134.ebuild: + Add LD_PRELOAD hack to prevent operapluginwrapper from segfaulting when + loading libflashplayer.so (bug #363387). *opera-11.60.1134 (04 Nov 2011) diff --git a/www-client/opera/opera-11.60.1134.ebuild b/www-client/opera/opera-11.60.1134.ebuild index 94ed1b145c80..4fa278a0f6bf 100644 --- a/www-client/opera/opera-11.60.1134.ebuild +++ b/www-client/opera/opera-11.60.1134.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-client/opera/opera-11.60.1134.ebuild,v 1.1 2011/11/04 16:40:27 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.60.1134.ebuild,v 1.2 2011/11/04 16:56:14 jer Exp $ EAPI="4" @@ -161,9 +161,10 @@ src_prepare() { # Create /usr/bin/opera wrapper echo '#!/bin/sh' > ${PN} - echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN} + echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN} echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \ >> ${PN} + echo 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${PN} echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN} # Change libz.so.3 to libz.so.1 for gentoo/freebsd -- 2.26.2