Hi,
the patch below updates Gemas to version 0.3. New is that its now possible to
select themes via HighlighterKit, and it supports creating files for new
GNUstep Apps and Tools. Further getting rid of a lot of patches.
OK?
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/gemas/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 20 May 2011 07:33:45 -0000 1.3
+++ Makefile 9 Apr 2012 17:05:25 -0000
@@ -2,7 +2,7 @@
COMMENT = simple code editor for GNUstep
-DISTNAME = Gemas-0.2
+DISTNAME = Gemas-0.3
PKGNAME = gnustep-${DISTNAME:L}
HOMEPAGE = http://wiki.gnustep.org/index.php/Gemas.app
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/gnustep/gemas/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 20 May 2011 07:33:45 -0000 1.2
+++ distinfo 9 Apr 2012 17:05:25 -0000
@@ -1,5 +1,5 @@
-MD5 (gnustep/Gemas-0.2.tar.gz) = WULk+dczRT/8gPc+7lpcxQ==
-RMD160 (gnustep/Gemas-0.2.tar.gz) = trmwXa0zpPEAJ0nGQx3DA9RvYx8=
-SHA1 (gnustep/Gemas-0.2.tar.gz) = 31fR4PwoJTS7wXY+fpkPFX5TZp0=
-SHA256 (gnustep/Gemas-0.2.tar.gz) =
vpAIswwu9BCzlS3/p0m0z6gcRE84l1KaTUwEEppVjTQ=
-SIZE (gnustep/Gemas-0.2.tar.gz) = 74883
+MD5 (gnustep/Gemas-0.3.tar.gz) = WsfK84DgpxvJVjnReH4B4Q==
+RMD160 (gnustep/Gemas-0.3.tar.gz) = 5O6k/3iCtbpoLV01p8JQQCe00fo=
+SHA1 (gnustep/Gemas-0.3.tar.gz) = 7DjXRjhcOTbjhN5oYLKtTulggVE=
+SHA256 (gnustep/Gemas-0.3.tar.gz) =
NjNATkKctxO3jJwiIFSMOtqj6415uX2lWXorLynwEj0=
+SIZE (gnustep/Gemas-0.3.tar.gz) = 89459
Index: patches/patch-GemasController_m
===================================================================
RCS file: patches/patch-GemasController_m
diff -N patches/patch-GemasController_m
--- patches/patch-GemasController_m 20 May 2011 07:33:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-GemasController_m,v 1.1 2011/05/20 07:33:45 sebastia Exp $
-
-fix build with gcc-2.95
-
---- GemasController.m.orig Wed May 18 08:41:10 2011
-+++ GemasController.m Wed May 18 08:43:39 2011
-@@ -85,11 +85,13 @@
- {
- if (preferencesPanel == nil)
- {
-+ NSUserDefaults *df;
-+ NSData *data;
- [NSBundle loadNibNamed: @"Preferences" owner: self];
- [preferencesPanel center];
- [preferencesPanel makeKeyAndOrderFront: self];
-
-- NSUserDefaults * df = [NSUserDefaults standardUserDefaults];
-+ df = [NSUserDefaults standardUserDefaults];
-
- //Editing
- [indentation selectItemAtIndex: [df integerForKey: @"Indentation"]];
-@@ -97,7 +99,7 @@
- [tabConversion selectItemAtIndex: [df integerForKey:
@"TabConversion"]];
-
- //Looks
-- NSData *data = [df dataForKey: @"EditorTextColor"];
-+ data = [df dataForKey: @"EditorTextColor"];
- if (data != nil)
- {
- [textColor setColor: [NSKeyedUnarchiver unarchiveObjectWithData:
data]];
Index: patches/patch-GemasDocument_m
===================================================================
RCS file: patches/patch-GemasDocument_m
diff -N patches/patch-GemasDocument_m
--- patches/patch-GemasDocument_m 20 May 2011 07:33:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-GemasDocument_m,v 1.1 2011/05/20 07:33:45 sebastia Exp $
-
-fix build with gcc-2.95
-
---- GemasDocument.m.orig Wed May 18 08:48:53 2011
-+++ GemasDocument.m Wed May 18 08:49:52 2011
-@@ -335,6 +335,7 @@
- id document, window;
- NSMenu *windowsMenu, *recentDocsMenu;
- NSMenuItem *item, *clear;
-+ NSEnumerator *windows;
- NSEnumerator *documents = [[[NSDocumentController
sharedDocumentController]
- documents] objectEnumerator];
- /* Get list of recent documents */
-@@ -360,7 +361,7 @@
- }
- }
-
-- NSEnumerator *windows = [[NSApp windows] objectEnumerator];
-+ windows = [[NSApp windows] objectEnumerator];
-
- while((window = [windows nextObject]))
- {
-@@ -432,12 +433,12 @@
- int x, y;
- NSMenu *recentDocsMenu;
- NSWindow *window;
--
-+ NSEnumerator *windows;
- [[NSUserDefaults standardUserDefaults]
- setObject: [NSMutableArray array] forKey: @"NSRecentDocuments"];
- [[NSDocumentController sharedDocumentController] clearRecentDocuments:
self];
-
-- NSEnumerator *windows = [[NSApp windows] objectEnumerator];
-+ windows = [[NSApp windows] objectEnumerator];
-
- while ((window = [windows nextObject]))
- {
Index: patches/patch-GemasEditorView_m
===================================================================
RCS file: patches/patch-GemasEditorView_m
diff -N patches/patch-GemasEditorView_m
--- patches/patch-GemasEditorView_m 20 May 2011 07:33:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-$OpenBSD: patch-GemasEditorView_m,v 1.1 2011/05/20 07:33:45 sebastia Exp $
-
-fix build with gcc-2.95
-
---- GemasEditorView.m.orig Sun May 1 05:54:22 2011
-+++ GemasEditorView.m Thu May 19 09:18:19 2011
-@@ -126,10 +126,12 @@
- - (void) insertNewline: (id)sender
- {
- NSString *spaceToInsert, *previousLine = nil;
--
-+ NSString *lastLine;
-+ NSRange textRange;
-+ NSArray *lines;
- [super insertNewline: sender];
-- NSRange textRange = [self selectedRange];
-- NSArray *lines = [[[self string] substringFromRange: NSMakeRange(0,
textRange.location)]
-+ textRange = [self selectedRange];
-+ lines = [[[self string] substringFromRange: NSMakeRange(0,
textRange.location)]
- componentsSeparatedByString: @"\n"];
-
- if ([lines count] >= 3)
-@@ -139,7 +141,7 @@
- @" " withString: @""];
- }
-
-- NSString *lastLine = [lines objectAtIndex: [lines count] - 2];
-+ lastLine = [lines objectAtIndex: [lines count] - 2];
-
- if ([[NSCharacterSet whitespaceAndNewlineCharacterSet] isSupersetOfSet:
[NSCharacterSet characterSetWithCharactersInString: lastLine]])
- {
-@@ -147,12 +149,13 @@
- }
- else
- {
-+ unichar lastChar;
- NSInteger tab = [[NSUserDefaults standardUserDefaults]
- integerForKey: @"Indentation"];
- NSString *checkLine = [lastLine stringByReplacingOccurrencesOfString:
@" " withString: @""];
- spaceToInsert = [lastLine stringByDeletingSuffix: [lastLine
stringByTrimmingLeadSpaces]];
-
-- unichar lastChar = [[lastLine stringByTrimmingTailSpaces]
characterAtIndex: [[lastLine stringByTrimmingTailSpaces] length] - 1];
-+ lastChar = [[lastLine stringByTrimmingTailSpaces] characterAtIndex:
[[lastLine stringByTrimmingTailSpaces] length] - 1];
-
- if ((([indentCharacters characterIsMember: lastChar]) &&
- (![previousLine hasPrefix: @"switch("])) ||
-@@ -273,9 +276,11 @@
- click obove one*/
- - (void) mouseDown: (NSEvent *)event
- {
-+ NSRange textRange;
-+ NSString *selection;
- [super mouseDown: event];
-- NSRange textRange = [self selectedRange];
-- NSString *selection = [[self string] substringFromRange: textRange];
-+ textRange = [self selectedRange];
-+ selection = [[self string] substringFromRange: textRange];
-
- if ([selection length] == 1)
- {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/gnustep/gemas/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 7 Jan 2011 07:35:06 -0000 1.1.1.1
+++ pkg/PLIST 9 Apr 2012 17:05:25 -0000
@@ -4,6 +4,18 @@
libexec/GNUstep/Gemas.app/
@bin libexec/GNUstep/Gemas.app/Gemas
libexec/GNUstep/Gemas.app/Resources/
+libexec/GNUstep/Gemas.app/Resources/AppResources/
+libexec/GNUstep/Gemas.app/Resources/AppResources/AppController.h
+libexec/GNUstep/Gemas.app/Resources/AppResources/AppController.m
+libexec/GNUstep/Gemas.app/Resources/AppResources/AppMain.m
+libexec/GNUstep/Gemas.app/Resources/AppResources/GNUmakefile
+libexec/GNUstep/Gemas.app/Resources/AppResources/GNUmakefile.postamble
+libexec/GNUstep/Gemas.app/Resources/AppResources/GNUmakefile.preamble
+libexec/GNUstep/Gemas.app/Resources/AppResources/Info.plist
+libexec/GNUstep/Gemas.app/Resources/AppResources/interface.gorm/
+libexec/GNUstep/Gemas.app/Resources/AppResources/interface.gorm/data.classes
+libexec/GNUstep/Gemas.app/Resources/AppResources/interface.gorm/data.info
+libexec/GNUstep/Gemas.app/Resources/AppResources/interface.gorm/objects.gorm
libexec/GNUstep/Gemas.app/Resources/English.lproj/
libexec/GNUstep/Gemas.app/Resources/English.lproj/Editor.gorm/
libexec/GNUstep/Gemas.app/Resources/English.lproj/Editor.gorm/data.classes
@@ -53,4 +65,10 @@
libexec/GNUstep/Gemas.app/Resources/Spanish.lproj/Preferences.gorm/data.classes
libexec/GNUstep/Gemas.app/Resources/Spanish.lproj/Preferences.gorm/data.info
libexec/GNUstep/Gemas.app/Resources/Spanish.lproj/Preferences.gorm/objects.gorm
+libexec/GNUstep/Gemas.app/Resources/ToolResources/
+libexec/GNUstep/Gemas.app/Resources/ToolResources/GNUmakefile
+libexec/GNUstep/Gemas.app/Resources/ToolResources/GNUmakefile.postamble
+libexec/GNUstep/Gemas.app/Resources/ToolResources/GNUmakefile.preamble
+libexec/GNUstep/Gemas.app/Resources/ToolResources/main.m
+libexec/GNUstep/Gemas.app/Resources/nonEnglishCharacters.plist
libexec/GNUstep/Gemas.app/stamp.make
