diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2009-06-13 17:43:48 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2009-06-13 17:43:48 +0000 |
| commit | d486a777439effb5ccf59144a18ad61e34d64bf7 (patch) | |
| tree | 149b34ba34f115f61b96ff07be2441607a0445f3 /games-puzzle/krystaldrop | |
| parent | Fix LICENSE as it has been Apache-2.0 for quite a while now. (diff) | |
| download | gentoo-2-d486a777439effb5ccf59144a18ad61e34d64bf7.tar.gz gentoo-2-d486a777439effb5ccf59144a18ad61e34d64bf7.tar.bz2 gentoo-2-d486a777439effb5ccf59144a18ad61e34d64bf7.zip | |
Fix building with glibc-2.10, bug #273412
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'games-puzzle/krystaldrop')
| -rw-r--r-- | games-puzzle/krystaldrop/ChangeLog | 8 | ||||
| -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 |
3 files changed, 28 insertions, 11 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/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() { |