diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-06-09 12:19:44 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-06-09 12:19:44 +0000 |
| commit | 1f3fe10bdba161bb284bbdc109fe123bdbb0fa36 (patch) | |
| tree | bad5817986d2a4ee273d16a2ba42f4a15f496b27 /games-strategy/glest | |
| parent | [sci-mathematics/glpk] Add ~amd64-linux keyword (diff) | |
| download | gentoo-2-1f3fe10bdba161bb284bbdc109fe123bdbb0fa36.tar.gz gentoo-2-1f3fe10bdba161bb284bbdc109fe123bdbb0fa36.tar.bz2 gentoo-2-1f3fe10bdba161bb284bbdc109fe123bdbb0fa36.zip | |
Fix underlink. Bug #367691
(Portage version: 2.1.10/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy/glest')
| -rw-r--r-- | games-strategy/glest/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/glest/files/glest-3.2.2-underlink.patch | 11 | ||||
| -rw-r--r-- | games-strategy/glest/glest-3.2.2.ebuild | 9 |
3 files changed, 23 insertions, 5 deletions
diff --git a/games-strategy/glest/ChangeLog b/games-strategy/glest/ChangeLog index 26d1c97af46e..ba7389e4d7ca 100644 --- a/games-strategy/glest/ChangeLog +++ b/games-strategy/glest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/glest -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.29 2010/08/15 21:03:02 ssuominen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.30 2011/06/09 12:19:44 tupone Exp $ + + 09 Jun 2011; Tupone Alfredo <tupone@gentoo.org> glest-3.2.2.ebuild, + +files/glest-3.2.2-underlink.patch: + Fix underlink. Bug #367691 by Diego Elio Pettenò 15 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> glest-3.2.2.ebuild, +files/glest-3.2.2-glibc212.patch: diff --git a/games-strategy/glest/files/glest-3.2.2-underlink.patch b/games-strategy/glest/files/glest-3.2.2-underlink.patch new file mode 100644 index 000000000000..5c06d6bf9bd6 --- /dev/null +++ b/games-strategy/glest/files/glest-3.2.2-underlink.patch @@ -0,0 +1,11 @@ +--- mk/autoconf/ax_check_gl.m4.old 2011-06-09 13:59:57.263672275 +0200 ++++ mk/autoconf/ax_check_gl.m4 2011-06-09 14:00:31.552853456 +0200 +@@ -49,6 +49,8 @@ + fi + if test -n "$x_libraries"; then + GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}" ++ else ++ GL_LIBS="-lX11 ${GL_LIBS}" + fi + fi + diff --git a/games-strategy/glest/glest-3.2.2.ebuild b/games-strategy/glest/glest-3.2.2.ebuild index 1717f4bc8062..5a206764a428 100644 --- a/games-strategy/glest/glest-3.2.2.ebuild +++ b/games-strategy/glest/glest-3.2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-3.2.2.ebuild,v 1.9 2010/08/15 21:03:02 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-3.2.2.ebuild,v 1.10 2011/06/09 12:19:44 tupone Exp $ EAPI=2 -inherit eutils wxwidgets games +inherit eutils autotools wxwidgets games DESCRIPTION="Cross-platform 3D realtime strategy game" HOMEPAGE="http://www.glest.org/" @@ -36,6 +36,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-gentoo.patch \ "${FILESDIR}"/${P}-xerces-c.patch \ + "${FILESDIR}"/${P}-underlink.patch \ "${FILESDIR}"/${P}-glibc210.patch \ "${FILESDIR}"/${P}-glibc212.patch @@ -55,6 +56,8 @@ src_prepare() { || die "sed failed" find "${WORKDIR}"/glest_game -name Thumbs.db -exec rm -f '{}' + + + AT_M4DIR="mk/autoconf" eautoreconf } src_configure() { |