Commit 73664a3a authored by Gürkan Myczko's avatar Gürkan Myczko Committed by Eric Heintzmann

Import Debian patch 1.2.10-2

parent 19576139
......@@ -349,59 +349,11 @@ NSString *formatOutlet(NSString *outlet)
*/
NSArray *_GSObjCMethodNamesForClass(Class class, BOOL collect)
{
NSMutableSet *set;
NSArray *array;
GSMethodList methods;
if (class == nil)
{
return nil;
}
/*
* Add names to a set so methods declared in superclasses
* and then overridden do not appear more than once.
*/
set = [[NSMutableSet alloc] initWithCapacity: 32];
while (class != nil)
{
void *iterator = 0;
while ((methods = class_nextMethodList(class, &iterator)))
{
int i;
for (i = 0; i < methods->method_count; i++)
{
GSMethod method = &methods->method_list[i];
if (method->method_name != 0)
{
NSString *name;
const char *cName;
cName = GSNameFromSelector(method->method_name);
name = [[NSString alloc] initWithUTF8String: cName];
[set addObject: name];
RELEASE(name);
}
}
}
// if we should collect all of the superclass methods, then iterate
// up the chain.
if(collect)
{
class = class->super_class;
}
else
{
class = nil;
}
}
array = [set allObjects];
RELEASE(set);
return array;
return GSObjCMethodNames((id)&class, collect);
}
/**
......@@ -412,40 +364,11 @@ NSArray *_GSObjCMethodNamesForClass(Class class, BOOL collect)
*/
NSArray *_GSObjCVariableNames(Class class, BOOL collect)
{
NSMutableArray *array;
struct objc_ivar_list *ivars;
array = [NSMutableArray arrayWithCapacity: 16];
while (class != nil)
if (class == nil)
{
ivars = class->ivars;
if (ivars != 0)
{
int i;
for (i = 0; i < ivars->ivar_count; i++)
{
NSString *name;
name = [[NSString alloc] initWithUTF8String:
ivars->ivar_list[i].ivar_name];
[array addObject: name];
RELEASE(name);
}
}
// if we should collect all of the superclass methods, then iterate
// up the chain.
if(collect)
{
class = class->super_class;
}
else
{
class = nil;
}
return nil;
}
return array;
return GSObjCVariableNames((id)&class, collect);
}
......
gorm.app (1.2.10-2) unstable; urgency=low
* Bump standards version to 3.9.1.
* Apply patch to fix FTBFS, thanks to Yavor Doganov. (Closes: #581940)
* debian/copyright: Update copyright years.
-- Gürkan Sengün <gurkan@phys.ethz.ch> Fri, 13 Aug 2010 21:44:25 +0000
gorm.app (1.2.10-1) unstable; urgency=low
* New upstream version.
......
......@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Gürkan Sengün <gurkan@phys.ethz.ch>
Uploaders: Debian GNUstep maintainers <pkg-gnustep-maintainers@lists.alioth.debian.org>
Build-Depends: debhelper (>= 7), libgnustep-gui-dev, texlive-latex-base, texi2html, texinfo
Standards-Version: 3.8.3
Standards-Version: 3.9.1
Homepage: http://www.gnustep.org/experience/Gorm.html
Package: gorm.app
......
......@@ -16,7 +16,7 @@ Upstream Authors:
Copyright:
Copyright 1999-2008 Free Software Foundation, Inc.
Copyright 1999-2010 Free Software Foundation, Inc.
License:
......
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