diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-06-13 17:43:48 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-06-13 17:43:48 +0000 |
| commit | 7ecb0607c929cf4b7b8e4a303f21b7e51155c560 (patch) | |
| tree | 9e883cc1b37e146610cc0bee132ec5fb093796f9 /games-puzzle | |
| parent | Fix LICENSE as it has been Apache-2.0 for quite a while now. (diff) | |
| download | historical-7ecb0607c929cf4b7b8e4a303f21b7e51155c560.tar.gz historical-7ecb0607c929cf4b7b8e4a303f21b7e51155c560.tar.bz2 historical-7ecb0607c929cf4b7b8e4a303f21b7e51155c560.zip | |
Fix building with glibc-2.10, bug #273412
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/krystaldrop/ChangeLog | 8 | ||||
| -rw-r--r-- | games-puzzle/krystaldrop/Manifest | 15 | ||||
| -rw-r--r-- | games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch | 11 | ||||
| -rw-r--r-- | games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild | 20 |
4 files changed, 41 insertions, 13 deletions
diff --git a/games-puzzle/krystaldrop/ChangeLog b/games-puzzle/krystaldrop/ChangeLog index 575280d8bf38..fca9f99848db 100644 --- a/games-puzzle/krystaldrop/ChangeLog +++ b/games-puzzle/krystaldrop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/krystaldrop -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.9 2009/02/10 10:29:56 tupone Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.10 2009/06/13 17:43:47 nyhm Exp $ + + 13 Jun 2009; Tristan Heaven <nyhm@gentoo.org> krystaldrop-0.7.2.ebuild, + +files/krystaldrop-0.7.2-glibc2.10.patch: + Fix building with glibc-2.10, bug #273412 10 Feb 2009; Alfredo Tupone <tupone@gentoo.org> +files/krystaldrop-0.7.2-as-needed.patch, krystaldrop-0.7.2.ebuild: diff --git a/games-puzzle/krystaldrop/Manifest b/games-puzzle/krystaldrop/Manifest index 78fbdbeb8ee9..a7f638ce30fd 100644 --- a/games-puzzle/krystaldrop/Manifest +++ b/games-puzzle/krystaldrop/Manifest @@ -1,10 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX krystaldrop-0.7.2-as-needed.patch 358 RMD160 5f0e7e767ecc3603cb6e89d15df2d66100e53037 SHA1 a9c45dd52ca6087d3c1a1d4767310c6b76b4e547 SHA256 354a40c47651832be46e28b7e939f7bbabe8e3ed91ee0f142571976cf0ab59bd AUX krystaldrop-0.7.2-deps.patch 1152 RMD160 48eac8807d977daddbc40a57eeec407950d10d13 SHA1 72d0ce25b1c1bfdca0ba7170f7a274a2162334cd SHA256 bc8121c186af89aa1116d0eed5b5743c91a691434965f4128b2e9ac4ade2ea84 AUX krystaldrop-0.7.2-gcc41.patch 2677 RMD160 552e9d91f6b78dd35c4f849261f8d31f9cf4ea25 SHA1 269b03d4504d96b0da604f355668e328b75b3463 SHA256 413d56f90d196ecfdc7ec3210b78ee54cd7348cf451e23c519ffcd2e3913a70a AUX krystaldrop-0.7.2-gcc43.patch 3396 RMD160 2f145173a2dd5d26dbb5d00c30529a048f21943f SHA1 b53a317e072f607c8cb3110189aee18f6f22df3b SHA256 37e14f887e34628d6675f060423c46cd54855f5623a4de0c8c9458fc841104cf +AUX krystaldrop-0.7.2-glibc2.10.patch 365 RMD160 8952e5fa75b4dca9b50d54d0579df18dd1d60991 SHA1 0376e3f77b37c848f7f74b55ec1018256058ff75 SHA256 3bfa2d948193f7807eeb404994a924bb7c5b29a12d518744b8de537e014386ea AUX krystaldrop-assert.patch 417 RMD160 3d1b1461baad3c9c0597fe967791a9e170d3e618 SHA1 4d4688eb5622c6d3d2c973dc98640ab49c18d5aa SHA256 ac4a526be3335f7aab6fd00f0af5a79556aedc66704277704a9bb41030983df2 DIST krystaldrop-0.7.2-art.tgz 17079147 RMD160 3a01c1375946f6d0b764ed3482ebb346ffe6480c SHA1 80d6ba755bb98f914fbc85ebdaa59b482e332e44 SHA256 7cd9dbd1ad12eb7e26e57e2a52b59e7137e20979d4fc8cb21a48faff983f6e27 DIST krystaldrop-0.7.2-src.tgz 162856 RMD160 d53bcfb904bf32948ccf47838df011f67435e45b SHA1 c87ba2773f2ef5fe97fa4bc2eb89d2324a27e2c6 SHA256 d0e42cf05f241e409649de6a48045c026c42417cdabd233c8fef8783096946e5 -EBUILD krystaldrop-0.7.2.ebuild 1666 RMD160 9d8b1d8db11dc6242ece02d291be3fcb65eb0982 SHA1 da3fcb99751862cd6cde30b5cfa324cf0804fe1b SHA256 4608788e1656c01e86d5f54ba02212fa1cfdb727d57fd32119df4def6b308099 -MISC ChangeLog 1547 RMD160 6c83a6920f210c256b1bfef15f57694dcffcbe8d SHA1 17bdf577d3d9f0ccac70da0806584c65f28f647a SHA256 419c2ea1b8076c2d4fc50f3751eb1f59de4924c254600ca5399ffbd79422297d +EBUILD krystaldrop-0.7.2.ebuild 1703 RMD160 fdacd2cdbfefa8fe3e4fb7d7abfd7d039b6916e7 SHA1 a785f647cc844e416cb1b632172282282f68150e SHA256 bc284599aace5d02918e058d6f2ea5d3bf8d7ad6686d12559ed30f86529046e4 +MISC ChangeLog 1709 RMD160 949be9cfd7e683cbbed14c597d72bf8d718306fd SHA1 8e357aef08df0b895f2a282edb6f114b6f90d390 SHA256 56866e9c48ddd7bb8cf2f363ced01d810fadefec16984dd11ecd81dceeaf535c MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkoz5VoACgkQdz7hIScOUREEOACgs+YXmqNJSCFbf27fQsFKGqPW +q5MAmwdU1Wak1qqplfkMwCPZzwrhzif+ +=d94V +-----END PGP SIGNATURE----- diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch new file mode 100644 index 000000000000..2e9ab8b76f66 --- /dev/null +++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch @@ -0,0 +1,11 @@ +--- Sources/KrystalDrop/Tools/direct.cpp ++++ Sources/KrystalDrop/Tools/direct.cpp +@@ -77,7 +77,7 @@ + assert (f); + assert (*f!= 0); + +- p= strrchr (f, ACC_FNSPLITCHAR); ++ p= strrchr ((char *)f, ACC_FNSPLITCHAR); + if (p!= NULL) + { if (*p== 0) return NULL; // this line should be useless, according to strrchr manpage + if (*(p+ 1)== 0) return NULL; diff --git a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild index 611ae3aaba24..f66c93acec0c 100644 --- a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild +++ b/games-puzzle/krystaldrop/krystaldrop-0.7.2.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-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.10 2009/02/10 10:29:56 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.11 2009/06/13 17:43:47 nyhm Exp $ EAPI=2 inherit eutils games @@ -26,22 +26,24 @@ S=${WORKDIR}/${PN} src_prepare() { mv ../art . - epatch "${FILESDIR}/krystaldrop-assert.patch" \ - "${FILESDIR}/${P}"-gcc41.patch \ - "${FILESDIR}/${P}"-gcc43.patch \ - "${FILESDIR}/${P}"-as-needed.patch \ - "${FILESDIR}/${P}"-deps.patch + epatch \ + "${FILESDIR}"/krystaldrop-assert.patch \ + "${FILESDIR}"/${P}-gcc41.patch \ + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-deps.patch \ + "${FILESDIR}"/${P}-glibc2.10.patch sed -i \ -e "/^EXEDIR:=/ s|$|/bin|" \ -e "/^INSTALL_PREFIX:=/ s|$|${D}|" Makefile \ - || die "sed Makefile failed" + || die "sed Makefile failed" # fix the high score location sed -i \ -e "s:BINDIR:\"${GAMES_STATEDIR}/${PN}\":" \ - Sources/KrystalDrop/Controller/HighScoresController.cpp \ - || die "sed HighScoresController.cpp failed" + Sources/KrystalDrop/Controller/HighScoresController.cpp \ + || die "sed HighScoresController.cpp failed" } src_install() { |