| 1 |
commit: e54848110f451f4ac2816ea98260763994bae258 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Oct 3 21:41:02 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Oct 3 21:45:31 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e5484811 |
| 7 |
|
| 8 |
app-misc/tracker: put a stake through the foul heart of access violations (#385495) |
| 9 |
|
| 10 |
It looks like (a) overriding AC_PATH_PROG requires a full path (not just |
| 11 |
a relative one), and (b) AC_PATH_PROG actually tries to execute the |
| 12 |
programs that it finds, so we need to generate the firefox and thunderbird |
| 13 |
version wrapper scripts and pass them to configure, even if we are not |
| 14 |
building firefox or thunderbird support. |
| 15 |
Thanks to Stefan Zwanenburg <stefanhetzwaantje <AT> gmail.com> for reporting |
| 16 |
in bug #385495. |
| 17 |
|
| 18 |
--- |
| 19 |
app-misc/tracker/tracker-0.12.3-r2.ebuild | 13 +++++-------- |
| 20 |
1 files changed, 5 insertions(+), 8 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-misc/tracker/tracker-0.12.3-r2.ebuild b/app-misc/tracker/tracker-0.12.3-r2.ebuild |
| 23 |
index c5620f8..a002c8b 100644 |
| 24 |
--- a/app-misc/tracker/tracker-0.12.3-r2.ebuild |
| 25 |
+++ b/app-misc/tracker/tracker-0.12.3-r2.ebuild |
| 26 |
@@ -171,6 +171,7 @@ pkg_setup() { |
| 27 |
$(use_enable exif libexif) |
| 28 |
$(use_enable firefox-bookmarks miner-firefox) |
| 29 |
$(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions) |
| 30 |
+ FIREFOX=${S}/firefox-version.sh |
| 31 |
$(use_enable flac libflac) |
| 32 |
$(use_enable flickr miner-flickr) |
| 33 |
$(use_enable gnome-keyring) |
| 34 |
@@ -191,15 +192,13 @@ pkg_setup() { |
| 35 |
$(use_enable test unit-tests) |
| 36 |
$(use_enable thunderbird miner-thunderbird) |
| 37 |
$(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions) |
| 38 |
+ THUNDERBIRD=${S}/thunderbird-version.sh |
| 39 |
$(use_enable tiff libtiff) |
| 40 |
$(use_enable vorbis libvorbis) |
| 41 |
$(use_enable xml libxml2) |
| 42 |
$(use_enable xmp exempi)" |
| 43 |
# $(use_enable strigi libstreamanalyzer) |
| 44 |
|
| 45 |
- use firefox-bookmarks && G2CONF="${G2CONF} FIREFOX=./firefox-version.sh" |
| 46 |
- use thunderbird && G2CONF="${G2CONF} THUNDERBIRD=./thunderbird-version.sh" |
| 47 |
- |
| 48 |
DOCS="AUTHORS ChangeLog NEWS README" |
| 49 |
|
| 50 |
python_set_active_version 2 |
| 51 |
@@ -214,11 +213,9 @@ src_prepare() { |
| 52 |
python_convert_shebangs -r 2 tests utils examples |
| 53 |
|
| 54 |
# Don't run 'firefox --version' or 'thunderbird --version'; it results in |
| 55 |
- # access violations on some setups (bug #385347). |
| 56 |
- use firefox-bookmarks && create_version_script \ |
| 57 |
- "www-client/firefox" "Mozilla Firefox" firefox-version.sh |
| 58 |
- use thunderbird && create_version_script \ |
| 59 |
- "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh |
| 60 |
+ # access violations on some setups (bug #385347, #385495). |
| 61 |
+ create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh |
| 62 |
+ create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh |
| 63 |
|
| 64 |
# FIXME: report broken tests |
| 65 |
sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \ |
Archives