| 1 |
commit: 5f5cf8cfd67aecdcb2d6782e2503c2656cdf3efd |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 30 11:25:28 2016 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 30 11:32:35 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5f5cf8cf |
| 7 |
|
| 8 |
eclass/gnome2-live: sync src_prepare with gnome2.eclass |
| 9 |
|
| 10 |
Use xdg eclass to clean environment, etc |
| 11 |
|
| 12 |
eclass/gnome2-live.eclass | 9 ++++----- |
| 13 |
1 file changed, 4 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass |
| 16 |
index 7771c50..0e725d0 100644 |
| 17 |
--- a/eclass/gnome2-live.eclass |
| 18 |
+++ b/eclass/gnome2-live.eclass |
| 19 |
@@ -14,7 +14,7 @@ |
| 20 |
# Always to be imported *AFTER* gnome2.eclass |
| 21 |
# |
| 22 |
|
| 23 |
-inherit autotools eutils gnome2 gnome2-utils libtool git-r3 |
| 24 |
+inherit autotools eutils gnome2 gnome2-utils libtool git-r3 xdg |
| 25 |
|
| 26 |
EXPORTED_FUNCTIONS=" " |
| 27 |
case "${EAPI:-0}" in |
| 28 |
@@ -105,9 +105,7 @@ gnome2-live_src_prepare() { |
| 29 |
|
| 30 |
### Keep this in-sync with gnome2.eclass! |
| 31 |
|
| 32 |
- # Don't use the session bus address inherited via the environment |
| 33 |
- # causes test and introspection-building failures |
| 34 |
- unset DBUS_SESSION_BUS_ADDRESS |
| 35 |
+ xdg_src_prepare |
| 36 |
|
| 37 |
# Prevent assorted access violations and test failures |
| 38 |
gnome2_environment_reset |
| 39 |
@@ -115,7 +113,8 @@ gnome2-live_src_prepare() { |
| 40 |
# Prevent scrollkeeper access violations |
| 41 |
gnome2_omf_fix |
| 42 |
|
| 43 |
- # Libtool patching |
| 44 |
+ # Run libtoolize |
| 45 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517 |
| 46 |
elibtoolize ${ELTCONF} |
| 47 |
} |
Archives