Maintenance release to 0.24.1
This commit is contained in:
parent
29dc43ab81
commit
89963ee1ac
@ -1,15 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.39 2014/11/21 18:21:22 sebastia Exp $
|
||||
# $OpenBSD: Makefile,v 1.40 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
COMMENT= GNUstep gui library
|
||||
|
||||
DISTNAME = gnustep-gui-0.24.0
|
||||
REVISION = 1
|
||||
DISTNAME = gnustep-gui-0.24.1
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
# needs to follow gnustep-back backend versioning
|
||||
# cf. gnustep_backend_bundle() in ${WRKSRC}/Source/NSApplication.m
|
||||
SHARED_LIBS = gnustep-gui 0.24 # .0.23.1
|
||||
SHARED_LIBS = gnustep-gui 0.25 # .0.23.1
|
||||
|
||||
HOMEPAGE= http://www.gnustep.org/
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (gnustep/gnustep-gui-0.24.0.tar.gz) = r8vmYz0kqe5W7989W5kLe6qgt/YojSty/rIz5Zn70jQ=
|
||||
SIZE (gnustep/gnustep-gui-0.24.0.tar.gz) = 2816889
|
||||
SHA256 (gnustep/gnustep-gui-0.24.1.tar.gz) = p0lXPJnWaLgyMMxAuLIVsT1i55VhV5moc5gUBs8rtyg=
|
||||
SIZE (gnustep/gnustep-gui-0.24.1.tar.gz) = 2837611
|
||||
|
15
x11/gnustep/gui/patches/patch-Headers_AppKit_NSMenu_h
Normal file
15
x11/gnustep/gui/patches/patch-Headers_AppKit_NSMenu_h
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-Headers_AppKit_NSMenu_h,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38568
|
||||
|
||||
--- Headers/AppKit/NSMenu.h.orig Fri May 22 08:47:10 2015
|
||||
+++ Headers/AppKit/NSMenu.h Fri May 22 08:47:35 2015
|
||||
@@ -558,7 +558,7 @@
|
||||
|
||||
/** Returns an item located at index.
|
||||
*/
|
||||
-- (id <NSMenuItem>) itemAtIndex: (NSInteger)index;
|
||||
+- (NSMenuItem *) itemAtIndex: (NSInteger)index;
|
||||
|
||||
/** Informs the menu that the specified item has changed.
|
||||
*/
|
24
x11/gnustep/gui/patches/patch-Model_GMArchiver_m
Normal file
24
x11/gnustep/gui/patches/patch-Model_GMArchiver_m
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-Model_GMArchiver_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Model/GMArchiver.m.orig Fri May 22 09:35:12 2015
|
||||
+++ Model/GMArchiver.m Fri May 22 09:37:04 2015
|
||||
@@ -475,7 +475,7 @@
|
||||
- (void) encodeShort: (short)value withName: (NSString*)name
|
||||
{
|
||||
if (!findingConditionals && name) {
|
||||
- id valueString = [NSString stringWithFormat: @"%s", value];
|
||||
+ id valueString = [NSString stringWithFormat: @"%hd", value];
|
||||
|
||||
[lastObjectRepresentation setObject: valueString forKey: name];
|
||||
}
|
||||
@@ -511,7 +511,7 @@
|
||||
- (void) encodeLong: (long)value withName: (NSString*)name
|
||||
{
|
||||
if (!findingConditionals && name) {
|
||||
- id valueString = [NSString stringWithFormat: @"%l", value];
|
||||
+ id valueString = [NSString stringWithFormat: @"%ld", value];
|
||||
|
||||
[lastObjectRepresentation setObject: valueString forKey: name];
|
||||
}
|
15
x11/gnustep/gui/patches/patch-Source_GSDisplayServer_m
Normal file
15
x11/gnustep/gui/patches/patch-Source_GSDisplayServer_m
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-Source_GSDisplayServer_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Source/GSDisplayServer.m.orig Fri May 22 09:31:36 2015
|
||||
+++ Source/GSDisplayServer.m Fri May 22 09:32:18 2015
|
||||
@@ -1112,7 +1112,7 @@ GSCurrentServer(void)
|
||||
{
|
||||
NSEvent *event = events[i];
|
||||
|
||||
- NSLog(@"index %d %@", i, event);
|
||||
+ NSLog(@"index %lu %@", (unsigned long) i, event);
|
||||
}
|
||||
}
|
||||
else
|
51
x11/gnustep/gui/patches/patch-Source_GSXibLoader_m
Normal file
51
x11/gnustep/gui/patches/patch-Source_GSXibLoader_m
Normal file
@ -0,0 +1,51 @@
|
||||
$OpenBSD: patch-Source_GSXibLoader_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Source/GSXibLoader.m.orig Fri May 22 09:32:45 2015
|
||||
+++ Source/GSXibLoader.m Fri May 22 09:34:57 2015
|
||||
@@ -410,7 +410,7 @@
|
||||
__PRETTY_FUNCTION__,
|
||||
NSStringFromClass([self class])];
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: format];
|
||||
+ format: @"%@", format];
|
||||
}
|
||||
|
||||
// Load the connection ID....
|
||||
@@ -433,7 +433,7 @@
|
||||
NSString *format = [NSString stringWithFormat:@"%s:class: %@ - connection ID is missing or zero!",
|
||||
__PRETTY_FUNCTION__, NSStringFromClass([self class])];
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: format];
|
||||
+ format: @"%@", format];
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -442,7 +442,7 @@
|
||||
__PRETTY_FUNCTION__,
|
||||
NSStringFromClass([self class])];
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: format];
|
||||
+ format: @"%@", format];
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -582,7 +582,7 @@
|
||||
__PRETTY_FUNCTION__,
|
||||
NSStringFromClass([self class])];
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: format];
|
||||
+ format: @"%@", format];
|
||||
}
|
||||
|
||||
if ([coder containsValueForKey: @"object"])
|
||||
@@ -632,7 +632,7 @@
|
||||
|
||||
- (NSString *) description
|
||||
{
|
||||
- return [NSString stringWithFormat: @"<%@, %@, %@, %d>",
|
||||
+ return [NSString stringWithFormat: @"<%@, %@, %@, %p>",
|
||||
[self className],
|
||||
object,
|
||||
parent,
|
15
x11/gnustep/gui/patches/patch-Source_NSAnimation_m
Normal file
15
x11/gnustep/gui/patches/patch-Source_NSAnimation_m
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-Source_NSAnimation_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Source/NSAnimation.m.orig Fri May 22 08:43:30 2015
|
||||
+++ Source/NSAnimation.m Fri May 22 08:44:25 2015
|
||||
@@ -797,7 +797,7 @@ nsanimation_progressMarkSorter(NSAnimationProgress fir
|
||||
[delegate methodForSelector: @selector (animationShouldStart:)]
|
||||
: NULL;
|
||||
NSDebugMLLog(@"NSAnimationDelegate",
|
||||
- @"Delegation methods : %x %x %x %x %x",
|
||||
+ @"Delegation methods : %p %p %p %p %p",
|
||||
_delegate_animationDidReachProgressMark,
|
||||
_delegate_animationValueForProgress,
|
||||
_delegate_animationDidEnd,
|
@ -1,39 +1,14 @@
|
||||
$OpenBSD: patch-Source_NSBitmapImageRep+GIF_m,v 1.3 2015/03/28 17:03:32 sthen Exp $
|
||||
--- Source/NSBitmapImageRep+GIF.m.orig Sat Mar 28 17:02:14 2015
|
||||
+++ Source/NSBitmapImageRep+GIF.m Sat Mar 28 17:02:37 2015
|
||||
@@ -161,7 +161,7 @@ static int gs_gif_output(GifFileType *file, const GifB
|
||||
return NO;
|
||||
}
|
||||
|
||||
- DGifCloseFile(file);
|
||||
+ DGifCloseFile(file, NULL);
|
||||
return YES;
|
||||
}
|
||||
|
||||
@@ -180,7 +180,7 @@ static int gs_gif_output(GifFileType *file, const GifB
|
||||
SET_ERROR_MSG(msg); \
|
||||
if (file != NULL) \
|
||||
{\
|
||||
- DGifCloseFile(file); \
|
||||
+ DGifCloseFile(file, NULL); \
|
||||
}\
|
||||
if (imgBuffer != NULL) \
|
||||
{\
|
||||
@@ -392,7 +392,7 @@ static int gs_gif_output(GifFileType *file, const GifB
|
||||
withValue: [NSNumber numberWithInt: 0]];
|
||||
|
||||
/* don't forget to close the gif */
|
||||
- DGifCloseFile(file);
|
||||
+ DGifCloseFile(file, NULL);
|
||||
|
||||
return self;
|
||||
}
|
||||
@@ -560,7 +560,7 @@ static int gs_gif_output(GifFileType *file, const GifB
|
||||
}
|
||||
GIFImageP += width;
|
||||
}
|
||||
- status = EGifCloseFile(GIFFile);
|
||||
+ status = EGifCloseFile(GIFFile, NULL);
|
||||
|
||||
free(GIFImage);
|
||||
$OpenBSD: patch-Source_NSBitmapImageRep+GIF_m,v 1.4 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38544
|
||||
|
||||
--- Source/NSBitmapImageRep+GIF.m.orig Mon May 25 19:30:24 2015
|
||||
+++ Source/NSBitmapImageRep+GIF.m Mon May 25 19:30:40 2015
|
||||
@@ -64,6 +64,7 @@ objective-c headers.
|
||||
// GIF> 5.1
|
||||
#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
|
||||
#define DGifCloseFile(f) DGifCloseFile(f, NULL)
|
||||
+ #define EGifCloseFile(f) EGifCloseFile(f, NULL)
|
||||
#endif
|
||||
|
||||
/* -----------------------------------------------------------
|
||||
|
17
x11/gnustep/gui/patches/patch-Source_NSCachedImageRep_m
Normal file
17
x11/gnustep/gui/patches/patch-Source_NSCachedImageRep_m
Normal file
@ -0,0 +1,17 @@
|
||||
$OpenBSD: patch-Source_NSCachedImageRep_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Source/NSCachedImageRep.m.orig Fri May 22 08:49:07 2015
|
||||
+++ Source/NSCachedImageRep.m Fri May 22 08:54:48 2015
|
||||
@@ -93,8 +93,8 @@
|
||||
pixelsWide <= 0 || pixelsHigh <= 0)
|
||||
{
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: @"NSCachedImageRep created with size %@ pixelsWide %d pixelsHigh %d",
|
||||
- NSStringFromSize(aSize), pixelsWide, pixelsHigh];
|
||||
+ format: @"NSCachedImageRep created with size %@ pixelsWide %li pixelsHigh %li",
|
||||
+ NSStringFromSize(aSize), (long int) pixelsWide, (long int) pixelsHigh];
|
||||
}
|
||||
|
||||
// FIXME: Only create new window when separate is YES
|
124
x11/gnustep/gui/patches/patch-Source_NSEvent_m
Normal file
124
x11/gnustep/gui/patches/patch-Source_NSEvent_m
Normal file
@ -0,0 +1,124 @@
|
||||
$OpenBSD: patch-Source_NSEvent_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Source/NSEvent.m.orig Fri May 22 08:55:02 2015
|
||||
+++ Source/NSEvent.m Fri May 22 09:06:56 2015
|
||||
@@ -289,7 +289,7 @@ static Class eventClass;
|
||||
if ([dict objectForKey: timerKey])
|
||||
[NSException raise: NSInternalInconsistencyException
|
||||
format: @"Periodic events are already being generated for "
|
||||
- @"this thread %x", GSCurrentThread()];
|
||||
+ @"this thread %p", GSCurrentThread()];
|
||||
|
||||
/*
|
||||
* Register a timer that will fire in delaySeconds.
|
||||
@@ -609,25 +609,26 @@ static const char *eventTypes[] = {
|
||||
case NSRightMouseDown:
|
||||
case NSRightMouseUp:
|
||||
return [NSString stringWithFormat:
|
||||
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
|
||||
- @" time = %f, window = %d, dpsContext = %p,"
|
||||
- @" event number = %d, click = %d, pressure = %f",
|
||||
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
|
||||
+ @" time = %f, window = %ld, dpsContext = %p,"
|
||||
+ @" event number = %ld, click = %ld, pressure = %f",
|
||||
eventTypes[event_type], location_point.x, location_point.y,
|
||||
- modifier_flags, event_time, window_num, event_context,
|
||||
- event_data.mouse.event_num, event_data.mouse.click,
|
||||
+ (unsigned long) modifier_flags, event_time, (long) window_num,
|
||||
+ event_context, (long int) event_data.mouse.event_num,
|
||||
+ (long int) event_data.mouse.click,
|
||||
event_data.mouse.pressure];
|
||||
break;
|
||||
|
||||
case NSMouseEntered:
|
||||
case NSMouseExited:
|
||||
return [NSString stringWithFormat:
|
||||
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
|
||||
- @" time = %f, window = %d, dpsContext = %p, "
|
||||
- @" event number = %d, tracking number = %d, user data = %p",
|
||||
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
|
||||
+ @" time = %f, window = %ld, dpsContext = %p, "
|
||||
+ @" event number = %ld, tracking number = %ld, user data = %p",
|
||||
eventTypes[event_type], location_point.x, location_point.y,
|
||||
- modifier_flags, event_time, window_num, event_context,
|
||||
- event_data.tracking.event_num,
|
||||
- event_data.tracking.tracking_num,
|
||||
+ (unsigned long) modifier_flags, event_time, (long) window_num, event_context,
|
||||
+ (long) event_data.tracking.event_num,
|
||||
+ (long) event_data.tracking.tracking_num,
|
||||
event_data.tracking.user_data];
|
||||
break;
|
||||
|
||||
@@ -635,11 +636,11 @@ static const char *eventTypes[] = {
|
||||
case NSKeyUp:
|
||||
case NSFlagsChanged:
|
||||
return [NSString stringWithFormat:
|
||||
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
|
||||
- @" time = %f, window = %d, dpsContext = %p, "
|
||||
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
|
||||
+ @" time = %f, window = %ld, dpsContext = %p, "
|
||||
@" repeat = %s, keys = %@, ukeys = %@, keyCode = 0x%x",
|
||||
eventTypes[event_type], location_point.x, location_point.y,
|
||||
- modifier_flags, event_time, window_num, event_context,
|
||||
+ (unsigned long) modifier_flags, event_time, (long) window_num, event_context,
|
||||
(event_data.key.repeat ? "YES" : "NO"),
|
||||
event_data.key.char_keys, event_data.key.unmodified_keys,
|
||||
event_data.key.key_code];
|
||||
@@ -651,13 +652,13 @@ static const char *eventTypes[] = {
|
||||
case NSSystemDefined:
|
||||
case NSApplicationDefined:
|
||||
return [NSString stringWithFormat:
|
||||
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
|
||||
- @" time = %f, window = %d, dpsContext = %p, "
|
||||
- @" subtype = %d, data1 = %p, data2 = %p",
|
||||
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
|
||||
+ @" time = %f, window = %ld, dpsContext = %p, "
|
||||
+ @" subtype = %d, data1 = %lx, data2 = %lx",
|
||||
eventTypes[event_type], location_point.x, location_point.y,
|
||||
- modifier_flags, event_time, window_num, event_context,
|
||||
- event_data.misc.sub_type, event_data.misc.data1,
|
||||
- event_data.misc.data2];
|
||||
+ (unsigned long) modifier_flags, event_time, (long) window_num, event_context,
|
||||
+ event_data.misc.sub_type, (long) event_data.misc.data1,
|
||||
+ (long) event_data.misc.data2];
|
||||
break;
|
||||
|
||||
case NSScrollWheel:
|
||||
@@ -666,14 +667,14 @@ static const char *eventTypes[] = {
|
||||
case NSOtherMouseDragged:
|
||||
case NSRightMouseDragged:
|
||||
return [NSString stringWithFormat:
|
||||
- @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
|
||||
- @" time = %f, window = %d, dpsContext = %p,"
|
||||
- @" event number = %d, click = %d, pressure = %f"
|
||||
- @" button = %d, deltaX = %f, deltaY = %f, deltaZ = %f",
|
||||
+ @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
|
||||
+ @" time = %f, window = %ld, dpsContext = %p,"
|
||||
+ @" event number = %ld, click = %ld, pressure = %f"
|
||||
+ @" button = %ld, deltaX = %f, deltaY = %f, deltaZ = %f",
|
||||
eventTypes[event_type], location_point.x, location_point.y,
|
||||
- modifier_flags, event_time, window_num, event_context,
|
||||
- event_data.mouse.event_num, event_data.mouse.click,
|
||||
- event_data.mouse.pressure, event_data.mouse.button,
|
||||
+ (unsigned long) modifier_flags, event_time, (long) window_num, event_context,
|
||||
+ (long ) event_data.mouse.event_num, (long) event_data.mouse.click,
|
||||
+ event_data.mouse.pressure, (long) event_data.mouse.button,
|
||||
event_data.mouse.deltaX,
|
||||
event_data.mouse.deltaY,
|
||||
event_data.mouse.deltaZ];
|
||||
@@ -686,10 +687,10 @@ static const char *eventTypes[] = {
|
||||
|
||||
default:
|
||||
return [NSString stringWithFormat:
|
||||
- @"NSEvent: eventType = UNKNOWN!, point = { %f, %f }, modifiers = %u,"
|
||||
- @" time = %f, window = %d",
|
||||
+ @"NSEvent: eventType = UNKNOWN!, point = { %f, %f }, modifiers = %lu,"
|
||||
+ @" time = %f, window = %ld",
|
||||
location_point.x, location_point.y,
|
||||
- modifier_flags, event_time, window_num];
|
||||
+ (unsigned long) modifier_flags, event_time, (long) window_num];
|
||||
break;
|
||||
}
|
||||
|
15
x11/gnustep/gui/patches/patch-Source_NSGradient_m
Normal file
15
x11/gnustep/gui/patches/patch-Source_NSGradient_m
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-Source_NSGradient_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38572
|
||||
|
||||
--- Source/NSGradient.m.orig Fri May 22 09:07:07 2015
|
||||
+++ Source/NSGradient.m Fri May 22 09:09:51 2015
|
||||
@@ -334,7 +334,7 @@ relativeCenterPosition: (NSPoint)relativeCenterPoint
|
||||
startPoint = NSMakePoint(NSMinX(rect), NSMaxY(rect));
|
||||
}
|
||||
rad = PI * angle / 180;
|
||||
- length = abs(NSWidth(rect) * cos(rad) + NSHeight(rect) * sin(rad));
|
||||
+ length = fabs(NSWidth(rect) * cos(rad) + NSHeight(rect) * sin(rad));
|
||||
endPoint = NSMakePoint(startPoint.x + length * cos(rad),
|
||||
startPoint.y + length * sin(rad));
|
||||
|
15
x11/gnustep/gui/patches/patch-Source_NSMenu_m
Normal file
15
x11/gnustep/gui/patches/patch-Source_NSMenu_m
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-Source_NSMenu_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38568
|
||||
|
||||
--- Source/NSMenu.m.orig Fri May 22 08:47:47 2015
|
||||
+++ Source/NSMenu.m Fri May 22 08:48:21 2015
|
||||
@@ -894,7 +894,7 @@ static BOOL menuBarVisible = YES;
|
||||
return nil;
|
||||
}
|
||||
|
||||
-- (id <NSMenuItem>) itemAtIndex: (NSInteger)index
|
||||
+- (NSMenuItem *) itemAtIndex: (NSInteger)index
|
||||
{
|
||||
if (index >= [_items count] || index < 0)
|
||||
[NSException raise: NSRangeException
|
18
x11/gnustep/gui/patches/patch-Source_NSPrintPanel_m
Normal file
18
x11/gnustep/gui/patches/patch-Source_NSPrintPanel_m
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-Source_NSPrintPanel_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Source/NSPrintPanel.m.orig Fri May 22 09:14:22 2015
|
||||
+++ Source/NSPrintPanel.m Fri May 22 09:16:28 2015
|
||||
@@ -462,9 +462,9 @@ static NSPrintPanel *shared_instance = nil;
|
||||
else
|
||||
{
|
||||
NSString *str;
|
||||
- str = [NSString stringWithFormat: @"%d", _pages.location];
|
||||
+ str = [NSString stringWithFormat: @"%lu", (unsigned long) _pages.location];
|
||||
[[fromRangeForm cellAtIndex: 0] setStringValue: str];
|
||||
- str = [NSString stringWithFormat: @"%d", NSMaxRange(_pages)-1];
|
||||
+ str = [NSString stringWithFormat: @"%lu", (unsigned long) NSMaxRange(_pages)-1];
|
||||
[[toRangeForm cellAtIndex: 0] setStringValue: str];
|
||||
}
|
||||
}
|
24
x11/gnustep/gui/patches/patch-Source_NSSplitView_m
Normal file
24
x11/gnustep/gui/patches/patch-Source_NSSplitView_m
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-Source_NSSplitView_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Source/NSSplitView.m.orig Wed Sep 18 01:19:12 2013
|
||||
+++ Source/NSSplitView.m Sun May 24 19:03:32 2015
|
||||
@@ -150,7 +150,7 @@ static NSNotificationCenter *nc = nil;
|
||||
{
|
||||
proportion = (NSWidth(frames[i]))/oldTotal;
|
||||
}
|
||||
- key = [NSString stringWithFormat: @"%u", i];
|
||||
+ key = [NSString stringWithFormat: @"%lu", (unsigned long) i];
|
||||
[config setObject: [NSNumber numberWithDouble: proportion]
|
||||
forKey: key];
|
||||
}
|
||||
@@ -829,7 +829,7 @@ static NSNotificationCenter *nc = nil;
|
||||
NSNumber *proportion;
|
||||
NSString *key;
|
||||
|
||||
- key = [NSString stringWithFormat: @"%u", i];
|
||||
+ key = [NSString stringWithFormat: @"%lu", (unsigned long) i];
|
||||
proportion = [config objectForKey: key];
|
||||
if (proportion == nil)
|
||||
{
|
42
x11/gnustep/gui/patches/patch-Source_NSTextBlock_m
Normal file
42
x11/gnustep/gui/patches/patch-Source_NSTextBlock_m
Normal file
@ -0,0 +1,42 @@
|
||||
$OpenBSD: patch-Source_NSTextBlock_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Source/NSTextBlock.m.orig Fri May 22 09:17:53 2015
|
||||
+++ Source/NSTextBlock.m Fri May 22 09:19:54 2015
|
||||
@@ -72,7 +72,7 @@
|
||||
{
|
||||
if (edge >= sizeof(_borderColorForEdge) / sizeof(_borderColorForEdge[0]))
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: @"invalid edge %d", edge];
|
||||
+ format: @"invalid edge %lu", (unsigned long) edge];
|
||||
ASSIGN(_borderColorForEdge[edge], color);
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
format: @"invalid layer %d", layer];
|
||||
if (edge >= sizeof(_width[0]) / sizeof(_width[0][0]))
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: @"invalid edge %d", edge];
|
||||
+ format: @"invalid edge %lu", (unsigned long) edge];
|
||||
return _width[layer][edge];
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
format: @"invalid layer %d", layer];
|
||||
if (edge >= sizeof(_width[0]) / sizeof(_width[0][0]))
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: @"invalid edge %d", edge];
|
||||
+ format: @"invalid edge %lu", (unsigned long) edge];
|
||||
return _widthType[layer][edge];
|
||||
}
|
||||
|
||||
@@ -193,7 +193,7 @@
|
||||
format: @"invalid layer %d", layer];
|
||||
if (edge >= sizeof(_width[0]) / sizeof(_width[0][0]))
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: @"invalid edge %d", edge];
|
||||
+ format: @"invalid edge %lu", (unsigned long) edge];
|
||||
_width[layer][edge] = val;
|
||||
_widthType[layer][edge] = type;
|
||||
}
|
36
x11/gnustep/gui/patches/patch-Source_NSTextContainer_m
Normal file
36
x11/gnustep/gui/patches/patch-Source_NSTextContainer_m
Normal file
@ -0,0 +1,36 @@
|
||||
$OpenBSD: patch-Source_NSTextContainer_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38567
|
||||
|
||||
--- Source/NSTextContainer.m.orig Fri May 22 09:20:04 2015
|
||||
+++ Source/NSTextContainer.m Fri May 22 09:23:44 2015
|
||||
@@ -96,12 +96,12 @@ use bounds rectangle instead of frame? */
|
||||
NSDebugLLog(@"NSText", @"NSTextContainer initWithContainerSize");
|
||||
if (aSize.width < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative width", 0);
|
||||
+ NSWarnMLog(@"given negative width");
|
||||
aSize.width = 0;
|
||||
}
|
||||
if (aSize.height < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative height", 0);
|
||||
+ NSWarnMLog(@"given negative height");
|
||||
aSize.height = 0;
|
||||
}
|
||||
_layoutManager = nil;
|
||||
@@ -246,12 +246,12 @@ framework intact.
|
||||
|
||||
if (aSize.width < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative width", 0);
|
||||
+ NSWarnMLog(@"given negative width");
|
||||
aSize.width = 0;
|
||||
}
|
||||
if (aSize.height < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative height", 0);
|
||||
+ NSWarnMLog(@"given negative height");
|
||||
aSize.height = 0;
|
||||
}
|
||||
|
24
x11/gnustep/gui/patches/patch-Source_NSToolbarItem_m
Normal file
24
x11/gnustep/gui/patches/patch-Source_NSToolbarItem_m
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-Source_NSToolbarItem_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38569
|
||||
|
||||
--- Source/NSToolbarItem.m.orig Fri May 22 09:23:58 2015
|
||||
+++ Source/NSToolbarItem.m Fri May 22 09:25:09 2015
|
||||
@@ -287,7 +287,7 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovable
|
||||
index = [toolbar _indexOfItem: _toolbarItem];
|
||||
}
|
||||
[GSToolbarView setDraggedItemIndex:index];
|
||||
- [pboard setString: [NSString stringWithFormat:@"%d", index]
|
||||
+ [pboard setString: [NSString stringWithFormat:@"%ld", (long) index]
|
||||
forType: GSMovableToolbarItemPboardType];
|
||||
|
||||
[self dragImage: image
|
||||
@@ -777,7 +777,7 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovable
|
||||
index = [toolbar _indexOfItem: _toolbarItem];
|
||||
}
|
||||
[GSToolbarView setDraggedItemIndex:index];
|
||||
- [pboard setString: [NSString stringWithFormat:@"%d", index]
|
||||
+ [pboard setString: [NSString stringWithFormat:@"%ld", (long) index]
|
||||
forType: GSMovableToolbarItemPboardType];
|
||||
|
||||
[self dragImage: image
|
96
x11/gnustep/gui/patches/patch-Source_NSView_m
Normal file
96
x11/gnustep/gui/patches/patch-Source_NSView_m
Normal file
@ -0,0 +1,96 @@
|
||||
$OpenBSD: patch-Source_NSView_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38567
|
||||
|
||||
--- Source/NSView.m.orig Fri May 22 09:25:21 2015
|
||||
+++ Source/NSView.m Fri May 22 09:27:21 2015
|
||||
@@ -595,12 +595,12 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
||||
|
||||
if (frameRect.size.width < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative width", 0);
|
||||
+ NSWarnMLog(@"given negative width");
|
||||
frameRect.size.width = 0;
|
||||
}
|
||||
if (frameRect.size.height < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative height", 0);
|
||||
+ NSWarnMLog(@"given negative height");
|
||||
frameRect.size.height = 0;
|
||||
}
|
||||
_frame = frameRect; // Set frame rectangle
|
||||
@@ -1178,12 +1178,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
|
||||
|
||||
if (frameRect.size.width < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative width", 0);
|
||||
+ NSWarnMLog(@"given negative width");
|
||||
frameRect.size.width = 0;
|
||||
}
|
||||
if (frameRect.size.height < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative height", 0);
|
||||
+ NSWarnMLog(@"given negative height");
|
||||
frameRect.size.height = 0;
|
||||
}
|
||||
|
||||
@@ -1259,12 +1259,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
|
||||
NSRect newFrame = _frame;
|
||||
if (newSize.width < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative width", 0);
|
||||
+ NSWarnMLog(@"given negative width");
|
||||
newSize.width = 0;
|
||||
}
|
||||
if (newSize.height < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative height", 0);
|
||||
+ NSWarnMLog(@"given negative height");
|
||||
newSize.height = 0;
|
||||
}
|
||||
if (NSEqualSizes(_frame.size, newSize) == NO)
|
||||
@@ -1385,12 +1385,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
|
||||
NSDebugLLog(@"NSView", @"setBounds %@", NSStringFromRect(aRect));
|
||||
if (aRect.size.width < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative width", 0);
|
||||
+ NSWarnMLog(@"given negative width");
|
||||
aRect.size.width = 0;
|
||||
}
|
||||
if (aRect.size.height < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative height", 0);
|
||||
+ NSWarnMLog(@"given negative height");
|
||||
aRect.size.height = 0;
|
||||
}
|
||||
|
||||
@@ -1479,12 +1479,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
|
||||
|
||||
if (newSize.width < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative width", 0);
|
||||
+ NSWarnMLog(@"given negative width");
|
||||
newSize.width = 0;
|
||||
}
|
||||
if (newSize.height < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative height", 0);
|
||||
+ NSWarnMLog(@"given negative height");
|
||||
newSize.height = 0;
|
||||
}
|
||||
|
||||
@@ -1570,12 +1570,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
|
||||
{
|
||||
if (newSize.width < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative width", 0);
|
||||
+ NSWarnMLog(@"given negative width");
|
||||
newSize.width = 0;
|
||||
}
|
||||
if (newSize.height < 0)
|
||||
{
|
||||
- NSWarnMLog(@"given negative height", 0);
|
||||
+ NSWarnMLog(@"given negative height");
|
||||
newSize.height = 0;
|
||||
}
|
||||
|
47
x11/gnustep/gui/patches/patch-Source_NSWindow_m
Normal file
47
x11/gnustep/gui/patches/patch-Source_NSWindow_m
Normal file
@ -0,0 +1,47 @@
|
||||
$OpenBSD: patch-Source_NSWindow_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38572
|
||||
|
||||
--- Source/NSWindow.m.orig Fri Dec 26 08:59:29 2014
|
||||
+++ Source/NSWindow.m Sun May 24 19:06:15 2015
|
||||
@@ -889,8 +889,8 @@ many times.
|
||||
|
||||
- (NSString*) description
|
||||
{
|
||||
- return [[super description] stringByAppendingFormat: @"Number: %d Title: %@",
|
||||
- [self windowNumber], [self title]];
|
||||
+ return [[super description] stringByAppendingFormat: @"Number: %ld Title: %@",
|
||||
+ (long) [self windowNumber], [self title]];
|
||||
}
|
||||
|
||||
- (void) _startBackendWindow
|
||||
@@ -2066,10 +2066,10 @@ titleWithRepresentedFilename(NSString *representedFile
|
||||
}
|
||||
|
||||
// Find the biggest difference
|
||||
- maxDiff = abs(newFrame.origin.x - _frame.origin.x);
|
||||
- maxDiff = MAX(maxDiff, abs(newFrame.origin.y - _frame.origin.y));
|
||||
- maxDiff = MAX(maxDiff, abs(newFrame.size.width - _frame.size.width));
|
||||
- maxDiff = MAX(maxDiff, abs(newFrame.size.height - _frame.size.height));
|
||||
+ maxDiff = fabs(newFrame.origin.x - _frame.origin.x);
|
||||
+ maxDiff = MAX(maxDiff, fabs(newFrame.origin.y - _frame.origin.y));
|
||||
+ maxDiff = MAX(maxDiff, fabs(newFrame.size.width - _frame.size.width));
|
||||
+ maxDiff = MAX(maxDiff, fabs(newFrame.size.height - _frame.size.height));
|
||||
|
||||
return (maxDiff * resizeTime) / 150;
|
||||
}
|
||||
@@ -5115,10 +5115,10 @@ current key view.<br />
|
||||
maxRect = [self constrainFrameRect: maxRect toScreen: [self screen]];
|
||||
|
||||
// Compare the new frame with the current one
|
||||
- if ((abs(NSMaxX(maxRect) - NSMaxX(_frame)) < DIST)
|
||||
- && (abs(NSMaxY(maxRect) - NSMaxY(_frame)) < DIST)
|
||||
- && (abs(NSMinX(maxRect) - NSMinX(_frame)) < DIST)
|
||||
- && (abs(NSMinY(maxRect) - NSMinY(_frame)) < DIST))
|
||||
+ if ((fabs(NSMaxX(maxRect) - NSMaxX(_frame)) < DIST)
|
||||
+ && (fabs(NSMaxY(maxRect) - NSMaxY(_frame)) < DIST)
|
||||
+ && (fabs(NSMinX(maxRect) - NSMinX(_frame)) < DIST)
|
||||
+ && (fabs(NSMinY(maxRect) - NSMinY(_frame)) < DIST))
|
||||
{
|
||||
// Already in zoomed mode, reset user frame, if stored
|
||||
if (_autosaveName != nil)
|
@ -0,0 +1,29 @@
|
||||
$OpenBSD: patch-TextConverters_RTF_RTFConsumer_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
|
||||
|
||||
upstream svn #38570
|
||||
|
||||
--- TextConverters/RTF/RTFConsumer.m.orig Fri May 22 09:37:14 2015
|
||||
+++ TextConverters/RTF/RTFConsumer.m Fri May 22 09:38:13 2015
|
||||
@@ -941,8 +941,8 @@ void GSRTFregisterFont (void *ctxt, const char *fontNa
|
||||
if (!fontName || !*fontName)
|
||||
{
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: @"Error in RTF (font omitted?), position:%d",
|
||||
- TEXTPOSITION];
|
||||
+ format: @"Error in RTF (font omitted?), position:%lu",
|
||||
+ (unsigned long) TEXTPOSITION];
|
||||
}
|
||||
// exclude trailing ';' from fontName
|
||||
if (';' == fontName[strlen(fontName)-1])
|
||||
@@ -967,9 +967,9 @@ void GSRTFfontNumber (void *ctxt, int fontNumber)
|
||||
{
|
||||
/* we're about to set an unknown font */
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
- format: @"Error in RTF (referring to undefined font \\f%d), position:%d",
|
||||
+ format: @"Error in RTF (referring to undefined font \\f%d), position:%lu",
|
||||
fontNumber,
|
||||
- TEXTPOSITION];
|
||||
+ (unsigned long) TEXTPOSITION];
|
||||
}
|
||||
else
|
||||
{
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.11 2014/01/03 18:55:36 sebastia Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.12 2015/05/28 18:38:16 sebastia Exp $
|
||||
bin/GSSpeechServer
|
||||
@bin bin/gclose
|
||||
@bin bin/gcloseall
|
||||
@ -49,7 +49,10 @@ include/AppKit/GSTypesetter.h
|
||||
include/AppKit/GSVbox.h
|
||||
include/AppKit/GSVersion.h
|
||||
include/AppKit/GSWindowDecorationView.h
|
||||
include/AppKit/GSXibElement.h
|
||||
include/AppKit/GSXibLoading.h
|
||||
include/AppKit/GSXibObjectContainer.h
|
||||
include/AppKit/GSXibParser.h
|
||||
include/AppKit/IMConnectors.h
|
||||
include/AppKit/IMCustomObject.h
|
||||
include/AppKit/IMLoading.h
|
||||
@ -245,7 +248,10 @@ include/GNUstepGUI/GSTypesetter.h
|
||||
include/GNUstepGUI/GSVbox.h
|
||||
include/GNUstepGUI/GSVersion.h
|
||||
include/GNUstepGUI/GSWindowDecorationView.h
|
||||
include/GNUstepGUI/GSXibElement.h
|
||||
include/GNUstepGUI/GSXibLoading.h
|
||||
include/GNUstepGUI/GSXibObjectContainer.h
|
||||
include/GNUstepGUI/GSXibParser.h
|
||||
include/GNUstepGUI/IMConnectors.h
|
||||
include/GNUstepGUI/IMCustomObject.h
|
||||
include/GNUstepGUI/IMLoading.h
|
||||
@ -288,7 +294,10 @@ include/gnustep/gui/GSTypesetter.h
|
||||
include/gnustep/gui/GSVbox.h
|
||||
include/gnustep/gui/GSVersion.h
|
||||
include/gnustep/gui/GSWindowDecorationView.h
|
||||
include/gnustep/gui/GSXibElement.h
|
||||
include/gnustep/gui/GSXibLoading.h
|
||||
include/gnustep/gui/GSXibObjectContainer.h
|
||||
include/gnustep/gui/GSXibParser.h
|
||||
include/gnustep/gui/IMConnectors.h
|
||||
include/gnustep/gui/IMCustomObject.h
|
||||
include/gnustep/gui/IMLoading.h
|
||||
@ -365,6 +374,7 @@ lib/GNUstep/Images/MagnifyGlass.tiff
|
||||
lib/GNUstep/Images/NSAddTemplate.tiff
|
||||
lib/GNUstep/Images/NSComboArrow.tiff
|
||||
lib/GNUstep/Images/NSRatingLevelIndicator.tiff
|
||||
lib/GNUstep/Images/NSRemoveTemplate.tiff
|
||||
lib/GNUstep/Images/common_2DCheckMark.tiff
|
||||
lib/GNUstep/Images/common_2DDash.tiff
|
||||
lib/GNUstep/Images/common_3DArrowDown.tiff
|
||||
|
Loading…
x
Reference in New Issue
Block a user