1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00

- fix build for gnustep-base 1.21.0

This commit is contained in:
Dirk Meyer 2010-05-23 20:51:27 +00:00
parent 434871ff18
commit cf38b673c9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=254910
31 changed files with 346 additions and 17 deletions

View File

@ -0,0 +1,10 @@
--- Bundles/Esound/EsoundPreference.m.orig 2006-03-18 05:18:51.000000000 +0100
+++ Bundles/Esound/EsoundPreference.m 2010-05-23 06:40:35.000000000 +0200
@@ -26,6 +26,7 @@
#import <AppKit/NSTextField.h>
#import <AppKit/NSWindow.h>
#import <Foundation/NSBundle.h>
+#import <Foundation/NSDictionary.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSUserDefaults.h>

View File

@ -37,8 +37,9 @@ PLIST_SUB+= LIBVERSION5=${DEFAULT_LIBVERSION5}
PLIST_SUB+= MAJORLIBVERSION5=${DEFAULT_LIBVERSION5:C/([0-9]).*/\1/1}
ADDITIONAL_CPPFLAGS= -D__FREEBSD__
ADDITIONAL_INCLUDE_DIRS= -I${WRKSRC}/Kernel -I${WRKSRC}
ADDITIONAL_LIB_DIRS= -L${WRKSRC}/Kernel/AdunKernel/AdunKernel.framework -L${LOCALBASE}/MolTalk/MolTalk.framework
ADDITIONAL_LDFLAGS= -rpath-link=${WRKSRC}/Kernel/AdunKernel/AdunKernel.framework:${LOCALBASE}/MolTalk/MolTalk.framework
ADDITIONAL_LIB_DIRS= -L${WRKSRC}/Kernel/AdunKernel/AdunKernel.framework -L${WRKSRC}/MolTalk/MolTalk.framework -L${WRKSRC}/Kernel/Base/obj
ADDITIONAL_LDFLAGS= -rpath-link=${WRKSRC}/Kernel/AdunKernel/AdunKernel.framework:${WRKSRC}/MolTalk/MolTalk.framework:${WRKSRC}/Kernel/Base/obj
MAKE_ENV+= GSL_LIB_DIR=${LOCALBASE}/lib
MAKE_ENV+= GSL_INCLUDE_DIR=${LOCALBASE}/include

View File

@ -22,4 +22,12 @@ USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
FIXME= HandlerStructureXLP.h TextFormatterXLP.h
post-patch:
.for i in ${FIXME}
${REINPLACE_CMD} -e 's|Foundation/GSXML.h|GNUstepBase/GSXML.h|' \
${WRKSRC}/${i}
.endfor
.include <bsd.port.mk>

View File

@ -21,4 +21,12 @@ USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
FIXME= Channel.m PlopFolio.m PreferencesPanelController.m
post-patch:
.for i in ${FIXME}
${REINPLACE_CMD} -e 's|Foundation/GSXML.h|GNUstepBase/GSXML.h|' \
${WRKSRC}/${i}
.endfor
.include <bsd.port.mk>

View File

@ -0,0 +1,10 @@
--- Modules/Keyboard/Keyboard.m.orig 2002-06-08 10:29:36.000000000 +0200
+++ Modules/Keyboard/Keyboard.m 2010-05-22 11:24:43.000000000 +0200
@@ -37,6 +37,7 @@
#import <AppKit/NSButton.h>
#import <AppKit/NSNibLoading.h>
#import <AppKit/NSOpenPanel.h>
+#import <Foundation/NSUserDefaults.h>
#import "Keyboard.h"
#import "KeyboardView.h"

View File

@ -0,0 +1,10 @@
--- GSTicker.m.orig 2007-09-14 14:54:56.000000000 +0200
+++ GSTicker.m 2010-05-23 07:17:13.000000000 +0200
@@ -27,6 +27,7 @@
#include <Foundation/NSArray.h>
#include <Foundation/NSDate.h>
+#include <Foundation/NSDictionary.h>
#include <Foundation/NSThread.h>
#include <Foundation/NSTimer.h>

