diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-12-16 08:58:52 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-12-16 08:58:52 +0000 |
| commit | f380b384f5dac71979bf7257ed35b8ad89d6b34d (patch) | |
| tree | 4eb28bb659af5b58774260fda22ba66574e2b7dd /gnome-extra/yelp/yelp-2.30.2-r6.ebuild | |
| parent | Stable for AMD64, wrt bug #394399 (diff) | |
| download | gentoo-2-f380b384f5dac71979bf7257ed35b8ad89d6b34d.tar.gz gentoo-2-f380b384f5dac71979bf7257ed35b8ad89d6b34d.tar.bz2 gentoo-2-f380b384f5dac71979bf7257ed35b8ad89d6b34d.zip | |
Fix -ldl linking problems with xulrunner-2.0 (bug #392367, thanks to Peter Alfredsen and Alex Maclean). Also, gnome2_src_prepare should be after eautoreconf.
(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/yelp/yelp-2.30.2-r6.ebuild')
| -rw-r--r-- | gnome-extra/yelp/yelp-2.30.2-r6.ebuild | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild b/gnome-extra/yelp/yelp-2.30.2-r6.ebuild index dfef57df062f..21df203b71c6 100644 --- a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild +++ b/gnome-extra/yelp/yelp-2.30.2-r6.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/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.4 2011/11/28 16:45:57 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.5 2011/12/16 08:58:52 tetromino Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -47,8 +47,6 @@ pkg_setup() { } src_prepare() { - gnome2_src_prepare - # Fix automagic lzma support, bug #266128 epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch" @@ -73,12 +71,17 @@ src_prepare() { # Fix small freezes when moving window epatch "${FILESDIR}/${P}-freeze-move.patch" + # Fix -ldl linking problems with xulrunner-2.0 (bug #392367) + epatch "${FILESDIR}/${P}-mozilla-glue-libs.patch" + # Ensure schema is regenerated properly to prevent warnings rm -f data/yelp.schemas || die intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf + gnome2_src_prepare + # strip stupid options in configure, see bug #196621 sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed failed" } |