Commit e6d4e369 authored by Helvetix Victorinox's avatar Helvetix Victorinox
Browse files

Applied patch from starox-gimp@starox.org (Frederic Leroy) which fixed the

* app/composite/make-installer.py:Applied patch from
starox-gimp@starox.org (Frederic Leroy) which fixed the parser of
the nm programme output to understand the output on 64bit
machines.  Fixes bug #168529

* app/composite/ns.py:
Applied patch from starox-gimp@starox.org (Frederic Leroy) which
fixed a bug that would appear when only one compositing function
was implemented.  Fixes bug #168529

										Regenerated app/composite function tables.
parent 911d267d
2005-03-03 Helvetix Victorinox <helvetix@gimp.org>
* app/composite/make-installer.py:Applied patch from
starox-gimp@starox.org (Frederic Leroy) which fixed the parser of
the nm programme output to understand the output on 64bit
machines. Fixes bug #168529
* app/composite/ns.py:
Applied patch from starox-gimp@starox.org (Frederic Leroy) which
fixed a bug that would appear when only one compositing function
was implemented. Fixes bug #168529
Regenerated app/composite function tables.
2005-03-03 Sven Neumann <sven@gimp.org> 2005-03-03 Sven Neumann <sven@gimp.org>
* plug-ins/common/gifload.c (ReadImage): added a sanity check for * plug-ins/common/gifload.c (ReadImage): added a sanity check for
......
...@@ -415,7 +415,7 @@ def gimp_composite_installer_install2(fpout, name, function_table, requirements= ...@@ -415,7 +415,7 @@ def gimp_composite_installer_install2(fpout, name, function_table, requirements=
print >>fpout, '%s_install (void)' % (functionnameify(name)) print >>fpout, '%s_install (void)' % (functionnameify(name))
print >>fpout, '{' print >>fpout, '{'
if len(function_table) > 1: if len(function_table) >= 1:
print >>fpout, ' static struct install_table *t = _%s;' % (functionnameify(name)) print >>fpout, ' static struct install_table *t = _%s;' % (functionnameify(name))
print >>fpout, '' print >>fpout, ''
print >>fpout, ' if (%s_init ())' % functionnameify(name) print >>fpout, ' if (%s_init ())' % functionnameify(name)
......
...@@ -49,13 +49,18 @@ class nmx: ...@@ -49,13 +49,18 @@ class nmx:
return (None) return (None)
def split_(self, line):
tmp=string.split(line)[0:2]
tmp.reverse()
return tmp
def update(self, objfile): def update(self, objfile):
self.filename = objfile self.filename = objfile
(sysname, nodename, release, version, machine) = os.uname() (sysname, nodename, release, version, machine) = os.uname()
if sysname == "Linux": if sysname == "Linux":
fp = os.popen("nm -B " + objfile, "r") fp = os.popen("nm -P " + objfile, "r")
symbols = map(lambda l: string.split(l[8:]), fp.readlines()) symbols = map(self.split_, fp.readlines())
elif sysname == "SunOS": elif sysname == "SunOS":
fp = os.popen("nm -p " + objfile, "r") fp = os.popen("nm -p " + objfile, "r")
symbols = map(lambda l: string.split(l[12:]), fp.readlines()) symbols = map(lambda l: string.split(l[12:]), fp.readlines())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment