diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-05-20 09:24:18 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-05-20 09:24:18 +0000 |
| commit | acb9e9c1f0555684d3e853b9ae2ce1b93efb20c0 (patch) | |
| tree | 8b15f24c9e2e8374ff45f44b14ac199c0d4f37e2 /media-libs/ftgl | |
| parent | Initial import (bug #367051). (diff) | |
| download | gentoo-2-acb9e9c1f0555684d3e853b9ae2ce1b93efb20c0.tar.gz gentoo-2-acb9e9c1f0555684d3e853b9ae2ce1b93efb20c0.tar.bz2 gentoo-2-acb9e9c1f0555684d3e853b9ae2ce1b93efb20c0.zip | |
Fix underlink. Bug #367485
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/ftgl')
| -rw-r--r-- | media-libs/ftgl/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch | 11 | ||||
| -rw-r--r-- | media-libs/ftgl/ftgl-2.1.3_rc5.ebuild | 18 |
3 files changed, 26 insertions, 11 deletions
diff --git a/media-libs/ftgl/ChangeLog b/media-libs/ftgl/ChangeLog index 4da23db1480f..d112fc3bd167 100644 --- a/media-libs/ftgl/ChangeLog +++ b/media-libs/ftgl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/ftgl -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ChangeLog,v 1.34 2010/10/10 15:47:54 armin76 Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ChangeLog,v 1.35 2011/05/20 09:24:18 tupone Exp $ + + 20 May 2011; Tupone Alfredo <tupone@gentoo.org> ftgl-2.1.3_rc5.ebuild, + +files/ftgl-2.1.3_rc5-underlink.patch: + Fix underlink. Bug #367485 by Diego Elio Pettenò 10 Oct 2010; Raúl Porcel <armin76@gentoo.org> ftgl-2.1.3_rc5.ebuild: arm/ia64/sh stable diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch new file mode 100644 index 000000000000..30bfba04c7d4 --- /dev/null +++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch @@ -0,0 +1,11 @@ +--- demo/Makefile.am.old 2011-05-20 11:13:18.822445466 +0200 ++++ demo/Makefile.am 2011-05-20 11:13:28.271042994 +0200 +@@ -17,7 +17,7 @@ + $(NULL) + c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS) + c_demo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) +-c_demo_LDADD = ../src/libftgl.la ++c_demo_LDADD = ../src/libftgl.la -lm + + FTGLDemo_SOURCES = \ + FTGLDemo.cpp \ diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild index 75e6c0c347be..8c1e6af5f126 100644 --- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild +++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild @@ -1,6 +1,7 @@ -# 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/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild,v 1.14 2010/10/10 15:47:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild,v 1.15 2011/05/20 09:24:18 tupone Exp $ +EAPI=2 inherit eutils flag-o-matic autotools @@ -25,17 +26,16 @@ DEPEND=">=media-libs/freetype-2.0.9 S=${WORKDIR}/${MY_P2} -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-gentoo.patch - AT_M4DIR=m4 eautoreconf +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch \ + "${FILESDIR}"/${P}-underlink.patch +# AT_M4DIR=m4 eautoreconf + eautoreconf } -src_compile() { +src_configure() { strip-flags # ftgl is sensitive - bug #112820 econf - emake || die "emake failed" } src_install() { |