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

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 73 insertions, 6 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/Manifest b/gnustep-apps/gridlock/Manifest
index fd1aaab915e5..02a69c428bce 100644
--- a/gnustep-apps/gridlock/Manifest
+++ b/gnustep-apps/gridlock/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gridlock-1.10-objcruntime.patch 1763 RMD160 f329a7110ceb8c2534f8a57f7f75d253880ccf7c SHA1 d46bf94ed8608e4a37dd4567becd6a2950e2be8e SHA256 4a260055cc82310561aabccbf203655258d16335c3a960dc467d227edce8eca2
 DIST Gridlock-gnustep-1.10.tar.gz 230641 RMD160 78544673bcf5818c9100a2d1c18790a8e56691c5 SHA1 298efc068c9dc3484ba2eb2d2a08d953a461bd94 SHA256 e5d1e57f6f1bcd19dede22dbd9ba922c73e2172780a92dfff1b333e222e9aae7
-EBUILD gridlock-1.10.ebuild 527 RMD160 636dd97c9c05ef972f7f9a01c1469566fe5182c8 SHA1 92ef7c5c608c8c1eb3ab57f87b1ad4e4b81fcf5f SHA256 6172bb3ea0085891c1a6d8809ac7a59884298e691fec076e4ebfa9f7eee7f037
-MISC ChangeLog 2832 RMD160 ee17d77cb539cc8c42beff3d3e5b0509b1de99d7 SHA1 092241ed53a6817eb6b5fc10a055905f05db82b5 SHA256 7f101013e1082d0aedb03d8bd97de89ba114096ddc8f79a65922f88e57b9b12e
+EBUILD gridlock-1.10.ebuild 598 RMD160 2f46cd28ee96cbbaac1f95abcbca6e9019e5dfd7 SHA1 03f28a0de38230cf832e455bf710e0ca25f6f0cd SHA256 a64bb0a6ee1f8f5fd20b29bc7575a2eaed0b4628ead7bb83595bba4ff7e39709
+MISC ChangeLog 3027 RMD160 b505e8963acba04bde2b77dcdaf3d7775649ca91 SHA1 f02d7ca11c22227d789aa9c340d5392cd6b8d996 SHA256 bdb40501b197a2137ec971fae4a115e934dc76848ef5d0eb6c4935e422f6677f
 MISC metadata.xml 418 RMD160 a02cd2cece5cc8c54fa73d1cc42e481a135f6ee7 SHA1 f946038887aa4e47ac281b752f0eb00209096b8d SHA256 e782270fe1019df55b0391865d940e44e43bba2439b9c1d84b162f3705f5a35d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5OMFsACgkQFYEBGcdFJfJ+gQD9EKBe05Y90EWipHo3FjblI3JO
+ArrPdxKtuYyl/ArEZBUA/jrPriEGyydPYFnr6R/NbOk5+VpA4P+uSBwPhXaENnEx
+=XRjr
+-----END PGP SIGNATURE-----
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
+}