Hi,
a new release of the examples was made to catch up with the changes in gnustep
-base and -gui, therefore getting rid of some patches. Attached diff to the
latest version.
cheers,
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/examples/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 12 May 2010 16:48:26 -0000 1.8
+++ Makefile 3 Jun 2010 08:56:56 -0000
@@ -2,8 +2,8 @@
COMMENT= GNUstep example applications
-DISTNAME= gnustep-examples-1.2.0
-PKGNAME= ${DISTNAME}p4
+DISTNAME= gnustep-examples-1.3.0
+PKGNAME= ${DISTNAME}
CATEGORIES= misc
HOMEPAGE= http://www.gnustep.org/experience/examples.html
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/gnustep/examples/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 29 May 2007 03:03:52 -0000 1.1.1.1
+++ distinfo 3 Jun 2010 08:56:56 -0000
@@ -1,5 +1,5 @@
-MD5 (gnustep/gnustep-examples-1.2.0.tar.gz) = Sp6gjn7x5vPEb8V6PXUuJw==
-RMD160 (gnustep/gnustep-examples-1.2.0.tar.gz) = cwuPLVtqwoqNbe9csCZL5svvEmQ=
-SHA1 (gnustep/gnustep-examples-1.2.0.tar.gz) = YNnB6jeHX5aqTk9GzvPmSTu1wnc=
-SHA256 (gnustep/gnustep-examples-1.2.0.tar.gz) = jCscHsKZNN9aYNJ4O5OiSfwosDc72z+zE0wIa/EboWA=
-SIZE (gnustep/gnustep-examples-1.2.0.tar.gz) = 273753
+MD5 (gnustep/gnustep-examples-1.3.0.tar.gz) = tv0xAAsSXUqvIX7QONLT8w==
+RMD160 (gnustep/gnustep-examples-1.3.0.tar.gz) = 8LAmV7l/26IwwAdqbkEA8ZZHbYY=
+SHA1 (gnustep/gnustep-examples-1.3.0.tar.gz) = 0zcLZrTIOpkgUJ4Vr1YaV9BFlOY=
+SHA256 (gnustep/gnustep-examples-1.3.0.tar.gz) = foSLnNbf4A8QH3HHbie7Rv2Kdq7v3xnlzgUI4EE7Ihw=
+SIZE (gnustep/gnustep-examples-1.3.0.tar.gz) = 295888
Index: patches/patch-gui_GNUmakefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/examples/patches/patch-gui_GNUmakefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-gui_GNUmakefile
--- patches/patch-gui_GNUmakefile 29 May 2007 03:03:52 -0000 1.1.1.1
+++ patches/patch-gui_GNUmakefile 3 Jun 2010 08:56:56 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-gui_GNUmakefile,v 1.1.1.1 2007/05/29 03:03:52 ajacoutot Exp $
---- gui/GNUmakefile.orig Wed May 23 22:11:28 2007
-+++ gui/GNUmakefile Mon May 28 18:57:42 2007
-@@ -31,7 +31,11 @@ SUBPROJECTS = \
+--- gui/GNUmakefile.orig Mon Mar 8 00:15:58 2010
++++ gui/GNUmakefile Thu Jun 3 09:58:19 2010
+@@ -30,7 +30,12 @@ SUBPROJECTS = \
+ CurrencyConverter \
Ink \
ExampleService \
- MyGL \
- GSTest
-+ GSTest \
-+ ToolbarExample \
-+ Finger \
-+ GFractal \
-+ HostAddress
-
- include GNUmakefile.preamble
++ GSTest \
++ ToolbarExample \
++ Finger \
++ GFractal \
++ HostAddress \
++ MyGL
+ # MyGL commented out because it required OpenGL which some people
+ # don't have.
Index: patches/patch-gui_MyGL_AppController_m
===================================================================
RCS file: /cvs/ports/x11/gnustep/examples/patches/patch-gui_MyGL_AppController_m,v
retrieving revision 1.1
diff -u -r1.1 patch-gui_MyGL_AppController_m
--- patches/patch-gui_MyGL_AppController_m 4 Jun 2007 11:09:13 -0000 1.1
+++ patches/patch-gui_MyGL_AppController_m 3 Jun 2010 08:56:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gui_MyGL_AppController_m,v 1.1 2007/06/04 11:09:13 ajacoutot Exp $
---- gui/MyGL/AppController.m.orig Sun Jun 3 15:47:05 2007
-+++ gui/MyGL/AppController.m Sun Jun 3 15:47:48 2007
-@@ -418,7 +418,7 @@ static char initialized = 0;
+--- gui/MyGL/AppController.m.orig Thu Apr 15 01:01:19 2010
++++ gui/MyGL/AppController.m Thu Jun 3 09:44:46 2010
+@@ -410,7 +410,7 @@ static void Normalize (Vector *v)
h = [MySAX new];
p = [GSXMLParser parserWithSAXHandler:h
Index: patches/patch-gui_MyGL_GNUmakefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/examples/patches/patch-gui_MyGL_GNUmakefile,v
retrieving revision 1.2
diff -u -r1.2 patch-gui_MyGL_GNUmakefile
--- patches/patch-gui_MyGL_GNUmakefile 4 Jun 2007 11:09:13 -0000 1.2
+++ patches/patch-gui_MyGL_GNUmakefile 3 Jun 2010 08:56:56 -0000
@@ -1,15 +1,20 @@
$OpenBSD: patch-gui_MyGL_GNUmakefile,v 1.2 2007/06/04 11:09:13 ajacoutot Exp $
---- gui/MyGL/GNUmakefile.orig Thu May 24 06:11:28 2007
-+++ gui/MyGL/GNUmakefile Sun Jun 3 16:12:34 2007
-@@ -7,8 +7,9 @@ MyGL_MAIN_MODEL_FILE=MyGL.gorm
+--- gui/MyGL/GNUmakefile.orig Sat Mar 13 02:20:22 2010
++++ gui/MyGL/GNUmakefile Thu Jun 3 09:55:30 2010
+@@ -7,13 +7,14 @@ MyGL_MAIN_MODEL_FILE=MyGL.gorm
MyGL_APPLICATION_ICON=MyGL.tiff
MyGL_OBJC_FILES = main.m AppController.m
-MyGL_RESOURCE_FILES = MyGL.gorm MyGL.tiff
+MyGL_RESOURCE_FILES = MyGL.gorm MyGL.tiff girl.dae
+
+ ifeq ($(GNUSTEP_TARGET_OS), mingw32)
+ ADDITIONAL_TOOL_LIBS += -lopengl32 -lglu32 -lm
+ else
-ADDITIONAL_TOOL_LIBS += -lGL -lGLU -lm
+ADDITIONAL_TOOL_LIBS += -L!!X11BASE!!/lib -lGL -lGLU -lm
+ADDITIONAL_INCLUDE_DIRS += -I!!X11BASE!!/include
+ endif
include $(GNUSTEP_MAKEFILES)/application.make
Index: patches/patch-gui_ToolbarExample_SecondWindowOwner_h
===================================================================
RCS file: patches/patch-gui_ToolbarExample_SecondWindowOwner_h
diff -N patches/patch-gui_ToolbarExample_SecondWindowOwner_h
--- patches/patch-gui_ToolbarExample_SecondWindowOwner_h 12 May 2010 16:48:26 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-gui_ToolbarExample_SecondWindowOwner_h,v 1.1 2010/05/12 16:48:26 jasper Exp $
-
-Fix build with new gnustep-gui.
-From upstream svn.
-
---- gui/ToolbarExample/SecondWindowOwner.h.orig Wed May 12 11:06:53 2010
-+++ gui/ToolbarExample/SecondWindowOwner.h Wed May 12 11:07:03 2010
-@@ -26,7 +26,6 @@
- #include <Foundation/Foundation.h>
- #include <AppKit/AppKit.h>
- #include <GNUstepGUI/GSToolbarView.h>
--#include <GNUstepGUI/GSToolbar.h>
-
- @interface SecondWindowOwner : NSObject
- {
Index: patches/patch-gui_ToolbarExample_SecondWindowOwner_m
===================================================================
RCS file: patches/patch-gui_ToolbarExample_SecondWindowOwner_m
diff -N patches/patch-gui_ToolbarExample_SecondWindowOwner_m
--- patches/patch-gui_ToolbarExample_SecondWindowOwner_m 12 May 2010 16:48:26 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-$OpenBSD: patch-gui_ToolbarExample_SecondWindowOwner_m,v 1.1 2010/05/12 16:48:26 jasper Exp $
-
-Fix build with new gnustep-gui.
-From upstream svn.
-
---- gui/ToolbarExample/SecondWindowOwner.m.orig Wed May 12 11:09:06 2010
-+++ gui/ToolbarExample/SecondWindowOwner.m Wed May 12 11:09:15 2010
-@@ -24,41 +24,43 @@
- */
-
- #include "SecondWindowOwner.h"
-+#include <GNUstepGUI/GSToolbarView.h>
-
- @implementation SecondWindowOwner
-
- - (void) awakeFromNib
- {
-- GSToolbar *otherToolbar;
-+ NSToolbar *otherToolbar;
-
- //NSLog(@"Nib loaded with window");
-
-- otherToolbar = [[GSToolbar alloc] initWithIdentifier: @"blablaToolbar"];
-+ otherToolbar = [[NSToolbar alloc] initWithIdentifier: @"blablaToolbar"];
- //NSLog(@"Mini controller delegate %@", self);
-
- [otherToolbar setDelegate: self];
-
- [otherToolbarView setBorderMask: GSToolbarViewTopBorder
-- | GSToolbarViewBottomBorder
-- | GSToolbarViewRightBorder
-- | GSToolbarViewLeftBorder];
-- [(GSToolbarView *)otherToolbarView setToolbar: otherToolbar];
-+ | GSToolbarViewBottomBorder
-+ | GSToolbarViewRightBorder
-+ | GSToolbarViewLeftBorder];
- // We do a cast to eliminate a warning...
-+ [otherToolbar _setToolbarView: (GSToolbarView *)otherToolbarView];
-
-- RELEASE(otherToolbar);
-+ // We leak the toolbar! It should rather be an instance variable and
-+ // freed when this object gets deallocated.
-+ //RELEASE(otherToolbar);
- }
-
- // Toolbar delegates
-
--- (NSToolbarItem *) toolbar: (GSToolbar *)toolbar itemForItemIdentifier: (NSString *)identifier
-- willBeInsertedIntoToolbar: (BOOL)willBeInserted
-+- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar
-+ itemForItemIdentifier: (NSString *)identifier
-+ willBeInsertedIntoToolbar: (BOOL)willBeInserted
- {
- NSToolbarItem *toolbarItem = [[NSToolbarItem alloc] initWithItemIdentifier: identifier];
-
- //NSLog(@"toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar: has been called");
-
-- AUTORELEASE(toolbarItem);
--
- if ([identifier isEqual: @"Third"])
- {
- [toolbarItem setLabel: @"Validation example"];
-@@ -74,10 +76,11 @@
- [toolbarItem setAction: @selector(toggleToolbarShown:)];
- }
-
-- return toolbarItem;
-+ return AUTORELEASE(toolbarItem);
- }
-
--- (NSArray *) toolbarDefaultItemIdentifiers: (GSToolbar *)toolbar {
-+- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar
-+{
- //NSLog(@"toolbarDefaultItemIdentifiers: has been called");
-
- return [NSArray arrayWithObjects: @"Third",
-@@ -87,7 +90,8 @@
- nil];
- }
-
--- (NSArray *) toolbarAllowedItemIdentifiers: (GSToolbar *)toolbar {
-+- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar
-+{
- //NSLog(@"toolbarAllowedItemIdentifiers: has been called");
-
- return [NSArray arrayWithObjects: @"Third",
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/gnustep/examples/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 23 Jun 2008 11:00:46 -0000 1.4
+++ pkg/PLIST 3 Jun 2010 08:56:56 -0000
@@ -45,6 +45,11 @@
lib/GNUstep/ApplicationSupport/GSTest/NSBox-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/NSBox-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/NSBox-test.bundle/stamp.make
+lib/GNUstep/ApplicationSupport/GSTest/NSButton-test.bundle/
+lib/GNUstep/ApplicationSupport/GSTest/NSButton-test.bundle/NSButton-test.so
+lib/GNUstep/ApplicationSupport/GSTest/NSButton-test.bundle/Resources/
+lib/GNUstep/ApplicationSupport/GSTest/NSButton-test.bundle/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GSTest/NSButton-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/NSColorList-test.bundle/
lib/GNUstep/ApplicationSupport/GSTest/NSColorList-test.bundle/NSColorList-test.so
lib/GNUstep/ApplicationSupport/GSTest/NSColorList-test.bundle/Resources/
@@ -60,6 +65,11 @@
lib/GNUstep/ApplicationSupport/GSTest/NSForm-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/NSForm-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/NSForm-test.bundle/stamp.make
+lib/GNUstep/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/
+lib/GNUstep/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/NSOpenPanel-test.so
+lib/GNUstep/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/Resources/
+lib/GNUstep/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/Resources/Info-gnustep.plist
+lib/GNUstep/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/NSOutlineView-test.bundle/
lib/GNUstep/ApplicationSupport/GSTest/NSOutlineView-test.bundle/NSOutlineView-test.so
lib/GNUstep/ApplicationSupport/GSTest/NSOutlineView-test.bundle/Resources/
@@ -186,6 +196,7 @@
libexec/GNUstep/Ink.app/Resources/FileIcon_txt.tiff
libexec/GNUstep/Ink.app/Resources/Info-gnustep.plist
libexec/GNUstep/Ink.app/Resources/Ink.desktop
+libexec/GNUstep/Ink.app/Resources/Ink_app.ico
libexec/GNUstep/Ink.app/Resources/Ink_app.tiff
libexec/GNUstep/Ink.app/stamp.make
libexec/GNUstep/MyGL.app/