View File

@ -0,0 +1,10 @@
--- ProjectTypes/Application/ApplicationTypeAttributes.m.orig 2006-07-09 16:11:43.000000000 +0200
+++ ProjectTypes/Application/ApplicationTypeAttributes.m 2010-05-23 06:11:38.000000000 +0200
@@ -24,6 +24,7 @@
#import "ApplicationTypeAttributes.h"
#import <Foundation/NSString.h>
+#import <Foundation/NSDictionary.h>
#import <AppKit/NSNibLoading.h>
#import <AppKit/NSTextField.h>

View File

@ -0,0 +1,19 @@
--- ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m.orig 2006-07-09 16:11:41.000000000 +0200
+++ ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m 2010-05-23 05:53:40.000000000 +0200
@@ -30,6 +30,7 @@
#import <Foundation/NSProcessInfo.h>
#import <Foundation/NSString.h>
#import <Foundation/NSTask.h>
+#import <Foundation/NSValue.h>
#import <AppKit/NSColor.h>
#import <AppKit/NSFont.h>
@@ -44,7 +45,7 @@
#import <AppKit/NSTableView.h>
#import <AppKit/NSTextStorage.h>
#import <AppKit/NSTextView.h>
-#import <AppKit/NSWindow+Toolbar.h>
+#import <AppKit/NSWindow.h>
#import <AppKit/NSToolbar.h>
#import <AppKit/NSToolbarItem.h>

View File

@ -1,10 +1,28 @@
--- ProjectModules/MakeBuilder/MakeBuilder.m.orig 2006-07-09 16:11:41.000000000 +0200
+++ ProjectModules/MakeBuilder/MakeBuilder.m 2008-05-03 08:58:15.000000000 +0200
@@ -30,6 +30,7 @@
+++ ProjectModules/MakeBuilder/MakeBuilder.m 2010-05-23 06:03:12.000000000 +0200
@@ -23,13 +23,16 @@
#import "MakeBuilder.h"
#import <Foundation/NSArray.h>
+#import <Foundation/NSCharacterSet.h>
#import <Foundation/NSException.h>
#import <Foundation/NSFileHandle.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSString.h>
#import <Foundation/NSTask.h>
#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSValue.h>
+#import <AppKit/NSAttributedString.h>
#import <AppKit/NSButton.h>
#import <AppKit/NSCell.h>
#import <AppKit/NSDocumentController.h>
@@ -46,7 +49,7 @@
#import <AppKit/NSToolbar.h>
#import <AppKit/NSToolbarItem.h>
#import <AppKit/NSView.h>
-#import <AppKit/NSWindow+Toolbar.h>
+#import <AppKit/NSWindow.h>
#import "MakeBuilderDelegate.h"
#import "../../ProjectDocument.h"

View File

@ -0,0 +1,10 @@
--- Preferences.m.orig 2006-07-09 16:11:44.000000000 +0200
+++ Preferences.m 2010-05-23 05:27:20.000000000 +0200
@@ -26,6 +26,7 @@
#import <Foundation/NSString.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
+#import <Foundation/NSDebug.h>
#import <AppKit/NSNibLoading.h>
#import <AppKit/NSBox.h>

View File

@ -1,10 +1,11 @@
--- ProjectCreator.m.orig Sun Jul 9 16:11:43 2006
+++ ProjectCreator.m Mon Apr 30 10:53:41 2007
@@ -27,6 +27,7 @@
--- ProjectCreator.m.orig 2006-07-09 16:11:43.000000000 +0200
+++ ProjectCreator.m 2010-05-23 06:01:30.000000000 +0200
@@ -27,6 +27,8 @@
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSError.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSPathUtilities.h>
#import <AppKit/NSOpenPanel.h>
#import <AppKit/NSView.h>

View File

