diff options
| author |   Santiago M. Mola <coldwind@gentoo.org> | 2007-08-13 19:14:10 +0000 |
|---|---|---|
| committer | Santiago M. Mola <coldwind@gentoo.org> | 2007-08-13 19:14:10 +0000 |
| commit | 74e1efbfe992a3defffae2a002570606aa4a2ead (patch) | |
| tree | 7291095fac0d1cc4b540bfe0cc9ea4ca77a87e4b /games-arcade/bub-n-bros | |
| parent | Add CCPL-Attribution-3.0 license and fix inherit order. (diff) | |
| download | gentoo-2-74e1efbfe992a3defffae2a002570606aa4a2ead.tar.gz gentoo-2-74e1efbfe992a3defffae2a002570606aa4a2ead.tar.bz2 gentoo-2-74e1efbfe992a3defffae2a002570606aa4a2ead.zip | |
Fixed compilation w/ python-2.5 wrt bug #185819, thanks to Luis Medinas.
(Portage version: 2.1.2.11)
Diffstat (limited to 'games-arcade/bub-n-bros')
| -rw-r--r-- | games-arcade/bub-n-bros/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild | 3 | ||||
| -rw-r--r-- | games-arcade/bub-n-bros/files/bub-n-bros-1.5-python25.patch | 32 |
3 files changed, 39 insertions, 2 deletions
diff --git a/games-arcade/bub-n-bros/ChangeLog b/games-arcade/bub-n-bros/ChangeLog index a0b23577ad5d..09ce60dff344 100644 --- a/games-arcade/bub-n-bros/ChangeLog +++ b/games-arcade/bub-n-bros/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/bub-n-bros # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.13 2007/06/08 11:54:03 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.14 2007/08/13 19:14:10 coldwind Exp $ + + 13 Aug 2007; Santiago M. Mola <coldwind@gentoo.org> + +files/bub-n-bros-1.5-python25.patch, bub-n-bros-1.5.ebuild: + Fixed compilation w/ python-2.5 wrt bug #185819, thanks to Luis Medinas. *bub-n-bros-1.5 (08 Jun 2007) diff --git a/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild b/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild index 7d114a2b543e..7b2f2b5010e2 100644 --- a/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild +++ b/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild,v 1.1 2007/06/08 01:02:10 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.5.ebuild,v 1.2 2007/08/13 19:14:10 coldwind Exp $ inherit eutils games @@ -23,6 +23,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-home.patch + epatch "${FILESDIR}"/${P}-python25.patch } src_compile() { diff --git a/games-arcade/bub-n-bros/files/bub-n-bros-1.5-python25.patch b/games-arcade/bub-n-bros/files/bub-n-bros-1.5-python25.patch new file mode 100644 index 000000000000..447d51527cdc --- /dev/null +++ b/games-arcade/bub-n-bros/files/bub-n-bros-1.5-python25.patch @@ -0,0 +1,32 @@ +diff -ur bubbros-1.5.orig/bubbob/statesaver.c bubbros-1.5/bubbob/statesaver.c +--- bubbros-1.5.orig/bubbob/statesaver.c 2007-08-13 18:08:58.000000000 +0200 ++++ bubbros-1.5/bubbob/statesaver.c 2007-08-13 18:09:32.000000000 +0200 +@@ -44,7 +44,7 @@ + Py_INCREF(g); /* exhausted -- can return 'g' itself */ + return g; + } +- if (f->f_nfreevars || f->f_ncells) { ++ if (PySequence_Length(co->co_freevars) || PySequence_Length(co->co_cellvars)) { + PyErr_SetString(PyExc_ValueError, "generator has cell or free vars"); + return NULL; + } +@@ -67,6 +67,8 @@ + PyFrameObject* f; + PyFrameObject* f2; + PyCodeObject* co; ++ PyCodeObject* code; ++ PyCodeObject* code2; + int i, res; + + if (g != g2) +@@ -94,8 +96,8 @@ + PyErr_SetString(PyExc_TypeError, "returned gi_frame"); + return -1; + } +- f2 = (PyFrameObject*) x; +- if (f2->f_stacksize != f->f_stacksize) { ++ code2 = (PyFrameObject*) x; ++ if (code2->co_stacksize != code->co_stacksize) { + PyErr_SetString(PyExc_TypeError, "stack size mismatch"); + return -1; + } |