| 1 |
tetromino 12/12/27 23:33:58 |
| 2 |
|
| 3 |
Modified: gconf-3.2.5.ebuild ChangeLog gconf-2.32.4.ebuild |
| 4 |
Log: |
| 5 |
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). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 gnome-base/gconf/gconf-3.2.5.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: gconf-3.2.5.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- gconf-3.2.5.ebuild 27 Dec 2012 18:05:52 -0000 1.5 |
| 23 |
+++ gconf-3.2.5.ebuild 27 Dec 2012 23:33:58 -0000 1.6 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.5 2012/12/27 18:05:52 tetromino Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.6 2012/12/27 23:33:58 tetromino Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
GCONF_DEBUG="yes" |
| 32 |
@@ -32,6 +32,10 @@ |
| 33 |
>=dev-util/intltool-0.35 |
| 34 |
virtual/pkgconfig" |
| 35 |
|
| 36 |
+pkg_setup() { |
| 37 |
+ kill_gconf |
| 38 |
+} |
| 39 |
+ |
| 40 |
src_prepare() { |
| 41 |
G2CONF="${G2CONF} |
| 42 |
--disable-static |
| 43 |
@@ -44,7 +48,6 @@ |
| 44 |
$(use_enable policykit defaults-service) |
| 45 |
ORBIT_IDL=$(type -P orbit-idl-2)" |
| 46 |
# Need host's IDL compiler for cross or native build, bug #262747 |
| 47 |
- kill_gconf |
| 48 |
|
| 49 |
gnome2_src_prepare |
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.272 gnome-base/gconf/ChangeLog |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.272&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.272&content-type=text/plain |
| 58 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?r1=1.271&r2=1.272 |
| 59 |
|
| 60 |
Index: ChangeLog |
| 61 |
=================================================================== |
| 62 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v |
| 63 |
retrieving revision 1.271 |
| 64 |
retrieving revision 1.272 |
| 65 |
diff -u -r1.271 -r1.272 |
| 66 |
--- ChangeLog 27 Dec 2012 18:05:52 -0000 1.271 |
| 67 |
+++ ChangeLog 27 Dec 2012 23:33:58 -0000 1.272 |
| 68 |
@@ -1,6 +1,12 @@ |
| 69 |
# ChangeLog for gnome-base/gconf |
| 70 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 71 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.271 2012/12/27 18:05:52 tetromino Exp $ |
| 72 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.272 2012/12/27 23:33:58 tetromino Exp $ |
| 73 |
+ |
| 74 |
+ 27 Dec 2012; Alexandre Rostovtsev <tetromino@g.o> gconf-2.32.4.ebuild, |
| 75 |
+ gconf-3.2.5.ebuild: |
| 76 |
+ Move kill_gconf to pkg_setup in an attempt to fix access violations |
| 77 |
+ experienced by some users (bug #448952; thanks to iamben for the suggested |
| 78 |
+ solution). |
| 79 |
|
| 80 |
27 Dec 2012; Alexandre Rostovtsev <tetromino@g.o> gconf-2.32.4.ebuild, |
| 81 |
gconf-3.2.5.ebuild, metadata.xml: |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.11 gnome-base/gconf/gconf-2.32.4.ebuild |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild?rev=1.11&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild?rev=1.11&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild?r1=1.10&r2=1.11 |
| 90 |
|
| 91 |
Index: gconf-2.32.4.ebuild |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v |
| 94 |
retrieving revision 1.10 |
| 95 |
retrieving revision 1.11 |
| 96 |
diff -u -r1.10 -r1.11 |
| 97 |
--- gconf-2.32.4.ebuild 27 Dec 2012 18:05:52 -0000 1.10 |
| 98 |
+++ gconf-2.32.4.ebuild 27 Dec 2012 23:33:58 -0000 1.11 |
| 99 |
@@ -1,6 +1,6 @@ |
| 100 |
# Copyright 1999-2012 Gentoo Foundation |
| 101 |
# Distributed under the terms of the GNU General Public License v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.10 2012/12/27 18:05:52 tetromino Exp $ |
| 103 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.11 2012/12/27 23:33:58 tetromino Exp $ |
| 104 |
|
| 105 |
EAPI="5" |
| 106 |
GCONF_DEBUG="yes" |
| 107 |
@@ -31,6 +31,10 @@ |
| 108 |
>=dev-util/intltool-0.35 |
| 109 |
virtual/pkgconfig" |
| 110 |
|
| 111 |
+pkg_setup() { |
| 112 |
+ kill_gconf |
| 113 |
+} |
| 114 |
+ |
| 115 |
src_prepare() { |
| 116 |
G2CONF="${G2CONF} |
| 117 |
--disable-static |
| 118 |
@@ -41,7 +45,6 @@ |
| 119 |
$(use_with ldap openldap) |
| 120 |
$(use_enable policykit defaults-service) |
| 121 |
ORBIT_IDL=$(type -P orbit-idl-2)" |
| 122 |
- kill_gconf |
| 123 |
|
| 124 |
gnome2_src_prepare |
Archives