diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-06-13 17:15:44 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-06-13 17:15:44 +0000 |
| commit | 784d133804ad487dae4c5da32a4e92bdb4a897a7 (patch) | |
| tree | 625553e09fe7fee07a5d042e377e1839e1953db3 /games-arcade/openbubbles | |
| parent | Fix building with glibc-2.10, bug #273402 (diff) | |
| download | historical-784d133804ad487dae4c5da32a4e92bdb4a897a7.tar.gz historical-784d133804ad487dae4c5da32a4e92bdb4a897a7.tar.bz2 historical-784d133804ad487dae4c5da32a4e92bdb4a897a7.zip | |
Fix building with glibc-2.10, bug #273409
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'games-arcade/openbubbles')
| -rw-r--r-- | games-arcade/openbubbles/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/openbubbles/Manifest | 15 | ||||
| -rw-r--r-- | games-arcade/openbubbles/files/openbubbles-1.2-glibc2.10.patch | 20 | ||||
| -rw-r--r-- | games-arcade/openbubbles/openbubbles-1.2.ebuild | 7 |
4 files changed, 44 insertions, 6 deletions
diff --git a/games-arcade/openbubbles/ChangeLog b/games-arcade/openbubbles/ChangeLog index fa514ae9a37c..7bd8fcdb146e 100644 --- a/games-arcade/openbubbles/ChangeLog +++ b/games-arcade/openbubbles/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/openbubbles -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/openbubbles/ChangeLog,v 1.7 2008/09/16 22:43:52 jer Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/openbubbles/ChangeLog,v 1.8 2009/06/13 17:15:44 nyhm Exp $ + + 13 Jun 2009; Tristan Heaven <nyhm@gentoo.org> openbubbles-1.2.ebuild, + +files/openbubbles-1.2-glibc2.10.patch: + Fix building with glibc-2.10, bug #273409 16 Sep 2008; Jeroen Roovers <jer@gentoo.org> openbubbles-1.2.ebuild: Marked ~hppa too. diff --git a/games-arcade/openbubbles/Manifest b/games-arcade/openbubbles/Manifest index f2ec82c164e0..88f3681d00cd 100644 --- a/games-arcade/openbubbles/Manifest +++ b/games-arcade/openbubbles/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX openbubbles-1.2-glibc2.10.patch 682 RMD160 d0adc9f63cbfe5a7d1c8f4d14a10df5ed3fc90cb SHA1 8df9c7bf7930615f08786d664860716414027927 SHA256 c97be0247f097578070e2ad29820418c14c7c8ad45ac68cd58a40744b585dc2e DIST openbubbles-1.2.tar.bz2 1090220 RMD160 75fb1a8bc81f11cd882d6b79ab3fb7d6384dcd6b SHA1 4b15c04b09c1ef353f2fbfc18b0eab1550c1f643 SHA256 7d5d4633a4881559f475b0b9e3778d593f856dd1dbf0acf979b79852f8d63dbb -EBUILD openbubbles-1.2.ebuild 781 RMD160 531a13396e6f4c4198b3a150ebaa85870945bc5e SHA1 2da33e3dedcd086c36c9fd21878fe15ce2fd3e52 SHA256 cf98ac2741f5ad12bdcc521221bce3d6f2c490e266a35ecba35be827f8c298aa -MISC ChangeLog 934 RMD160 de9dbe5763ae73ef11905a199350128ed185b47b SHA1 08dfafbff55f8b22d2ee5d44ff3f2e0d92d9aae6 SHA256 fc9e16ea6fef9bb1c8800d838bac01f3d037703f18327c329d91596f4581602d +EBUILD openbubbles-1.2.ebuild 837 RMD160 73761bc4e5ce17e2763e3de16dcf063b4ff9b5b4 SHA1 60c17a767481e235886eee3209c61be038c54f53 SHA256 1fa2a0a65216a71de986212a71b72590436f8154dabf6828ad63b213be79028f +MISC ChangeLog 1094 RMD160 c9682026941ecece7ba1892756d3b57922701628 SHA1 ed87b017203aae80d21439e2c7d852cc5aeb7bbb SHA256 f3448127179cb2d05c843b4404a4460911bf00011ff312fac8f176785e8ad073 MISC metadata.xml 1102 RMD160 496565b037368d998c1027d5e08713cec251db51 SHA1 0226800950c7676e40c9652845b280c4f7549a46 SHA256 6279b49b267d4bdb6d35769dcec4aa69d30216381200824053989aadd1f04a25 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkoz3sYACgkQdz7hIScOURE+1ACfaLPwHZuCylhBZpdcTstsZxjs +IK4AoNj7oPtdx8x/OfMjJ65e2Wh5yOeN +=nco6 +-----END PGP SIGNATURE----- diff --git a/games-arcade/openbubbles/files/openbubbles-1.2-glibc2.10.patch b/games-arcade/openbubbles/files/openbubbles-1.2-glibc2.10.patch new file mode 100644 index 000000000000..d511734da28f --- /dev/null +++ b/games-arcade/openbubbles/files/openbubbles-1.2-glibc2.10.patch @@ -0,0 +1,20 @@ +--- src/BFont.cpp ++++ src/BFont.cpp +@@ -319,7 +319,7 @@ + int i = 0;
+
+ /* Calculate the space occupied by the text without spaces */
+- while ((p=strchr(&text[pos+1],SPACE)) != NULL) {
++ while ((p=strchr((char *)&text[pos+1],SPACE)) != NULL) {
+ i++;
+ pos = p - text;
+ }
+@@ -359,7 +359,7 @@ + xpos=0;
+ pos = -1;
+ while ( spaces > 0 ) {
+- p = strstr(&text[pos+1]," ");
++ p = strstr((char *)&text[pos+1]," ");
+ strtmp = NULL;
+ strtmp = (char *) calloc ((p - &text[pos+1]) + 1,sizeof(char));
+ if (strtmp != NULL)
diff --git a/games-arcade/openbubbles/openbubbles-1.2.ebuild b/games-arcade/openbubbles/openbubbles-1.2.ebuild index 5c6b45265486..c384cfb33317 100644 --- a/games-arcade/openbubbles/openbubbles-1.2.ebuild +++ b/games-arcade/openbubbles/openbubbles-1.2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/openbubbles/openbubbles-1.2.ebuild,v 1.6 2008/09/16 22:43:52 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/openbubbles/openbubbles-1.2.ebuild,v 1.7 2009/06/13 17:15:44 nyhm Exp $ +EAPI=2 inherit eutils games DESCRIPTION="A clone of Evan Bailey's game Bubbles" @@ -17,6 +18,8 @@ DEPEND="media-libs/libsdl media-libs/sdl-image media-libs/sdl-gfx" +PATCHES=( "${FILESDIR}"/${P}-glibc2.10.patch ) + src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog NEWS README |