diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-06-14 00:30:36 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-06-14 00:30:36 +0000 |
| commit | a1d95224021972667e962295b60663089360987e (patch) | |
| tree | 50549f81e81636787773c55bbc90da1981f1fd05 /games-arcade | |
| parent | Moved Slot to 3.5 (diff) | |
| download | historical-a1d95224021972667e962295b60663089360987e.tar.gz historical-a1d95224021972667e962295b60663089360987e.tar.bz2 historical-a1d95224021972667e962295b60663089360987e.zip | |
Fix building with glibc-2.10, bug #273508
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/kobodeluxe/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/kobodeluxe/Manifest | 15 | ||||
| -rw-r--r-- | games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch | 11 | ||||
| -rw-r--r-- | games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild | 13 |
4 files changed, 40 insertions, 7 deletions
diff --git a/games-arcade/kobodeluxe/ChangeLog b/games-arcade/kobodeluxe/ChangeLog index 9dc4f17abd3c..69b6b0ecdeed 100644 --- a/games-arcade/kobodeluxe/ChangeLog +++ b/games-arcade/kobodeluxe/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/kobodeluxe -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/kobodeluxe/ChangeLog,v 1.29 2009/01/20 15:49:13 mr_bones_ Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/kobodeluxe/ChangeLog,v 1.30 2009/06/14 00:30:35 nyhm Exp $ + + 14 Jun 2009; Tristan Heaven <nyhm@gentoo.org> kobodeluxe-0.5.1.ebuild, + +files/kobodeluxe-0.5.1-glibc2.10.patch: + Fix building with glibc-2.10, bug #273508 20 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> kobodeluxe-0.5.1.ebuild: diff --git a/games-arcade/kobodeluxe/Manifest b/games-arcade/kobodeluxe/Manifest index caeb0c234462..d8242cf723a2 100644 --- a/games-arcade/kobodeluxe/Manifest +++ b/games-arcade/kobodeluxe/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX kobodeluxe-0.5.1-glibc2.10.patch 215 RMD160 01493fc8b96e1ab54b104db4f5a228133ef237f6 SHA1 9d1b3b8cef4a16b6a082fed9f93f1dc12b2a3be0 SHA256 5fc1d1e59e8a04b3f59a99a6f5f71672a117d23e205fd8df3d1a333c89b2b3cc AUX kobodeluxe-0.5.1-glibc29.patch 2400 RMD160 9721f811042563dcc5b059604de419fee02b1024 SHA1 274dc8e7909bc6f9fab31306c85d992af8b62674 SHA256 c4fbcc43024b20eae865a4cc5fc8bdfe043514e1c67ddbe41b26c4a79bdf7aab DIST KoboDeluxe-0.5.1.tar.bz2 1781752 RMD160 b196054f2220fe1b479a490723b1f5da4e74aa1f SHA1 bc49dbbae562baffd312444b373c7ebbf5e233c6 SHA256 0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c -EBUILD kobodeluxe-0.5.1.ebuild 1408 RMD160 bde53e78cbac4bf2d823e29688324ac421d7ea55 SHA1 a4690c0d3e9d748f1ee0c6f2da35d3e7f2428214 SHA256 dd0df184f7e54afdf3adf55e0bba469c715e0a1c62b19198880d29c6e17a9519 -MISC ChangeLog 4929 RMD160 81bc527449d91a162b3894d60b93300eef60d878 SHA1 faa43f9604acecee03bd2b3215e9bb4c621241af SHA256 b03994f2b971295d3e68e823f299821ebcf6598d1c20417c54754e509f431c93 +EBUILD kobodeluxe-0.5.1.ebuild 1456 RMD160 9145df0834f9477f229635b2ad7c69b27423fd53 SHA1 22ec2496643fb56056bf070c8029c0228f205323 SHA256 9c9935dbba451f7ae878d5b2b0477de68901cf2f14dc82ebcf2f441dd9221f71 +MISC ChangeLog 5085 RMD160 a61f07b9727ec04fcc8fe9a365573317a92cad3a SHA1 cac60bec16882122d9d35351e479b4a1ce837774 SHA256 e213d3aa8eaa76a99f5d89d000d496d576e7a15c204447daa968709e5afccd1c MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAko0RLIACgkQdz7hIScOURFcRgCfTeqcKVVgRzL2R51zCRaGEeIJ +K2sAn0CTpN1SygLOTLIOjB9HMXCWw6hi +=pRkD +-----END PGP SIGNATURE----- diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch new file mode 100644 index 000000000000..1095cc1c7330 --- /dev/null +++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch @@ -0,0 +1,11 @@ +--- graphics/window.cpp ++++ graphics/window.cpp +@@ -398,7 +398,7 @@ + */ + if(token) + { +- char *tok = strchr(txt, token); ++ const char *tok = strchr(txt, token); + if(tok) + tokpos = tok-txt; + else diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild index ddf7dd67991e..9a435502806e 100644 --- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild +++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1.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-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild,v 1.7 2009/01/20 15:49:13 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild,v 1.8 2009/06/14 00:30:35 nyhm Exp $ EAPI=2 inherit eutils games @@ -21,8 +21,16 @@ DEPEND="media-libs/libsdl S=${WORKDIR}/${MY_P} +src_unpack() { + unpack ${A} + cd "${S}" + unpack ./icons.tar.gz +} + src_prepare() { - epatch "${FILESDIR}"/${P}-glibc29.patch + epatch \ + "${FILESDIR}"/${P}-glibc29.patch \ + "${FILESDIR}"/${P}-glibc2.10.patch # Fix paths sed -i \ -e 's:\$(datadir)/kobo-deluxe:$(datadir)/kobodeluxe:' \ @@ -32,7 +40,6 @@ src_prepare() { -e 's:kobo-deluxe:kobodeluxe:' \ data/gfx/Makefile.in \ data/sfx/Makefile.in || die "sed data/Makefile.in failed" - tar xzvf icons.tar.gz || die "unpacking icons failed" } src_configure() { |