Add LD_PRELOAD hack to prevent operapluginwrapper from segfaulting when loading libfl...

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog
index b52a37c3d11967554527bc74a397a9bbe23ac609..002de2b479fec2eaefa7f281bb905e29b5ee1270 100644 (file)
--- 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 <jer@gentoo.org> 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 2636052efdfca64a2f022ab18181089491ec0028..f1a9ddfb4d18f22e95dcf429d6ad568348f763db 100644 (file)
--- 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 97fa46f6d0377e9e458764728ad5229dc064dc93..cd0b6a0695cd5a564515ba3b2dfb128d830e5104 100644 (file)
--- 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 <jer@gentoo.org> 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 <jer@gentoo.org> 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 94ed1b145c80da23c6d7b8395d791da053f11120..4fa278a0f6bfa8b5eb1d283bd95719b060235713 100644 (file)
--- 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