summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2011-10-03 08:54:19 +0000
committerFabio Erculiani <lxnay@gentoo.org>2011-10-03 08:54:19 +0000
commitee7edefe057e1f5b1f0cc31623245ce9ad238a8e (patch)
treed7f5ed0b4930cc2ede70f41142bc29e13c811e86 /x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
parentBring back qutecom. (diff)
downloadgentoo-2-ee7edefe057e1f5b1f0cc31623245ce9ad238a8e.tar.gz
gentoo-2-ee7edefe057e1f5b1f0cc31623245ce9ad238a8e.tar.bz2
gentoo-2-ee7edefe057e1f5b1f0cc31623245ce9ad238a8e.zip
make gdk-pixbuf-query-loaders more atomic, fix segfault due to __GL_NO_DSO_FINALIZER=1 in environment
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild')
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild13
1 files changed, 11 insertions, 2 deletions
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
index e1ab038bd0f1..0a7818b2b891 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-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/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild,v 1.7 2011/07/11 00:06:54 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild,v 1.8 2011/10/03 08:54:19 lxnay Exp $
EAPI="3"
@@ -77,7 +77,16 @@ src_install() {
}
pkg_postinst() {
- gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+
+ tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+ # be atomic!
+ gdk-pixbuf-query-loaders > "${tmp_file}"
+ if [ "${?}" = "0" ]; then
+ cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ fi
+ rm "${tmp_file}"
if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders