diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-06-14 00:04:28 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-06-14 00:04:28 +0000 |
| commit | 6b8d32ddd706ec6dfa7c02d8529cf08c23533d80 (patch) | |
| tree | ee2043e744ff7a28f712678f59fd58ae2ebd96f1 /games-engines/frotz | |
| parent | slotmove app-laptop/kthinkbat (diff) | |
| download | historical-6b8d32ddd706ec6dfa7c02d8529cf08c23533d80.tar.gz historical-6b8d32ddd706ec6dfa7c02d8529cf08c23533d80.tar.bz2 historical-6b8d32ddd706ec6dfa7c02d8529cf08c23533d80.zip | |
Fix building with glibc-2.10, bug #273528
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'games-engines/frotz')
| -rw-r--r-- | games-engines/frotz/ChangeLog | 8 | ||||
| -rw-r--r-- | games-engines/frotz/Manifest | 11 | ||||
| -rw-r--r-- | games-engines/frotz/files/frotz-2.43-glibc2.10.patch | 29 | ||||
| -rw-r--r-- | games-engines/frotz/frotz-2.43.ebuild | 5 |
4 files changed, 44 insertions, 9 deletions
diff --git a/games-engines/frotz/ChangeLog b/games-engines/frotz/ChangeLog index 623bd4deb1f4..617099ce1997 100644 --- a/games-engines/frotz/ChangeLog +++ b/games-engines/frotz/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/frotz -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/frotz/ChangeLog,v 1.14 2009/01/30 06:49:50 mr_bones_ Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-engines/frotz/ChangeLog,v 1.15 2009/06/14 00:04:28 nyhm Exp $ + + 14 Jun 2009; Tristan Heaven <nyhm@gentoo.org> frotz-2.43.ebuild, + +files/frotz-2.43-glibc2.10.patch: + Fix building with glibc-2.10, bug #273528 30 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> frotz-2.43.ebuild: EAPI=2; respect CC diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest index eac33d4c892c..20c629d4fab2 100644 --- a/games-engines/frotz/Manifest +++ b/games-engines/frotz/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX frotz-2.43-glibc2.10.patch 855 RMD160 9b1d398b78d926e8dee2ff73c5a611f6853298e3 SHA1 ddc2c6858db12aab6abf81a283dc3ba0b48c7abc SHA256 231cb68ed8002d195bb1913e87509dcf1bb6373b02810af95ca5737493732124 DIST frotz-2.43.tar.gz 160771 RMD160 ccfc303e116e517caff0fec8f3bd555dfc02ae4e SHA1 2b2684ec670b471489c15be732c7dd1c59821b00 SHA256 f831eae9182e4a1407a34cb1098a4f5ad5ad6c6632e34eed734b9601a06a764b -EBUILD frotz-2.43.ebuild 1241 RMD160 2af04521e0e4e8b03687af295ffde0377b03b57c SHA1 5276721c008fa978975bbb9833c0144f8dd819e9 SHA256 1102a4446bc5674f9a7c8022519e9fcd08158d0a20a29ab2c8e4da85b2132ea0 -MISC ChangeLog 2048 RMD160 3314345e031978914d07df4d23e7c3703866bce9 SHA1 874a934a357031c6b51b44dd9042acb0cbe0805e SHA256 572fbef9c32ae73acc2abe14d70cf3549e7a77b316007bfbd5da6bf2c11acd4b +EBUILD frotz-2.43.ebuild 1286 RMD160 246cdc63dda804a5b01acd924ceda7328c64b0d4 SHA1 1c6b5f683bb649085340ff8268bf19aaa509e1e5 SHA256 e128964f9ee811c1fb7d16de6fa30c4ce1404cd48885e446751a92f65cfe52f7 +MISC ChangeLog 2192 RMD160 a993fe95678a1b99e88874ff96364c3a5131283c SHA1 790310f184f4199a829167e4c55261b74a2a2fb1 SHA256 f6df0e6d5b74d3c13edbc76bfe69c512e63cbe48720145bb92c3036fd6d2a3b5 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkoz+X8ACgkQdz7hIScOURFY5QCgvXTOlB5CXVxCpT8+i/BP5CyJ -32cAnRyDa2K3fHqeJRK3kHx/R296L2kf -=dtaH +iEYEARECAAYFAko0PpEACgkQdz7hIScOURFzcwCfSBvk5czuiuhNmE+c2JNPqO/a +xIYAoL9tktBU1KGazu1yjUvtzaaGv/Cb +=LVDP -----END PGP SIGNATURE----- diff --git a/games-engines/frotz/files/frotz-2.43-glibc2.10.patch b/games-engines/frotz/files/frotz-2.43-glibc2.10.patch new file mode 100644 index 000000000000..71760cc8fa46 --- /dev/null +++ b/games-engines/frotz/files/frotz-2.43-glibc2.10.patch @@ -0,0 +1,29 @@ +--- src/dumb/dumb_input.c ++++ src/dumb/dumb_input.c +@@ -79,7 +79,7 @@ + /* Read one line, including the newline, into s. Safely avoids buffer + * overruns (but that's kind of pointless because there are several + * other places where I'm not so careful). */ +-static void getline(char *s) ++static void get_line(char *s) + { + int c; + char *p = s; +@@ -203,7 +203,7 @@ + fputs(prompt, stdout); + else + dumb_show_prompt(show_cursor, (timeout ? "tTD" : ")>}")[type]); +- getline(s); ++ get_line(s); + if ((s[0] != '\\') || ((s[1] != '\0') && !islower(s[1]))) { + /* Is not a command line. */ + translate_special_chars(s); +@@ -265,7 +265,7 @@ + if (!*current_page) + break; + printf("HELP: Type <return> for more, or q <return> to stop: "); +- getline(s); ++ get_line(s); + if (!strcmp(s, "q\n")) + break; + } diff --git a/games-engines/frotz/frotz-2.43.ebuild b/games-engines/frotz/frotz-2.43.ebuild index 995a740609ef..033bd73f94fd 100644 --- a/games-engines/frotz/frotz-2.43.ebuild +++ b/games-engines/frotz/frotz-2.43.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/frotz/frotz-2.43.ebuild,v 1.16 2009/01/30 06:49:50 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/frotz/frotz-2.43.ebuild,v 1.17 2009/06/14 00:04:27 nyhm Exp $ EAPI=2 -inherit games +inherit eutils games DESCRIPTION="Curses based interpreter for Z-code based text games" HOMEPAGE="http://www.cs.csubak.edu/~dgriffi/proj/frotz/" @@ -22,6 +22,7 @@ src_prepare() { -e '/^CC /d' \ Makefile \ || die 'sed failed' + epatch "${FILESDIR}"/${P}-glibc2.10.patch } src_compile() { |