@ -1,7 +1,12 @@
--- ProjectDocument.m.orig Sun Jul 9 16:11:43 2006
+++ ProjectDocument.m Mon Apr 30 10:54:26 2007
@@ -28,6 +28,7 @@
--- ProjectDocument.m.orig 2006-07-09 16:11:43.000000000 +0200
+++ ProjectDocument.m 2010-05-23 06:04:25.000000000 +0200
@@ -25,9 +25,12 @@
#import <Foundation/NSString.h>
#import <Foundation/NSArray.h>
+#import <Foundation/NSCharacterSet.h>
#import <Foundation/NSDictionary.h>
+#import <Foundation/NSDistributedNotificationCenter.h>
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSError.h>

View File

@ -0,0 +1,10 @@
--- ProjectModules/FileManager/ProjectImageView.m.orig 2006-07-09 16:11:41.000000000 +0200
+++ ProjectModules/FileManager/ProjectImageView.m 2010-05-23 06:06:35.000000000 +0200
@@ -24,6 +24,7 @@
#import "ProjectImageView.h"
#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
#import <AppKit/NSEvent.h>
#import <AppKit/NSPasteboard.h>

View File

@ -0,0 +1,21 @@
--- ProjectWindowController.m.orig 2006-07-09 16:11:43.000000000 +0200
+++ ProjectWindowController.m 2010-05-23 05:56:35.000000000 +0200
@@ -25,7 +25,6 @@
#import <AppKit/NSImage.h>
#import <AppKit/NSWindow.h>
-#import <AppKit/NSWindow+Toolbar.h>
#import <AppKit/NSToolbar.h>
#import <AppKit/NSToolbarItem.h>
#import <AppKit/NSBox.h>
@@ -35,8 +34,10 @@
#import <AppKit/NSTextStorage.h>
#import <Foundation/NSBundle.h>
+#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSException.h>
#import <Foundation/NSNotification.h>
+#import <Foundation/NSUserDefaults.h>
#import "ProjectDocument.h"
#import "ProjectModule.h"

View File

@ -0,0 +1,10 @@
--- ProjectModules/SubprojectsManager/SubprojectsManager.m.orig 2006-07-09 16:11:42.000000000 +0200
+++ ProjectModules/SubprojectsManager/SubprojectsManager.m 2010-05-23 06:13:54.000000000 +0200
@@ -26,6 +26,7 @@
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSError.h>
+#import <Foundation/NSException.h>
#import <Foundation/NSFileManager.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSSortDescriptor.h>

View File

@ -0,0 +1,12 @@
--- ScalingScrollView.m.orig 2003-10-28 20:28:47.000000000 +0100
+++ ScalingScrollView.m 2010-05-22 12:31:35.000000000 +0200
@@ -11,7 +11,9 @@
#import "ScalingScrollView.h"
+#import <Foundation/NSBundle.h>
#import <Foundation/NSGeometry.h>
+#import <Foundation/NSValue.h>
#import <AppKit/NSPopUpButton.h>
#import <AppKit/NSScroller.h>
#import <AppKit/NSButtonCell.h>

View File

