Update to 0.26.2

This commit is contained in:
sebastia 2018-01-05 08:00:09 +00:00
parent ad7b416154
commit ee3978666e
12 changed files with 21 additions and 166 deletions

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.49 2017/07/26 22:45:33 sthen Exp $
# $OpenBSD: Makefile,v 1.50 2018/01/05 08:00:09 sebastia Exp $
COMMENT= GNUstep gui library
DISTNAME = gnustep-gui-0.25.1
REVISION = 1
DISTNAME = gnustep-gui-0.26.2
CATEGORIES= devel
# needs to follow gnustep-back backend versioning
# cf. gnustep_backend_bundle() in ${WRKSRC}/Source/NSApplication.m
SHARED_LIBS = gnustep-gui 0.27
SHARED_LIBS = gnustep-gui 0.28
HOMEPAGE= http://www.gnustep.org/

View File

@ -1,2 +1,2 @@
SHA256 (gnustep/gnustep-gui-0.25.1.tar.gz) = Oqyyd5dgFM/UOUCEBmGHQwEAZX3qI02pHZrlAV50fGY=
SIZE (gnustep/gnustep-gui-0.25.1.tar.gz) = 2888779
SHA256 (gnustep/gnustep-gui-0.26.2.tar.gz) = rG/Wo+hKkHFyON+PaLVk4Nm19F2l9I4wfENBaV2cS7c=
SIZE (gnustep/gnustep-gui-0.26.2.tar.gz) = 2860931

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-Model_IMLoading_m,v 1.1 2017/04/19 21:23:20 sebastia Exp $
from upstream, fix warning
--- Model/IMLoading.m.orig Thu Feb 24 14:34:21 2011
+++ Model/IMLoading.m Wed Apr 19 08:18:14 2017
@@ -43,7 +43,6 @@
void __dummy_IMLoading_functionForLinking()
{
- __dummy_IMLoading_functionForLinking();
}
@implementation GMModel
@@ -207,18 +206,3 @@ BOOL _fileOwnerDecoded = NO;
}
@end /* GMModel */
-
-
-#if GNU_RUNTIME
-#include "IMConnectors.h"
-
-__attribute__((unused))
-static void __dummyFunctionForLinking (void)
-{
- [IMCustomObject new];
- [IMConnector new];
-
- __dummyFunctionForLinking();
-}
-
-#endif

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-Printing_GSCUPS_GSCUPSPrintInfo_m,v 1.1 2013/05/15 15:36:11 sebastia Exp $
Fixing bad assumption in cups
--- Printing/GSCUPS/GSCUPSPrintInfo.m.orig Thu May 2 17:18:50 2013
+++ Printing/GSCUPS/GSCUPSPrintInfo.m Thu May 2 17:19:16 2013
@@ -32,7 +32,9 @@
#import "AppKit/NSPrinter.h"
#import "GSCUPSPrintInfo.h"
#import "GSCUPSPrinter.h"
+#undef __BLOCKS__
#include <cups/cups.h>
+#define __BLOCKS__
@implementation GSCUPSPrintInfo

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-Printing_GSCUPS_GSCUPSPrintOperation_m,v 1.1 2013/05/15 15:36:11 sebastia Exp $
fix against wrong assumption in cups
--- Printing/GSCUPS/GSCUPSPrintOperation.m.orig Thu May 2 17:21:04 2013
+++ Printing/GSCUPS/GSCUPSPrintOperation.m Thu May 2 17:21:23 2013
@@ -41,7 +41,9 @@
#import <AppKit/NSPrintOperation.h>
#import "GSGuiPrivate.h"
#import "GSCUPSPrintOperation.h"
+#undef __BLOCKS__
#include <cups/cups.h>
+#define __BLOCKS__
//A subclass of GSPrintOperation, NOT NSPrintOperation.

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-Printing_GSCUPS_GSCUPSPrinter_m,v 1.2 2017/04/19 21:23:20 sebastia Exp $
fix implicit declaration warning, from upstream
--- Printing/GSCUPS/GSCUPSPrinter.m.orig Wed Apr 19 08:33:22 2017
+++ Printing/GSCUPS/GSCUPSPrinter.m Wed Apr 19 08:32:25 2017
@@ -49,6 +49,7 @@
#import "GSCUPSPrinter.h"
#include <cups/cups.h>
+#include <cups/ppd.h>
NSString *GSCUPSDummyPrinterName = @"GSCUPSDummyPrinter";

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-Source_GSTextStorage_m,v 1.1 2017/04/19 21:23:20 sebastia Exp $
from upstream, fix warning
--- Source/GSTextStorage.m.orig Sat Jan 31 19:19:29 2015
+++ Source/GSTextStorage.m Wed Apr 19 08:18:14 2017
@@ -89,7 +89,7 @@ cacheEqual(id A, id B)
static NSDictionary *blank;
static NSLock *attrLock = nil;
-static __strong GSIMapTable_t attrMap;
+static GSIMapTable_t attrMap;
static SEL lockSel;
static SEL unlockSel;
static IMP lockImp;

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-Source_GSToolbarView_m,v 1.1 2017/04/19 21:23:20 sebastia Exp $
from upstream, fix warning
--- Source/GSToolbarView.m.orig Sat Dec 17 01:00:19 2016
+++ Source/GSToolbarView.m Wed Apr 19 08:18:14 2017
@@ -63,9 +63,6 @@ static const int InsetItemViewX = 10;
static const int ClippedItemsViewWidth = 28;
-// Internal
-static const int current_version = 1;
-
static NSUInteger draggedItemIndex = NSNotFound;
/*
@@ -270,12 +267,12 @@ static NSUInteger draggedItemIndex = NSNotFound;
if (draggedItemIndex == NSNotFound)
{
//simply locate the nearest location between existing items
- for (index=0; index < [visibleBackViews count]; index++)
+ for (index = 0; index < [visibleBackViews count]; index++)
{
NSRect itemRect = [[visibleBackViews objectAtIndex:index] frame];
if (location.x < (itemRect.origin.x + (itemRect.size.width/2)))
{
- NSLog(@"AT location %d", index);
+ NSLog(@"At location %lu", (unsigned long)index);
return index;
}
}

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-Source_NSLayoutManager_m,v 1.1 2017/04/19 21:23:20 sebastia Exp $
from upstream, fix warning
--- Source/NSLayoutManager.m.orig Sun Oct 23 22:13:37 2016
+++ Source/NSLayoutManager.m Wed Apr 19 08:18:14 2017
@@ -1815,7 +1815,7 @@ attachmentSize(linefrag_t *lf, NSUInteger glyphIndex)
unsigned int char_index =
[self characterRangeForGlyphRange: NSMakeRange(g, 1)
actualGlyphRange: NULL].location;
- NSObject<NSTextAttachmentCell> *cell = [[_textStorage attribute: NSAttachmentAttributeName
+ id<NSTextAttachmentCell> cell = [[_textStorage attribute: NSAttachmentAttributeName
atIndex: char_index
effectiveRange: NULL] attachmentCell];
NSRect cellFrame;

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-Source_NSTableView_m,v 1.1 2017/04/19 21:23:20 sebastia Exp $
from upstream, fix warning
--- Source/NSTableView.m.orig Sun Dec 18 12:58:31 2016
+++ Source/NSTableView.m Wed Apr 19 08:18:14 2017
@@ -6031,7 +6031,7 @@ This method is deprecated, use -columnIndexesInRect:.
{
NSArray *array;
NSNumber *width, *identNum;
- NSObject *ident;
+ id ident;
width = [NSNumber numberWithInt: [column width]];
ident = [column identifier];

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-configure_ac,v 1.3 2016/06/23 20:56:23 sebastia Exp $
--- configure.ac.orig Fri Feb 12 01:56:56 2016
+++ configure.ac Mon Jun 20 22:05:56 2016
@@ -504,12 +504,17 @@ AC_ARG_ENABLE(speech,
$OpenBSD: patch-configure_ac,v 1.4 2018/01/05 08:00:09 sebastia Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -524,12 +524,17 @@ AC_ARG_ENABLE(speech,
BUILD_SPEECH=
# has flite, for speech synthesis.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2017/04/11 20:34:27 sebastia Exp $
@comment $OpenBSD: PLIST,v 1.15 2018/01/05 08:00:09 sebastia Exp $
bin/GSSpeechServer
@bin bin/gclose
@bin bin/gcloseall
@ -57,6 +57,8 @@ include/AppKit/GSXibParser.h
include/AppKit/IMConnectors.h
include/AppKit/IMCustomObject.h
include/AppKit/IMLoading.h
include/AppKit/NSAccessibility.h
include/AppKit/NSAccessibilityConstants.h
include/AppKit/NSActionCell.h
include/AppKit/NSAffineTransform.h
include/AppKit/NSAlert.h
@ -106,6 +108,7 @@ include/AppKit/NSFontManager.h
include/AppKit/NSFontPanel.h
include/AppKit/NSForm.h
include/AppKit/NSFormCell.h
include/AppKit/NSGestureRecognizer.h
include/AppKit/NSGlyphGenerator.h
include/AppKit/NSGradient.h
include/AppKit/NSGraphics.h
@ -143,6 +146,7 @@ include/AppKit/NSPageLayout.h
include/AppKit/NSPanel.h
include/AppKit/NSParagraphStyle.h
include/AppKit/NSPasteboard.h
include/AppKit/NSPasteboardItem.h
include/AppKit/NSPopUpButton.h
include/AppKit/NSPopUpButtonCell.h
include/AppKit/NSPopover.h
@ -154,6 +158,7 @@ include/AppKit/NSProgressIndicator.h
include/AppKit/NSResponder.h
include/AppKit/NSRulerMarker.h
include/AppKit/NSRulerView.h
include/AppKit/NSRunningApplication.h
include/AppKit/NSSavePanel.h
include/AppKit/NSScreen.h
include/AppKit/NSScrollView.h
@ -165,6 +170,7 @@ include/AppKit/NSSegmentedCell.h
include/AppKit/NSSegmentedControl.h
include/AppKit/NSSelection.h
include/AppKit/NSShadow.h
include/AppKit/NSSharingService.h
include/AppKit/NSSlider.h
include/AppKit/NSSliderCell.h
include/AppKit/NSSound.h
@ -185,6 +191,7 @@ include/AppKit/NSTableHeaderCell.h
include/AppKit/NSTableHeaderView.h
include/AppKit/NSTableView.h
include/AppKit/NSText.h
include/AppKit/NSTextAlternatives.h
include/AppKit/NSTextAttachment.h
include/AppKit/NSTextContainer.h
include/AppKit/NSTextField.h
@ -202,9 +209,12 @@ include/AppKit/NSTrackingArea.h
include/AppKit/NSTreeController.h
include/AppKit/NSTreeNode.h
include/AppKit/NSUserDefaultsController.h
include/AppKit/NSUserInterfaceItemIdentification.h
include/AppKit/NSUserInterfaceLayout.h
include/AppKit/NSUserInterfaceValidation.h
include/AppKit/NSView.h
include/AppKit/NSViewController.h
include/AppKit/NSVisualEffectView.h
include/AppKit/NSWindow.h
include/AppKit/NSWindowController.h
include/AppKit/NSWorkspace.h