diff options
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gconf/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-base/gconf/gconf-2.32.4.ebuild | 7 | ||||
| -rw-r--r-- | gnome-base/gconf/gconf-3.2.5.ebuild | 7 |
3 files changed, 17 insertions, 5 deletions
diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog index aeb1bda2df90..5b88f66a2ccf 100644 --- a/gnome-base/gconf/ChangeLog +++ b/gnome-base/gconf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/gconf # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.271 2012/12/27 18:05:52 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.272 2012/12/27 23:33:58 tetromino Exp $ + + 27 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gconf-2.32.4.ebuild, + gconf-3.2.5.ebuild: + Move kill_gconf to pkg_setup in an attempt to fix access violations + experienced by some users (bug #448952; thanks to iamben for the suggested + solution). 27 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gconf-2.32.4.ebuild, gconf-3.2.5.ebuild, metadata.xml: diff --git a/gnome-base/gconf/gconf-2.32.4.ebuild b/gnome-base/gconf/gconf-2.32.4.ebuild index b62aaa17c268..058c371358f5 100644 --- a/gnome-base/gconf/gconf-2.32.4.ebuild +++ b/gnome-base/gconf/gconf-2.32.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.10 2012/12/27 18:05:52 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.11 2012/12/27 23:33:58 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -31,6 +31,10 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.35 virtual/pkgconfig" +pkg_setup() { + kill_gconf +} + src_prepare() { G2CONF="${G2CONF} --disable-static @@ -41,7 +45,6 @@ src_prepare() { $(use_with ldap openldap) $(use_enable policykit defaults-service) ORBIT_IDL=$(type -P orbit-idl-2)" - kill_gconf gnome2_src_prepare diff --git a/gnome-base/gconf/gconf-3.2.5.ebuild b/gnome-base/gconf/gconf-3.2.5.ebuild index 379540829728..2f561d7604f7 100644 --- a/gnome-base/gconf/gconf-3.2.5.ebuild +++ b/gnome-base/gconf/gconf-3.2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.5 2012/12/27 18:05:52 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.6 2012/12/27 23:33:58 tetromino Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -32,6 +32,10 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.35 virtual/pkgconfig" +pkg_setup() { + kill_gconf +} + src_prepare() { G2CONF="${G2CONF} --disable-static @@ -44,7 +48,6 @@ src_prepare() { $(use_enable policykit defaults-service) ORBIT_IDL=$(type -P orbit-idl-2)" # Need host's IDL compiler for cross or native build, bug #262747 - kill_gconf gnome2_src_prepare |