@ -0,0 +1,10 @@
--- Controller.h.orig 2005-02-08 12:21:42.000000000 +0100
+++ Controller.h 2010-05-23 07:14:06.000000000 +0200
@@ -37,6 +37,7 @@
#include <AppKit/NSFont.h>
#include <AppKit/NSWindow.h>
#include <AppKit/NSMenu.h>
+#include <AppKit/NSPanel.h>
typedef enum {
MENU_NEW_WITH_REP = 500,

View File

@ -0,0 +1,22 @@
--- Clock.h.orig 2005-09-16 00:49:12.000000000 +0200
+++ Clock.h 2010-05-23 07:03:45.000000000 +0200
@@ -24,7 +24,7 @@
NSFont *font;
- NSDate *_date;
+ NSCalendarDate *_date;
NSTimeZone *_timeZone;
NSTimeInterval _tzv;
@@ -47,8 +47,8 @@
- (void) setTimeZone:(NSTimeZone *)tz;
- (NSTimeZone *) timeZone;
-- (void) setDate:(NSDate *)date;
-- (NSDate *) date;
+- (void) setDate:(NSCalendarDate *)date;
+- (NSCalendarDate *) date;
/* move a clock to CSClockView and put these theming method into subclass */

View File

@ -0,0 +1,20 @@
--- Clock.m.orig 2005-09-16 00:49:12.000000000 +0200
+++ Clock.m 2010-05-23 07:03:08.000000000 +0200
@@ -834,7 +834,7 @@
return _timeZone;
}
-- (void) setDate:(NSDate *)date
+- (void) setDate:(NSCalendarDate *)date
{
ASSIGN(_date, date);
handsTime = [date timeIntervalSinceReferenceDate] + _tzv;
@@ -842,7 +842,7 @@
[self setNeedsDisplay: YES];
}
-- (NSDate *) date
+- (NSCalendarDate *) date
{
return _date;
}

View File

@ -0,0 +1,12 @@
--- PreferencesController.m.orig 2004-12-17 10:10:22.000000000 +0100
+++ PreferencesController.m 2010-05-23 05:22:03.000000000 +0200
@@ -32,7 +32,9 @@
#include "InputView.h"
+#include <Foundation/NSArchiver.h>
#include <Foundation/NSNotification.h>
+#include <Foundation/NSUserDefaults.h>
#include <AppKit/NSBrowser.h>
#include <AppKit/NSBrowserCell.h>

View File

@ -1,7 +1,12 @@
--- Document.m.orig 2005-05-23 21:30:29.000000000 +0200
+++ Document.m 2008-05-03 09:33:21.000000000 +0200
@@ -10,6 +10,7 @@
+++ Document.m 2010-05-23 08:46:40.000000000 +0200
@@ -7,9 +7,12 @@
#include <math.h>
#include <time.h>
+#include <Foundation/NSCharacterSet.h>
#include <Foundation/NSFileManager.h>
+#include <Foundation/NSValue.h>
#include <AppKit/NSBezierPath.h>
#include <AppKit/NSFontManager.h>
+#include <AppKit/NSGraphics.h>

View File

@ -0,0 +1,10 @@
--- NNTPSource.m.orig 2004-03-03 00:58:37.000000000 +0100
+++ NNTPSource.m 2010-05-23 08:56:18.000000000 +0200
@@ -11,6 +11,7 @@
#include <Foundation/NSException.h>
#include <Foundation/NSBundle.h>
+#include <Foundation/NSDictionary.h>
#include "MsgDB.h"

View File

@ -0,0 +1,10 @@
--- Pref_Posting.m.orig 2004-03-03 00:58:37.000000000 +0100
+++ Pref_Posting.m 2010-05-23 08:54:51.000000000 +0200
@@ -5,6 +5,7 @@
#include <Foundation/NSObject.h>
#include <Foundation/NSString.h>
#include <Foundation/NSUserDefaults.h>
+#include <Foundation/NSBundle.h>
#include <GNUstepGUI/GSVbox.h>
#include <GNUstepGUI/GSHbox.h>
#include <AppKit/NSButton.h>

View File

@ -0,0 +1,10 @@
--- Source/AutoLayout/GSHBox.m.orig 2003-02-05 03:38:14.000000000 +0100
+++ Source/AutoLayout/GSHBox.m 2010-05-23 06:45:21.000000000 +0200
@@ -33,6 +33,7 @@
# include <Foundation/NSNotification.h>
# include <AppKit/NSBezierPath.h>
# include <AppKit/NSColor.h>
+# include <AppKit/NSGraphics.h>
#endif
#include "GSHBox.h"

View File

