Bug#581940: gorm.app: FTBFS with gnustep-base/1.20.0: GormFunctions.m:354: error: ‘GSMethodList’ undeclared (first use in this function)

[Yavor Doganov]

tags 581940 + patch
thanks

Hi Gürkan,

Here is a minimal upstream patch that applies against 1.2.10.

2010-03-05  Richard Frith-Macdonald  <r...@gnu.org>

	* GormCore/GormFunctions.m: update for latest base library.

=== modified file 'GormCore/GormFunctions.m'
--- GormCore/GormFunctions.m	2010-02-13 00:59:10 +0000
+++ GormCore/GormFunctions.m	2010-03-05 10:52:41 +0000
@@ -349,59 +349,11 @@
  */
 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 *_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);
 }