diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2009-06-13 16:42:10 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2009-06-13 16:42:10 +0000 |
| commit | c17bb18ab02b8b2d7c1ab711e947bda5c73983d9 (patch) | |
| tree | 65204e44a557291eca65d49bf24ffabeccd8372d | |
| parent | Update mask for rubinius to point out removal pending. (diff) | |
| download | gentoo-2-c17bb18ab02b8b2d7c1ab711e947bda5c73983d9.tar.gz gentoo-2-c17bb18ab02b8b2d7c1ab711e947bda5c73983d9.tar.bz2 gentoo-2-c17bb18ab02b8b2d7c1ab711e947bda5c73983d9.zip | |
Fix building with glibc-2.10, bug #273398
(Portage version: 2.2_rc33/cvs/Linux i686)
| -rw-r--r-- | games-engines/freesci/ChangeLog | 8 | ||||
| -rw-r--r-- | games-engines/freesci/files/freesci-0.6.4-glibc2.10.patch | 42 | ||||
| -rw-r--r-- | games-engines/freesci/freesci-0.6.4.ebuild | 3 |
3 files changed, 50 insertions, 3 deletions
diff --git a/games-engines/freesci/ChangeLog b/games-engines/freesci/ChangeLog index 5a2bbb885489..72f551b148d9 100644 --- a/games-engines/freesci/ChangeLog +++ b/games-engines/freesci/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/freesci -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/ChangeLog,v 1.22 2009/02/22 16:30:07 armin76 Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/ChangeLog,v 1.23 2009/06/13 16:42:09 nyhm Exp $ + + 13 Jun 2009; Tristan Heaven <nyhm@gentoo.org> freesci-0.6.4.ebuild, + +files/freesci-0.6.4-glibc2.10.patch: + Fix building with glibc-2.10, bug #273398 22 Feb 2009; Raúl Porcel <armin76@gentoo.org> freesci-0.6.4.ebuild: x86 stable wrt #255555 diff --git a/games-engines/freesci/files/freesci-0.6.4-glibc2.10.patch b/games-engines/freesci/files/freesci-0.6.4-glibc2.10.patch new file mode 100644 index 000000000000..f0ddba8d2791 --- /dev/null +++ b/games-engines/freesci/files/freesci-0.6.4-glibc2.10.patch @@ -0,0 +1,42 @@ +--- src/tools/bdfgname.c ++++ src/tools/bdfgname.c +@@ -47,9 +47,9 @@ + + static int + #ifdef __STDC__ +-getline(FILE *in, char *buf, int limit) ++get_line(FILE *in, char *buf, int limit) + #else +-getline(in, buf, limit) ++get_line(in, buf, limit) + FILE *in; + char *buf; + int limit; +@@ -99,11 +99,11 @@ + + while (!feof(in)) { + pos = ftell(in); +- (void) getline(in, buf, 256); ++ (void) get_line(in, buf, 256); + while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) { + buf[0] = 0; + pos = ftell(in); +- (void) getline(in, buf, 256); ++ (void) get_line(in, buf, 256); + } + + if (buf[0] == 0) +@@ -170,11 +170,11 @@ + + while (!feof(in)) { + pos = ftell(in); +- (void) getline(in, buf, 256); ++ (void) get_line(in, buf, 256); + while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) { + buf[0] = 0; + pos = ftell(in); +- (void) getline(in, buf, 256); ++ (void) get_line(in, buf, 256); + } + + c = _bdf_atol(buf, 0, 16); diff --git a/games-engines/freesci/freesci-0.6.4.ebuild b/games-engines/freesci/freesci-0.6.4.ebuild index 03dd4149dbd1..0b9e9ac3b1df 100644 --- a/games-engines/freesci/freesci-0.6.4.ebuild +++ b/games-engines/freesci/freesci-0.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/freesci-0.6.4.ebuild,v 1.3 2009/02/22 16:30:07 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/freesci-0.6.4.ebuild,v 1.4 2009/06/13 16:42:09 nyhm Exp $ EAPI=2 inherit eutils games @@ -28,6 +28,7 @@ src_prepare() { -e "/^SUBDIRS =/s:desktop src conf debian:src:" \ Makefile.in \ || die "sed failed" + epatch "${FILESDIR}"/${P}-glibc2.10.patch } src_configure() { |