Fix runtime headers inclusion, from debian bug 629202. Fixes bug #374951

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 60 insertions, 4 deletions

diff --git a/gnustep-apps/gridlock/ChangeLog b/gnustep-apps/gridlock/ChangeLog
index 16d7cd8062f1..0de09a92fb64 100644
--- a/gnustep-apps/gridlock/ChangeLog
+++ b/gnustep-apps/gridlock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-apps/gridlock
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/ChangeLog,v 1.14 2008/03/08 13:32:44 coldwind Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/ChangeLog,v 1.15 2011/08/19 09:43:40 voyageur Exp $
+
+  19 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> gridlock-1.10.ebuild,
+  +files/gridlock-1.10-objcruntime.patch:
+  Fix runtime headers inclusion, from debian bug 629202. Fixes bug #374951
 
   08 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> gridlock-1.10.ebuild:
   amd64 stable wrt bug #207381
diff --git a/gnustep-apps/gridlock/files/gridlock-1.10-objcruntime.patch b/gnustep-apps/gridlock/files/gridlock-1.10-objcruntime.patch
new file mode 100644
index 000000000000..5981f57fbb5b
--- /dev/null
+++ b/gnustep-apps/gridlock/files/gridlock-1.10-objcruntime.patch
@@ -0,0 +1,47 @@
+--- 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
+ 
+--- gridlock.app-1.10.orig/NSObject+Extensions.m
++++ gridlock.app-1.10/NSObject+Extensions.m
+@@ -173,13 +173,16 @@ NSArray *EDSubclassesOfClass(Class aClas
+ #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
diff --git a/gnustep-apps/gridlock/gridlock-1.10.ebuild b/gnustep-apps/gridlock/gridlock-1.10.ebuild
index 9190cfa34d63..10eca9b91077 100644
--- a/gnustep-apps/gridlock/gridlock-1.10.ebuild
+++ b/gnustep-apps/gridlock/gridlock-1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.10.ebuild,v 1.4 2008/03/08 13:32:44 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.10.ebuild,v 1.5 2011/08/19 09:43:40 voyageur Exp $
 
 inherit gnustep-2
 
@@ -12,3 +12,8 @@ SRC_URI="http://www.dozingcatsoftware.com/Gridlock/${PN/g/G}-gnustep-${PV}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FIESDIR}"/${P}-objcruntime.patch
+}