Bug#629202: gridlock.app: diff for NMU version 1.10-3.1

[Yavor Doganov]

tags 629202 + pending
thanks

Hi Gürkan,

I've prepared an NMU for gridlock.app (versioned as 1.10-3.1) and
will upload it to DELAYED/N where N depends on my sponsor.

diff -u gridlock.app-1.10/debian/control gridlock.app-1.10/debian/control
--- gridlock.app-1.10/debian/control
+++ gridlock.app-1.10/debian/control
@@ -1,7 +1,7 @@
 Source: gridlock.app
 Section: games
 Priority: optional
-Maintainer: Gürkan Sengün <gur...@linuks.mine.nu>
+Maintainer: Gürkan Sengün <gur...@phys.ethz.ch>
 Build-Depends: debhelper (>= 4), libgnustep-gui-dev (>= 0.12.0), gnustep-make
 Standards-Version: 3.7.2
 
diff -u gridlock.app-1.10/debian/changelog gridlock.app-1.10/debian/changelog
--- gridlock.app-1.10/debian/changelog
+++ gridlock.app-1.10/debian/changelog
@@ -1,3 +1,11 @@
+gridlock.app (1.10-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gnustep-gui/1.22 (Closes: #629202).
+  * debian/control (Maintainer): Fix Gürkan's email address.
+
+ -- Yavor Doganov <ya...@gnu.org>  Sat, 08 Oct 2011 14:18:16 +0300
+
 gridlock.app (1.10-3) unstable; urgency=low
 
   * GNUstep transition.
only in patch2:
unchanged:
--- gridlock.app-1.10.orig/EDObjcRuntime.h
+++ gridlock.app-1.10/EDObjcRuntime.h
@@ -44,16 +44,15 @@
 #else /* GNU_RUNTIME */
 
 
-#import <objc/objc.h>
-#import <objc/objc-api.h>
+#import <objc/runtime.h>
 
 #define EDObjcMsgSend(obj, sel) objc_msg_lookup((obj), (sel))((obj), (sel))
 #define EDObjcMsgSend1(obj, sel, obj1) objc_msg_lookup((obj), (sel))((obj), (sel), (obj1))
 #define EDObjcMsgSend2(obj, sel, obj1, obj2) objc_msg_lookup((obj), (sel))((obj), (sel), (obj1), (obj2))
 #define EDObjcMsgSend3(obj, sel, obj1, obj2, obj3) objc_msg_lookup((obj), (sel))((obj), (sel), (obj1), (obj2), (obj3))
-#define EDObjcMethodInfo Method_t
-#define EDObjcClassGetInstanceMethod class_get_instance_method
-#define EDObjcClassGetClassMethod class_get_class_method
+#define EDObjcMethodInfo Method
+#define EDObjcClassGetInstanceMethod class_getInstanceMethod
+#define EDObjcClassGetClassMethod class_getClassMethod
 
 #endif
 
only in patch2:
unchanged:
--- gridlock.app-1.10.orig/NSObject+Extensions.m
+++ gridlock.app-1.10/NSObject+Extensions.m
@@ -173,13 +173,16 @@
 #endif
 #else /* GNU_RUNTIME */
     NSMutableArray *subclasses;
-    Class subClass;
-    void *es = NULL;
+    Class *classes;
+    int i, numClasses;
 
     subclasses = [NSMutableArray array];
-    while((subClass = objc_next_class(&es)) != Nil)
-        if(EDClassIsSuperclassOfClass(aClass, subClass) == YES)
-            [subclasses addObject:subClass];
+    numClasses = objc_getClassList(NULL, 0);
+    classes = (Class *)NSZoneMalloc(NULL, numClasses * sizeof(Class));
+    numClasses = objc_getClassList(classes, numClasses);
+    for (i = 0; i < numClasses; i++)
+      [subclasses addObject:classes[i]];
+    NSZoneFree(NULL, classes);
 
     return subclasses;
 #endif