| 1 |
mr_bones_ 07/09/09 05:59:15 |
| 2 |
|
| 3 |
Added: bub-n-bros-1.6-home.patch |
| 4 |
bub-n-bros-1.6-python25.patch digest-bub-n-bros-1.6 |
| 5 |
Log: |
| 6 |
version bump (bug #191714) with patch update from Tomasz Mon |
| 7 |
(Portage version: 2.1.2.12) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-arcade/bub-n-bros/files/bub-n-bros-1.6-home.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/bub-n-bros/files/bub-n-bros-1.6-home.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/bub-n-bros/files/bub-n-bros-1.6-home.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: bub-n-bros-1.6-home.patch |
| 16 |
=================================================================== |
| 17 |
--- bubbob/images.py 2007-09-08 17:03:41.000000000 +0200 |
| 18 |
+++ bubbob/images.py 2007-09-08 17:57:45.000000000 +0200 |
| 19 |
@@ -454,7 +454,6 @@ |
| 20 |
# check and maybe regenerate the colored image files |
| 21 |
file = os.path.join('images', 'buildcolors.py') |
| 22 |
g = {'__name__': '__auto__', '__file__': file} |
| 23 |
- execfile(file, g) |
| 24 |
# replace the entries 'filename_%d.ppm' by a family of entries, |
| 25 |
# one for each color |
| 26 |
sprmap = {} |
| 27 |
--- display/pclient.py 2007-09-08 17:03:41.000000000 +0200 |
| 28 |
+++ display/pclient.py 2007-09-08 17:57:45.000000000 +0200 |
| 29 |
@@ -162,8 +162,8 @@ |
| 30 |
if mode[-1].has_key('cfgfile'): |
| 31 |
self.trackcfgfile = mode[-1]['cfgfile'] |
| 32 |
else: |
| 33 |
- self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR, |
| 34 |
- 'http2', 'config.txt') |
| 35 |
+ self.trackcfgfile = os.path.join(os.environ.get('HOME'), |
| 36 |
+ '.bubnbros') |
| 37 |
self.udpsock = None |
| 38 |
self.udpsock_low = None |
| 39 |
self.udpsock2 = None |
| 40 |
--- http2/httppages.py 2007-09-08 17:03:41.000000000 +0200 |
| 41 |
+++ http2/httppages.py 2007-09-08 17:57:45.000000000 +0200 |
| 42 |
@@ -38,7 +38,7 @@ |
| 43 |
|
| 44 |
|
| 45 |
class PageServer: |
| 46 |
- CONFIGFILE = 'config.txt' |
| 47 |
+ CONFIGFILE = '.bubnbros' |
| 48 |
localservers = None |
| 49 |
|
| 50 |
def __init__(self, Game): |
| 51 |
@@ -46,7 +46,7 @@ |
| 52 |
self.seed = hex(random.randrange(0x1000, 0x10000)) |
| 53 |
#self.unique_actions = {} |
| 54 |
self.localhost = gamesrv.HOSTNAME |
| 55 |
- self.filename = os.path.join(LOCALDIR, self.CONFIGFILE) |
| 56 |
+ self.filename = os.path.join(os.environ.get('HOME'), self.CONFIGFILE) |
| 57 |
data = self.loadoptionfile() |
| 58 |
self.globaloptions = Options(data.get('*', {})) |
| 59 |
self.localoptions = Options(data.get(self.localhost, {})) |
| 60 |
@@ -333,7 +333,6 @@ |
| 61 |
'buildcolors.py') |
| 62 |
if os.path.exists(file): |
| 63 |
g = {'__name__': '__auto__', '__file__': file} |
| 64 |
- execfile(file, g) |
| 65 |
|
| 66 |
if port: |
| 67 |
address = '%s:%s' % (host, port) |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.1 games-arcade/bub-n-bros/files/bub-n-bros-1.6-python25.patch |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/bub-n-bros/files/bub-n-bros-1.6-python25.patch?rev=1.1&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/bub-n-bros/files/bub-n-bros-1.6-python25.patch?rev=1.1&content-type=text/plain |
| 75 |
|
| 76 |
Index: bub-n-bros-1.6-python25.patch |
| 77 |
=================================================================== |
| 78 |
diff -ur bubbros-1.5.orig/bubbob/statesaver.c bubbros-1.5/bubbob/statesaver.c |
| 79 |
--- bubbros-1.5.orig/bubbob/statesaver.c 2007-09-08 17:43:14.000000000 +0200 |
| 80 |
+++ bubbros-1.5/bubbob/statesaver.c 2007-09-08 17:43:14.000000000 +0200 |
| 81 |
@@ -75,7 +75,7 @@ |
| 82 |
Py_INCREF(g); /* exhausted -- can return 'g' itself */ |
| 83 |
return g; |
| 84 |
} |
| 85 |
- if (f->f_nfreevars || f->f_ncells) { |
| 86 |
+ if (PySequence_Length(co->co_freevars) || PySequence_Length(co->co_cellvars)) { |
| 87 |
PyErr_SetString(PyExc_ValueError, "generator has cell or free vars"); |
| 88 |
goto error; |
| 89 |
} |
| 90 |
@@ -112,6 +112,8 @@ |
| 91 |
PyFrameObject* f = NULL; |
| 92 |
PyFrameObject* f2 = NULL; |
| 93 |
PyCodeObject* co; |
| 94 |
+ PyCodeObject* code; |
| 95 |
+ PyCodeObject* code2; |
| 96 |
int i, res; |
| 97 |
|
| 98 |
if (g != g2) |
| 99 |
@@ -141,9 +143,9 @@ |
| 100 |
Py_DECREF(x); |
| 101 |
goto error; |
| 102 |
} |
| 103 |
- f2 = (PyFrameObject*) x; |
| 104 |
|
| 105 |
- if (f2->f_stacksize != f->f_stacksize) { |
| 106 |
+ code2 = (PyFrameObject*) x; |
| 107 |
+ if (code2->co_stacksize != code->co_stacksize) { |
| 108 |
PyErr_SetString(PyExc_TypeError, "stack size mismatch"); |
| 109 |
goto error; |
| 110 |
} |
| 111 |
|
| 112 |
|
| 113 |
|
| 114 |
1.1 games-arcade/bub-n-bros/files/digest-bub-n-bros-1.6 |
| 115 |
|
| 116 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/bub-n-bros/files/digest-bub-n-bros-1.6?rev=1.1&view=markup |
| 117 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/bub-n-bros/files/digest-bub-n-bros-1.6?rev=1.1&content-type=text/plain |
| 118 |
|
| 119 |
Index: digest-bub-n-bros-1.6 |
| 120 |
=================================================================== |
| 121 |
MD5 00aa5e26f5f0ed4c10765e4b33b28a09 bubbros-1.6.tar.bz2 9052959 |
| 122 |
RMD160 f4da90058650f07f4c50d33dd9b42be336c660df bubbros-1.6.tar.bz2 9052959 |
| 123 |
SHA256 dd197e60a23e09800010f3a5906feb77847e6eeaa7cfd47d803a85daa0bcf255 bubbros-1.6.tar.bz2 9052959 |
| 124 |
|
| 125 |
|
| 126 |
|
| 127 |
-- |
| 128 |
gentoo-commits@g.o mailing list |
Archives