@ -1,10 +1,11 @@
--- Source/Markup/GSMarkupCoder.m.orig 2003-07-15 11:40:54.000000000 +0200
+++ Source/Markup/GSMarkupCoder.m 2008-05-02 18:18:37.000000000 +0200
@@ -31,6 +31,7 @@
# include <Foundation/Foundation.h>
# include "GNUstep.h"
+++ Source/Markup/GSMarkupCoder.m 2010-05-23 06:50:41.000000000 +0200
@@ -33,6 +33,8 @@
#else
+# include <Foundation/NSString.h>
# include <Foundation/NSArray.h>
# include <Foundation/NSData.h>
+# include <Foundation/NSString.h>
+# include <Foundation/NSDictionary.h>
#endif
/*

View File

@ -0,0 +1,10 @@
--- Source/TagLibrary/GSMarkupWindowController.m.orig 2003-01-26 05:41:50.000000000 +0100
+++ Source/TagLibrary/GSMarkupWindowController.m 2010-05-23 06:49:03.000000000 +0200
@@ -31,6 +31,7 @@
#ifdef GNUSTEP
# include <Foundation/NSArray.h>
# include <Foundation/NSBundle.h>
+# include <Foundation/NSDictionary.h>
# include <Foundation/NSString.h>
#else
# include <Foundation/Foundation.h>

View File

@ -0,0 +1,10 @@
--- Source/AutoLayout/GSVBox.m.orig 2003-02-05 03:38:14.000000000 +0100
+++ Source/AutoLayout/GSVBox.m 2010-05-23 06:45:31.000000000 +0200
@@ -33,6 +33,7 @@
# include <Foundation/NSNotification.h>
# include <AppKit/NSBezierPath.h>
# include <AppKit/NSColor.h>
+# include <AppKit/NSGraphics.h>
#endif
#include "GSVBox.h"

View File

@ -0,0 +1,14 @@
--- ServicesPrefs.m.orig 2008-05-25 21:48:19.000000000 +0200
+++ ServicesPrefs.m 2010-05-23 09:01:38.000000000 +0200
@@ -7,8 +7,11 @@
of the License. See COPYING or main.m for more information.
*/
+#include <Foundation/NSBundle.h>
+#include <Foundation/NSDictionary.h>
#include <Foundation/NSString.h>
#include <Foundation/NSUserDefaults.h>
+#include <Foundation/NSValue.h>
#include <AppKit/NSButton.h>
#include <AppKit/NSPopUpButton.h>
#include <AppKit/NSTextField.h>

View File

@ -0,0 +1,11 @@
--- TerminalParser_LinuxPrefs.m.orig 2008-05-25 21:48:19.000000000 +0200
+++ TerminalParser_LinuxPrefs.m 2010-05-23 09:08:25.000000000 +0200
@@ -7,6 +7,8 @@
of the License. See COPYING or main.m for more information.
*/
+#include <Foundation/NSBundle.h>
+#include <Foundation/NSNotification.h>
#include <Foundation/NSString.h>
#include <Foundation/NSUserDefaults.h>
#include <AppKit/NSPopUpButton.h>

View File

@ -0,0 +1,10 @@
--- TerminalView.m.orig 2009-08-05 19:28:45.000000000 +0200
+++ TerminalView.m 2010-05-23 09:03:04.000000000 +0200
@@ -70,6 +70,7 @@
#include <AppKit/NSGraphics.h>
#include <AppKit/NSScroller.h>
#include <AppKit/DPSOperators.h>
+#include <AppKit/NSButtonCell.h>
#include "TerminalView.h"

View File

@ -0,0 +1,11 @@
--- TerminalViewPrefs.m.orig 2009-11-24 22:45:33.000000000 +0100
+++ TerminalViewPrefs.m 2010-05-23 09:05:57.000000000 +0200
@@ -19,6 +19,8 @@
#include <AppKit/NSImage.h>
#include <AppKit/NSTextField.h>
#include <AppKit/NSFontManager.h>
+#include <AppKit/NSMatrix.h>
+#include <AppKit/NSButtonCell.h>
#include <GNUstepGUI/GSVbox.h>
#include <GNUstepGUI/GSHbox.h>
#include "Label.h"