Fix compilation with llvm and latest gnustep base

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

3 files changed, 78 insertions, 3 deletions

diff --git a/gnustep-apps/projectcenter/ChangeLog b/gnustep-apps/projectcenter/ChangeLog
index b5c9d2b18c49..92a98685756d 100644
--- a/gnustep-apps/projectcenter/ChangeLog
+++ b/gnustep-apps/projectcenter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-apps/projectcenter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectcenter/ChangeLog,v 1.20 2012/02/04 14:09:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectcenter/ChangeLog,v 1.21 2012/02/14 18:25:52 voyageur Exp $
+
+  14 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  projectcenter-0.6.0.ebuild, +files/projectcenter-0.6.0-32788+33818.patch:
+  Fix compilation with llvm and latest gnustep base
 
   04 Feb 2012; Agostino Sarubbo <ago@gentoo.org> projectcenter-0.6.0.ebuild:
   Stable for amd64, wrt bug #397047
diff --git a/gnustep-apps/projectcenter/files/projectcenter-0.6.0-32788+33818.patch b/gnustep-apps/projectcenter/files/projectcenter-0.6.0-32788+33818.patch
new file mode 100644
index 000000000000..41b6eca91acd
--- /dev/null
+++ b/gnustep-apps/projectcenter/files/projectcenter-0.6.0-32788+33818.patch
@@ -0,0 +1,67 @@
+http://svn.gna.org/viewcvs/gnustep?view=revision&revision=32788
+* Modules/Parsers/ProjectCenter/PCParser.m [-parse]: Move the
+selector and IMP definitions inside the method. Global IMP caching
+is always wrong! And this broke compilation with llvm.
+
+http://svn.gna.org/viewcvs/gnustep?view=revision&revision=33818
+use setAllowedFileTypes method instead of private method which was removed
+
+--- apps/projectcenter/trunk/Modules/Parsers/ProjectCenter/PCParser.m	2011/04/06 18:40:59	32787
++++ apps/projectcenter/trunk/Modules/Parsers/ProjectCenter/PCParser.m	2011/04/06 18:46:03	32788
+@@ -124,23 +124,21 @@
+     } 
+ }
+ 
+-static SEL selString = @selector(string:);
+-static SEL selNumber = @selector(number:);
+-static SEL selSpaceAndNewLine = @selector(spaceAndNewLine:);
+-static SEL selInvisible = @selector(invisible:);
+-static SEL selSymbol = @selector(symbol:);
+-
+-static void (*impString)(id, SEL, id);
+-static void (*impNumber)(id, SEL, id);
+-static void (*impSpaceAndNewLine)(id, SEL, unichar); 
+-static void (*impInvisible)(id, SEL, unichar); 
+-static void (*impSymbol)(id, SEL, unichar); 
+-
+ - (void)parse
+ {
+   unsigned int i, start, end;
+   CodeType startType, endType;
+   NSString *out;
++  SEL selString = @selector(string:);
++  SEL selNumber = @selector(number:);
++  SEL selSpaceAndNewLine = @selector(spaceAndNewLine:);
++  SEL selInvisible = @selector(invisible:);
++  SEL selSymbol = @selector(symbol:);
++  void (*impString)(id, SEL, id);
++  void (*impNumber)(id, SEL, id);
++  void (*impSpaceAndNewLine)(id, SEL, unichar); 
++  void (*impInvisible)(id, SEL, unichar); 
++  void (*impSymbol)(id, SEL, unichar); 
+ 
+   NSLog(@"CodeParser begin...");
+ 
+--- apps/projectcenter/trunk/Framework/PCAddFilesPanel.m	2011/09/08 05:59:20	33817
++++ apps/projectcenter/trunk/Framework/PCAddFilesPanel.m	2011/09/08 13:05:29	33818
+@@ -1,9 +1,10 @@
+ /*
+    GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
+ 
+-   Copyright (C) 2004 Free Software Foundation
++   Copyright (C) 2004-2011 Free Software Foundation
+ 
+    Authors: Serg Stoyan
++            Riccardo Mottola
+ 
+    This file is part of GNUstep.
+ 
+@@ -93,7 +94,7 @@
+ {
+   NSString  *path = nil;
+ 
+-  ASSIGN(_fileTypes, fileTypes);
++  [super setAllowedFileTypes: fileTypes];
+ 
+   path = [_browser path];
+   [self validateVisibleColumns];
diff --git a/gnustep-apps/projectcenter/projectcenter-0.6.0.ebuild b/gnustep-apps/projectcenter/projectcenter-0.6.0.ebuild
index d224a560d595..15513e08900c 100644
--- a/gnustep-apps/projectcenter/projectcenter-0.6.0.ebuild
+++ b/gnustep-apps/projectcenter/projectcenter-0.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectcenter/projectcenter-0.6.0.ebuild,v 1.2 2012/02/04 14:09:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectcenter/projectcenter-0.6.0.ebuild,v 1.3 2012/02/14 18:25:52 voyageur Exp $
 
-EAPI=3
+EAPI=4
 inherit gnustep-2
 
 MY_P=${P/projectc/ProjectC}
@@ -18,3 +18,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=">=sys-devel/gdb-6.0"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-32788+33818.patch
+}